diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2021-10-27 08:27:29 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2021-10-27 08:27:30 +0200 |
| commit | 76f79231666a7a3c9a1db82c002e083125de5861 (patch) | |
| tree | e6920756b8e89e0faa232bed9b44a8ececda29d7 /drivers/soc/fsl/dpio/dpio-service.c | |
| parent | 05d5da3cb11c91c39e607066d3313a6ce621796a (diff) | |
| parent | 8120bd469f5525da229953c1197f2b826c0109f4 (diff) | |
Merge tag 'soc-fsl-fix-v5.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux into arm/fixes
NXP/FSL SoC driver fixes for v5.15
DPAA2 DPIO driver
- replace smp_processor_id with raw_smp_processor_id to fix preempt
debug BUG
- use the combined functions to protect critical zone to fix deadlock
DPAA2 console
- free buffer before returning from dpaa2_console_read
* tag 'soc-fsl-fix-v5.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux:
soc: fsl: dpaa2-console: free buffer before returning from dpaa2_console_read
soc: fsl: dpio: use the combined functions to protect critical zone
soc: fsl: dpio: replace smp_processor_id with raw_smp_processor_id
Link: https://lore.kernel.org/r/20211026235744.19258-1-leoyang.li@nxp.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/soc/fsl/dpio/dpio-service.c')
| -rw-r--r-- | drivers/soc/fsl/dpio/dpio-service.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/soc/fsl/dpio/dpio-service.c b/drivers/soc/fsl/dpio/dpio-service.c index 7351f3030550..779c319a4b82 100644 --- a/drivers/soc/fsl/dpio/dpio-service.c +++ b/drivers/soc/fsl/dpio/dpio-service.c @@ -59,7 +59,7 @@ static inline struct dpaa2_io *service_select_by_cpu(struct dpaa2_io *d, * potentially being migrated away. */ if (cpu < 0) - cpu = smp_processor_id(); + cpu = raw_smp_processor_id(); /* If a specific cpu was requested, pick it up immediately */ return dpio_by_cpu[cpu]; |