Skip to contentSkip to conversation

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

PATCH In review Vineet Gupta 3 participants 6 messages Dec 19, 2013 Synopsys ARC architecture

lore
Share & tools
lore
#0 lore raw

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

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).

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

This reverts commit 97bc386fc12deeb41d5bff33548e3002b258d4e0.

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

Quoted 9 lines
	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.

OK, thanks, it sounds reasonable to me.

But why many other architectures contents these guard macros? (arm, sh, blackfin, cris, frv, ia64, m32r, m68k, mips, s390, microblaze, mn10300, parisc, powerpc, sparc, x86). Do they need improvement too?

And for our case, what xtensa has done looks like a better way to me.

Thanks.

Quoted 30 lines

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).

---
 arch/arc/include/uapi/asm/unistd.h | 5 -----
 1 file changed, 5 deletions(-)
arch/arc/include/uapi/asm/unistd.h +0 -5
index 68125dd766c6..6f30484f34b7 100644
@@ -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
Signature · 3 lines
Chen Gang

Open, share and attitude like air, water and life which God blessed
#2 lore raw
Quoted 14 lines · Chen Gang
Quoted 4 lines · Vineet Gupta

This reverts commit 97bc386fc12deeb41d5bff33548e3002b258d4e0.

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

Quoted 8 lines
      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.

Quoted 5 lines

OK, thanks, it sounds reasonable to me.

But why many other architectures contents these guard macros? (arm, sh, blackfin, cris, frv, ia64, m32r, m68k, mips, s390, microblaze, mn10300, parisc, powerpc, sparc, x86). Do they need improvement too?

Those architectures don't use the generic syscall table generator.

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

#3 lore raw
Quoted 15 lines · Geert Uytterhoeven
Quoted 14 lines · Chen Gang
Quoted 12 lines · 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.

Quoted 8 lines
Quoted 5 lines

OK, thanks, it sounds reasonable to me.

But why many other architectures contents these guard macros? (arm, sh, blackfin, cris, frv, ia64, m32r, m68k, mips, s390, microblaze, mn10300, parisc, powerpc, sparc, x86). Do they need improvement too?

Those architectures don't use the generic syscall table generator.

OK, thanks. :-)

Quoted 11 lines

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

Signature · 3 lines
Chen Gang

Open, share and attitude like air, water and life which God blessed
#4 lore raw
In reply to Chen Gang
Quoted 14 lines · Chen Gang
Quoted 9 lines · Vineet Gupta
Quoted 9 lines

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>
	};
Quoted 4 lines
Quoted 4 lines

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.

Quoted 7 lines

OK, thanks, it sounds reasonable to me.

But why many other architectures contents these guard macros? (arm, sh, blackfin, cris, frv, ia64, m32r, m68k, mips, s390, microblaze, mn10300, parisc, powerpc, sparc, x86). Do they need improvement too?

And for our case, what xtensa has done looks like a better way to me.

Yeah, looks like that'll work - good find. Linus, please ignore the Revert, I'll follow up with a pull request.

-Vineet

#5 lore raw
Quoted 17 lines · Vineet Gupta
Quoted 16 lines · Chen Gang
Quoted 9 lines · Vineet Gupta
Quoted 9 lines

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>
	};
Quoted 4 lines
Quoted 4 lines

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.

OK, thanks, it sounds reasonable to me.

Quoted 9 lines
Quoted 5 lines

But why many other architectures contents these guard macros? (arm, sh, blackfin, cris, frv, ia64, m32r, m68k, mips, s390, microblaze, mn10300, parisc, powerpc, sparc, x86). Do they need improvement too?

And for our case, what xtensa has done looks like a better way to me.

Yeah, looks like that'll work - good find. Linus, please ignore the Revert, I'll follow up with a pull request.

Thanks. :-)

Quoted 2 lines

-Vineet

Signature · 3 lines
Chen Gang

Open, share and attitude like air, water and life which God blessed