diff options
author | 2019-05-06 12:04:12 +0200 | |
---|---|---|
committer | 2019-05-06 12:04:12 +0200 | |
commit | fb4e0592654adb31bc6f3a738d6499b816a655d6 (patch) | |
tree | e6edaf18cf3a7f49e93fb51de5a47f4b9e786f53 /include/linux/kernel.h | |
parent | irq_work: Do not raise an IPI when queueing work on the local CPU (diff) | |
parent | iommu/dma-iommu: Remove iommu_dma_map_msi_msg() (diff) | |
download | wireguard-linux-fb4e0592654adb31bc6f3a738d6499b816a655d6.tar.xz wireguard-linux-fb4e0592654adb31bc6f3a738d6499b816a655d6.zip |
Merge tag 'irqchip-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/core
Pull irqchip updates from Marc Zyngier
- The huge (and terrifying) TI INTR/INTA set of drivers
- Rewrite of the stm32mp1-exti driver as a platform driver
- Update the IOMMU MSI mapping API to be RT friendly
- A number of cleanups and other low impact fixes
Diffstat (limited to '')
-rw-r--r-- | include/linux/kernel.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 34a5036debd3..2d14e21c16c0 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -47,8 +47,8 @@ #define u64_to_user_ptr(x) ( \ { \ - typecheck(u64, x); \ - (void __user *)(uintptr_t)x; \ + typecheck(u64, (x)); \ + (void __user *)(uintptr_t)(x); \ } \ ) |