Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+7
-1
+7
-1
arch/arc/include/uapi/asm/unistd.h
+7
-1
arch/arc/include/uapi/asm/unistd.h
···
8
8
9
9
/******** no-legacy-syscalls-ABI *******/
10
10
11
-
#ifndef _UAPI_ASM_ARC_UNISTD_H
11
+
/*
12
+
* Non-typical guard macro to enable inclusion twice in ARCH sys.c
13
+
* That is how the Generic syscall wrapper generator works
14
+
*/
15
+
#if !defined(_UAPI_ASM_ARC_UNISTD_H) || defined(__SYSCALL)
12
16
#define _UAPI_ASM_ARC_UNISTD_H
13
17
14
18
#define __ARCH_WANT_SYS_EXECVE
···
39
35
/* Generic syscall (fs/filesystems.c - lost in asm-generic/unistd.h */
40
36
#define __NR_sysfs (__NR_arch_specific_syscall + 3)
41
37
__SYSCALL(__NR_sysfs, sys_sysfs)
38
+
39
+
#undef __SYSCALL
42
40
43
41
#endif