diff options
| author | Daiane Angolini <daiane.angolini@foundries.io> | 2023-01-11 10:18:22 -0300 |
|---|---|---|
| committer | Daiane Angolini <daiane.angolini@foundries.io> | 2023-01-11 10:19:21 -0300 |
| commit | a5035af600b9306b322b33ce6d6133d2f0941fb3 (patch) | |
| tree | f81b14f34a4dc71ac8f08a2e5dd57fdbf2ea027e /arch/powerpc/include | |
| parent | 787c54d531fe12caca6de36518f1e2b52b45160d (diff) | |
| parent | bd8a595958a5b02e58cdd6fed82d4ebc77b1988a (diff) | |
Merge tag 'v5.15.75' into 5.15-2.2.x-imx
This is the 5.15.75 stable release
Removes CONFIG_KERNEL_LZO=y from arch/arm/configs/imx_v7_defconfig
Conflicts:
arch/arm/boot/dts/imx6dl.dtsi
arch/arm/boot/dts/imx6q.dtsi
arch/arm/boot/dts/imx6sl.dtsi
arch/arm/boot/dts/imx6sll.dtsi
arch/arm/boot/dts/imx6sx.dtsi
arch/arm/boot/dts/imx7d-sdb.dts
drivers/char/hw_random/imx-rngc.c
drivers/dma/mxs-dma.c
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
drivers/tty/serial/fsl_lpuart.c
drivers/usb/host/xhci.h
Signed-off-by: Daiane Angolini <daiane.angolini@foundries.io>
Diffstat (limited to 'arch/powerpc/include')
| -rw-r--r-- | arch/powerpc/include/asm/syscalls.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/syscalls.h b/arch/powerpc/include/asm/syscalls.h index 7ee66ae5444d..0e85d7aa395d 100644 --- a/arch/powerpc/include/asm/syscalls.h +++ b/arch/powerpc/include/asm/syscalls.h @@ -8,6 +8,18 @@ #include <linux/types.h> #include <linux/compat.h> +/* + * long long munging: + * The 32 bit ABI passes long longs in an odd even register pair. + * High and low parts are swapped depending on endian mode, + * so define a macro (similar to mips linux32) to handle that. + */ +#ifdef __LITTLE_ENDIAN__ +#define merge_64(low, high) (((u64)high << 32) | low) +#else +#define merge_64(high, low) (((u64)high << 32) | low) +#endif + struct rtas_args; asmlinkage long sys_mmap(unsigned long addr, size_t len, |