[PATCH] Revert "ARC: Add guard macro to uapi/asm/unistd.h"

[Vineet Gupta]

This reverts commit 97bc386fc12deeb41d5bff33548e3002b258d4e0.

Generic syscall table generator relies on ARCH unistd.h as follows:

	void *sys_call_table[NR_syscalls] = {
		[0 ... NR_syscalls-1] = sys_ni_syscall,
	#include <asm/unistd.h>
	};

And turns out that prior dependencies already include that header by
the time preprocessor hits the above. Meaning ARCH unistd.h needs to be
able to included twice.

This however means that perf cross comilation warning will re-appear
which needs to be discussed with perf folks (why they need to include
both libc variant as well as kernel internal header directly).

Signed-off-by: Vineet Gupta <vgupta@xxxxxxxxxxxx>
---
 arch/arc/include/uapi/asm/unistd.h | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/arch/arc/include/uapi/asm/unistd.h b/arch/arc/include/uapi/asm/unistd.h
index 68125dd766c6..6f30484f34b7 100644
--- a/arch/arc/include/uapi/asm/unistd.h
+++ b/arch/arc/include/uapi/asm/unistd.h
@@ -8,9 +8,6 @@
 
 /******** no-legacy-syscalls-ABI *******/
 
-#ifndef _UAPI_ASM_ARC_UNISTD_H
-#define _UAPI_ASM_ARC_UNISTD_H
-
 #define __ARCH_WANT_SYS_EXECVE
 #define __ARCH_WANT_SYS_CLONE
 #define __ARCH_WANT_SYS_VFORK
@@ -35,5 +32,3 @@ __SYSCALL(__NR_arc_gettls, sys_arc_gettls)
 /* Generic syscall (fs/filesystems.c - lost in asm-generic/unistd.h */
 #define __NR_sysfs		(__NR_arch_specific_syscall + 3)
 __SYSCALL(__NR_sysfs, sys_sysfs)
-
-#endif
-- 
1.8.1.2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/