diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-20 13:50:42 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-20 13:50:42 -0800 |
| commit | 4773ef2241aa9bdca5b8cb228253981b73883ec9 (patch) | |
| tree | cb8618c9a2a38406415ec12fabfc323b2135aa10 | |
| parent | a81ce79bf294bf61fd3069abdb0923598615da84 (diff) | |
| parent | 1e01c7eb7c431a74437d73fe54670398b4d2b222 (diff) | |
| download | linux-4773ef2241aa9bdca5b8cb228253981b73883ec9.tar.gz linux-4773ef2241aa9bdca5b8cb228253981b73883ec9.tar.bz2 linux-4773ef2241aa9bdca5b8cb228253981b73883ec9.zip | |
Merge tag 'arc-fixes-for-3.13-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc
Pull ARC fix from Vineet Gupta:
"Fix busted syscall table due to unistd header inclusion issue"
* tag 'arc-fixes-for-3.13-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
ARC: Allow conditional multiple inclusion of uapi/asm/unistd.h
| -rw-r--r-- | arch/arc/include/uapi/asm/unistd.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/arc/include/uapi/asm/unistd.h b/arch/arc/include/uapi/asm/unistd.h index 68125dd766c6..39e58d1cdf90 100644 --- a/arch/arc/include/uapi/asm/unistd.h +++ b/arch/arc/include/uapi/asm/unistd.h @@ -8,7 +8,11 @@ /******** no-legacy-syscalls-ABI *******/ -#ifndef _UAPI_ASM_ARC_UNISTD_H +/* + * Non-typical guard macro to enable inclusion twice in ARCH sys.c + * That is how the Generic syscall wrapper generator works + */ +#if !defined(_UAPI_ASM_ARC_UNISTD_H) || defined(__SYSCALL) #define _UAPI_ASM_ARC_UNISTD_H #define __ARCH_WANT_SYS_EXECVE @@ -36,4 +40,6 @@ __SYSCALL(__NR_arc_gettls, sys_arc_gettls) #define __NR_sysfs (__NR_arch_specific_syscall + 3) __SYSCALL(__NR_sysfs, sys_sysfs) +#undef __SYSCALL + #endif |