diff options
| author | Chris Zankel <chris@zankel.net> | 2016-08-03 22:30:00 +0000 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2016-08-03 22:30:00 +0000 |
| commit | 9e8511ff7e3f18df7d202da06c9704d940fa68f9 (patch) | |
| tree | e6fe856effe9a41693d58b947b18e0345fe9dc9b /arch/xtensa/include/uapi/asm/types.h | |
| parent | 523d939ef98fd712632d93a5a2b588e477a7565e (diff) | |
| parent | d8d2f7f64592f3e8c51dac6d20aed044dca4009a (diff) | |
Merge tag 'xtensa-for-next-20160731' of git://github.com/jcmvbkbc/linux-xtensa into for_next
Xtensa improvements for 4.8:
- add new kernel memory layouts for MMUv3 cores: with 256MB and 512MB
KSEG size, starting at physical address other than 0;
- make kernel load address configurable;
- clean up kernel memory layout macros;
- drop sysmem early allocator and switch to memblock;
- enable kmemleak and memory reservation from the device tree;
- wire up new syscalls: userfaultfd, membarrier, mlock2, copy_file_range,
preadv2 and pwritev2.
Diffstat (limited to 'arch/xtensa/include/uapi/asm/types.h')
| -rw-r--r-- | arch/xtensa/include/uapi/asm/types.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/xtensa/include/uapi/asm/types.h b/arch/xtensa/include/uapi/asm/types.h index 87ec7ae73cb1..2efc921506c4 100644 --- a/arch/xtensa/include/uapi/asm/types.h +++ b/arch/xtensa/include/uapi/asm/types.h @@ -18,7 +18,8 @@ # define __XTENSA_UL_CONST(x) x #else # define __XTENSA_UL(x) ((unsigned long)(x)) -# define __XTENSA_UL_CONST(x) x##UL +# define ___XTENSA_UL_CONST(x) x##UL +# define __XTENSA_UL_CONST(x) ___XTENSA_UL_CONST(x) #endif #ifndef __ASSEMBLY__ |