Skip to contentSkip to conversation

ARC: Add guard macro to uapi/asm/unistd.h

PATCH In review Vineet Gupta 2 participants 4 messages Nov 21, 2013 Synopsys ARC architecture

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARC: Add guard macro to uapi/asm/unistd.h

Chen originally proposed this as "right thing to do" however I actually ran into this when building perf tools. Some of the utils include unistd.h as well as linux/unistd.h. Since -I includes kernel headers too, we end up including the ARC unistd.h twice, leading to redefinition nwarnings.

------------------>8-------------------
CC bench/sched-pipe.o
In file included from ~/kernel/arch/arc/include/uapi/asm/unistd.h:21:0,

                 from ~/kernel/include/uapi/linux/unistd.h:7,
                 from bench/sched-pipe.c:24:

~/kernel/include/uapi/asm-generic/unistd.h:889:0: error: "__NR_fcntl64" redefined [-Werror]
#define __NR_fcntl64 __NR3264_fcntl
^
In file included from ~/gnu/arc-linux-uclibc/sys-include/sys/syscall.h:24:0,

                 from bench/../perf.h:112,
                 from bench/sched-pipe.c:13:

~/gnu/arc-linux-uclibc/include/bits/sysnum.h:761:0: note: this is the location of the previous definition ------------------>8-------------------

Verified that make headers_install works fine with this.

---
I will be adding this to arc tree for 3.13

---
 arch/arc/include/uapi/asm/unistd.h | 5 +++++
 1 file changed, 5 insertions(+)
arch/arc/include/uapi/asm/unistd.h +5 -0
index 6f30484f34b7..68125dd766c6 100644
@@ -8,6 +8,9 @@
 
 /******** 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
@@ -32,3 +35,5 @@ __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
Signature · 1 line
1.8.1.2
#1 lore raw
Quoted 50 lines · Vineet Gupta

Chen originally proposed this as "right thing to do" however I actually ran into this when building perf tools. Some of the utils include unistd.h as well as linux/unistd.h. Since -I includes kernel headers too, we end up including the ARC unistd.h twice, leading to redefinition nwarnings.

------------------>8-------------------
CC bench/sched-pipe.o
In file included from ~/kernel/arch/arc/include/uapi/asm/unistd.h:21:0,

                 from ~/kernel/include/uapi/linux/unistd.h:7,
                 from bench/sched-pipe.c:24:

~/kernel/include/uapi/asm-generic/unistd.h:889:0: error: "__NR_fcntl64" redefined [-Werror]
#define __NR_fcntl64 __NR3264_fcntl
^
In file included from ~/gnu/arc-linux-uclibc/sys-include/sys/syscall.h:24:0,

                 from bench/../perf.h:112,
                 from bench/sched-pipe.c:13:

~/gnu/arc-linux-uclibc/include/bits/sysnum.h:761:0: note: this is the location of the previous definition ------------------>8-------------------

Verified that make headers_install works fine with this.

---
I will be adding this to arc tree for 3.13

---
 arch/arc/include/uapi/asm/unistd.h | 5 +++++
 1 file changed, 5 insertions(+)
arch/arc/include/uapi/asm/unistd.h +3 -0
index 6f30484f34b7..68125dd766c6 100644
@@ -8,6 +8,9 @@
 
 /******** 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

arch/arc/include/uapi/asm/unistd.h __SYSCALL(__NR_arc_gettls, sys_arc_gettls) · line 39

Quoted 5 lines
arch/arc/include/uapi/asm/unistd.h +2 -0
@@ -32,3 +35,5 @@ __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

Is it better to append comment for "#endif"?

e.g. "#endif /* _UAPI_ASM_ARC_UNISTD_H */"

Thanks.

Signature · 1 line
Chen Gang
#2 lore raw
Quoted 24 lines · Chen Gang
Quoted 23 lines · Vineet Gupta

Chen originally proposed this as "right thing to do" however I actually ran into this when building perf tools. Some of the utils include unistd.h as well as linux/unistd.h. Since -I includes kernel headers too, we end up including the ARC unistd.h twice, leading to redefinition nwarnings.

------------------>8-------------------
CC bench/sched-pipe.o
In file included from ~/kernel/arch/arc/include/uapi/asm/unistd.h:21:0,

                 from ~/kernel/include/uapi/linux/unistd.h:7,
                 from bench/sched-pipe.c:24:

~/kernel/include/uapi/asm-generic/unistd.h:889:0: error: "__NR_fcntl64" redefined [-Werror]
#define __NR_fcntl64 __NR3264_fcntl
^
In file included from ~/gnu/arc-linux-uclibc/sys-include/sys/syscall.h:24:0,

                 from bench/../perf.h:112,
                 from bench/sched-pipe.c:13:

~/gnu/arc-linux-uclibc/include/bits/sysnum.h:761:0: note: this is the location of the previous definition ------------------>8-------------------

Quoted 3 lines
Quoted 3 lines

Verified that make headers_install works fine with this.

Also thank you very much, it is my 1st patch with new mail address. :-)

Thanks.

Quoted 37 lines
Quoted 24 lines

---
I will be adding this to arc tree for 3.13

---
 arch/arc/include/uapi/asm/unistd.h | 5 +++++
 1 file changed, 5 insertions(+)
arch/arc/include/uapi/asm/unistd.h +3 -0
index 6f30484f34b7..68125dd766c6 100644
@@ -8,6 +8,9 @@
 
 /******** 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

arch/arc/include/uapi/asm/unistd.h __SYSCALL(__NR_arc_gettls, sys_arc_gettls) · line 39

Quoted 5 lines
arch/arc/include/uapi/asm/unistd.h +2 -0
@@ -32,3 +35,5 @@ __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

Is it better to append comment for "#endif"?

e.g. "#endif /* _UAPI_ASM_ARC_UNISTD_H */"

Thanks.

Signature · 1 line
Chen Gang
#3 lore raw
In reply to Chen Gang
Quoted 6 lines · Chen Gang
Quoted 3 lines

+

Quoted 2 lines

+#endif

Is it better to append comment for "#endif"?

e.g. "#endif /* _UAPI_ASM_ARC_UNISTD_H */"

It's a preference thing. I do it when there are multiple #endif's, hence need some disambiguation.