Skip to contentSkip to conversation

cleanup asm/setup.h userspace visibility

PATCH In review Adrian Bunk 3 participants 6 messages Dec 2, 2006 – Dec 4, 2006 Generic include/asm header files

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 cleanup asm/setup.h userspace visibility

This patch makes the contents of the userspace asm/setup.h header consistent on all architectures:
- export setup.h to userspace on all architectures
- export only COMMAND_LINE_SIZE to userspace
- frv: move COMMAND_LINE_SIZE from param.h
- i386: remove duplicate COMMAND_LINE_SIZE from param.h

---

 include/asm-arm/setup.h        |    4 ++++
 include/asm-arm26/setup.h      |    4 ++++
 include/asm-avr32/setup.h      |    4 ++++
 include/asm-frv/param.h        |    1 -
 include/asm-frv/setup.h        |    6 ++++++
 include/asm-generic/Kbuild.asm |    1 +
 include/asm-i386/Kbuild        |    1 -
 include/asm-i386/param.h       |    1 -
 include/asm-i386/setup.h       |    6 ++++--
 include/asm-ia64/Kbuild        |    1 -
 include/asm-m32r/setup.h       |    9 +++++++--
 include/asm-m68k/setup.h       |   12 ++++--------
 include/asm-m68knommu/setup.h  |    5 +++++
 include/asm-mips/setup.h       |    2 --
 include/asm-powerpc/setup.h    |    3 ---
 include/asm-s390/setup.h       |    3 ++-
 include/asm-sh/setup.h         |    6 ++++--
 include/asm-sh64/setup.h       |    6 ++++++
 include/asm-x86_64/Kbuild      |    1 -
 19 files changed, 51 insertions(+), 25 deletions(-)
include/asm-generic/Kbuild.asm renamed from include/asm-generic/Kbuild.asm.old +1 -0
@@ -14,6 +14,7 @@
 unifdef-y += ptrace.h
 unifdef-y += resource.h
 unifdef-y += sembuf.h
+unifdef-y += setup.h
 unifdef-y += shmbuf.h
 unifdef-y += sigcontext.h
 unifdef-y += siginfo.h
include/asm-i386/Kbuild renamed from include/asm-i386/Kbuild.old +0 -1
@@ -7,5 +7,4 @@
 header-y += ucontext.h
 
 unifdef-y += mtrr.h
-unifdef-y += setup.h
 unifdef-y += vm86.h
include/asm-ia64/Kbuild renamed from include/asm-ia64/Kbuild.old +0 -1
@@ -10,7 +10,6 @@
 header-y += perfmon_default_smpl.h
 header-y += ptrace_offsets.h
 header-y += rse.h
-header-y += setup.h
 header-y += ucontext.h
 
 unifdef-y += perfmon.h
include/asm-x86_64/Kbuild renamed from include/asm-x86_64/Kbuild.old +0 -1
@@ -11,7 +11,6 @@
 header-y += msr.h
 header-y += prctl.h
 header-y += ptrace-abi.h
-header-y += setup.h
 header-y += sigcontext32.h
 header-y += ucontext.h
 header-y += vsyscall32.h
include/asm-arm/setup.h renamed from include/asm-arm/setup.h.old +4 -0
@@ -16,6 +16,8 @@
 
 #define COMMAND_LINE_SIZE 1024
 
+#ifdef __KERNEL__
+
 /* The list ends with an ATAG_NONE node. */
 #define ATAG_NONE	0x00000000
 
@@ -217,4 +219,6 @@
 static struct early_params __early_##fn __attribute_used__	\
 __attribute__((__section__(".early_param.init"))) = { name, fn }
 
+#endif  /*  __KERNEL__  */
+
 #endif
include/asm-arm26/setup.h renamed from include/asm-arm26/setup.h.old +4 -0
@@ -16,6 +16,8 @@
 
 #define COMMAND_LINE_SIZE 1024
 
+#ifdef __KERNEL__
+
 /* The list ends with an ATAG_NONE node. */
 #define ATAG_NONE	0x00000000
 
@@ -202,4 +204,6 @@
 
 extern struct meminfo meminfo;
 
+#endif  /*  __KERNEL__  */
+
 #endif
include/asm-frv/param.h renamed from include/asm-frv/param.h.old +0 -1
@@ -18,6 +18,5 @@
 #endif
 
 #define MAXHOSTNAMELEN		64	/* max length of hostname */
-#define COMMAND_LINE_SIZE	512
 
 #endif /* _ASM_PARAM_H */
include/asm-frv/setup.h renamed from include/asm-frv/setup.h.old +6 -0
@@ -12,6 +12,10 @@
 #ifndef _ASM_SETUP_H
 #define _ASM_SETUP_H
 
+#define COMMAND_LINE_SIZE       512
+
+#ifdef __KERNEL__
+
 #include <linux/init.h>
 
 #ifndef __ASSEMBLY__
@@ -22,4 +26,6 @@
 
 #endif /* !__ASSEMBLY__ */
 
+#endif  /*  __KERNEL__  */
+
 #endif /* _ASM_SETUP_H */
include/asm-i386/param.h renamed from include/asm-i386/param.h.old +0 -1
@@ -18,6 +18,5 @@
 #endif
 
 #define MAXHOSTNAMELEN	64	/* max length of hostname */
-#define COMMAND_LINE_SIZE 256
 
 #endif
include/asm-i386/setup.h renamed from include/asm-i386/setup.h.old +4 -2
@@ -6,6 +6,8 @@
 #ifndef _i386_SETUP_H
 #define _i386_SETUP_H
 
+#define COMMAND_LINE_SIZE 256
+
 #ifdef __KERNEL__
 #include <linux/pfn.h>
 
@@ -14,10 +16,8 @@
  */
 #define MAXMEM_PFN	PFN_DOWN(MAXMEM)
 #define MAX_NONPAE_PFN	(1 << 20)
-#endif
 
 #define PARAM_SIZE 4096
-#define COMMAND_LINE_SIZE 256
 
 #define OLD_CL_MAGIC_ADDR	0x90020
 #define OLD_CL_MAGIC		0xA33F
@@ -79,4 +79,6 @@
 
 #endif /* __ASSEMBLY__ */
 
+#endif  /*  __KERNEL__  */
+
 #endif /* _i386_SETUP_H */
include/asm-m32r/setup.h renamed from include/asm-m32r/setup.h.old +7 -2
@@ -1,6 +1,11 @@
 /*
  * This is set up by the setup-routine at boot-time
  */
+
+#define COMMAND_LINE_SIZE       512
+
+#ifdef __KERNEL__
+
 #define PARAM			((unsigned char *)empty_zero_page)
 
 #define MOUNT_ROOT_RDONLY	(*(unsigned long *) (PARAM+0x000))
@@ -18,8 +23,6 @@
 
 #define SCREEN_INFO		(*(struct screen_info *) (PARAM+0x200))
 
-#define COMMAND_LINE_SIZE	(512)
-
 #define RAMDISK_IMAGE_START_MASK	(0x07FF)
 #define RAMDISK_PROMPT_FLAG		(0x8000)
 #define RAMDISK_LOAD_FLAG		(0x4000)
@@ -27,3 +30,5 @@
 extern unsigned long memory_start;
 extern unsigned long memory_end;
 
+#endif  /*  __KERNEL__  */
+
include/asm-m68k/setup.h renamed from include/asm-m68k/setup.h.old +4 -8
@@ -23,7 +23,11 @@
 #ifndef _M68K_SETUP_H
 #define _M68K_SETUP_H
 
+#define COMMAND_LINE_SIZE 256
 
+#ifdef __KERNEL__
+
+#define CL_SIZE COMMAND_LINE_SIZE
 
     /*
      *  Linux/m68k Architectures
@@ -41,8 +45,6 @@
 #define MACH_Q40     10
 #define MACH_SUN3X   11
 
-#ifdef __KERNEL__
-
 #ifndef __ASSEMBLY__
 extern unsigned long m68k_machtype;
 #endif /* !__ASSEMBLY__ */
@@ -189,8 +191,6 @@
 #  define MACH_TYPE (m68k_machtype)
 #endif
 
-#endif /* __KERNEL__ */
-
 
     /*
      *  CPU, FPU and MMU types
@@ -239,8 +239,6 @@
 #define MMU_SUN3       (1<<MMUB_SUN3)
 #define MMU_APOLLO     (1<<MMUB_APOLLO)
 
-#ifdef __KERNEL__
-
 #ifndef __ASSEMBLY__
 extern unsigned long m68k_cputype;
 extern unsigned long m68k_fputype;
@@ -355,8 +353,6 @@
      */
 
 #define NUM_MEMINFO	4
-#define CL_SIZE		256
-#define COMMAND_LINE_SIZE	CL_SIZE
 
 #ifndef __ASSEMBLY__
 struct mem_info {
include/asm-m68knommu/setup.h renamed from include/asm-m68knommu/setup.h.old +5 -0
@@ -1,5 +1,10 @@
+#ifdef __KERNEL__
+
 #include <asm-m68k/setup.h>
 
 /* We have a bigger command line buffer. */
 #undef COMMAND_LINE_SIZE
+
+#endif  /*  __KERNEL__  */
+
 #define COMMAND_LINE_SIZE	512
include/asm-mips/setup.h renamed from include/asm-mips/setup.h.old +0 -2
@@ -1,8 +1,6 @@
-#ifdef __KERNEL__
 #ifndef _MIPS_SETUP_H
 #define _MIPS_SETUP_H
 
 #define COMMAND_LINE_SIZE	256
 
 #endif /* __SETUP_H */
-#endif /* __KERNEL__ */
include/asm-powerpc/setup.h renamed from include/asm-powerpc/setup.h.old +0 -3
@@ -1,9 +1,6 @@
 #ifndef _ASM_POWERPC_SETUP_H
 #define _ASM_POWERPC_SETUP_H
 
-#ifdef __KERNEL__
-
 #define COMMAND_LINE_SIZE	512
 
-#endif	/* __KERNEL__ */
 #endif	/* _ASM_POWERPC_SETUP_H */
include/asm-s390/setup.h renamed from include/asm-s390/setup.h.old +2 -1
@@ -8,12 +8,13 @@
 #ifndef _ASM_S390_SETUP_H
 #define _ASM_S390_SETUP_H
 
+#define COMMAND_LINE_SIZE 	896
+
 #ifdef __KERNEL__
 
 #include <asm/types.h>
 
 #define PARMAREA		0x10400
-#define COMMAND_LINE_SIZE 	896
 #define MEMORY_CHUNKS		16	/* max 0x7fff */
 #define IPL_PARMBLOCK_ORIGIN	0x2000
 
include/asm-sh/setup.h renamed from include/asm-sh/setup.h.old +4 -2
@@ -1,10 +1,12 @@
-#ifdef __KERNEL__
 #ifndef _SH_SETUP_H
 #define _SH_SETUP_H
 
 #define COMMAND_LINE_SIZE 256
 
+#ifdef __KERNEL__
+
 int setup_early_printk(char *);
 
-#endif /* _SH_SETUP_H */
 #endif /* __KERNEL__ */
+
+#endif /* _SH_SETUP_H */
include/asm-sh64/setup.h renamed from include/asm-sh64/setup.h.old +6 -0
@@ -1,6 +1,10 @@
 #ifndef __ASM_SH64_SETUP_H
 #define __ASM_SH64_SETUP_H
 
+#define COMMAND_LINE_SIZE 256
+
+#ifdef __KERNEL__
+
 #define PARAM ((unsigned char *)empty_zero_page)
 #define MOUNT_ROOT_RDONLY (*(unsigned long *) (PARAM+0x000))
 #define RAMDISK_FLAGS (*(unsigned long *) (PARAM+0x004))
@@ -12,5 +16,7 @@
 #define COMMAND_LINE ((char *) (PARAM+256))
 #define COMMAND_LINE_SIZE 256
 
+#endif  /*  __KERNEL__  */
+
 #endif /* __ASM_SH64_SETUP_H */
 
include/asm-avr32/setup.h renamed from include/asm-avr32/setup.h.old +4 -0
@@ -13,6 +13,8 @@
 
 #define COMMAND_LINE_SIZE 256
 
+#ifdef __KERNEL__
+
 /* Magic number indicating that a tag table is present */
 #define ATAG_MAGIC	0xa2a25441
 
@@ -138,4 +140,6 @@
 
 #endif /* !__ASSEMBLY__ */
 
+#endif  /*  __KERNEL__  */
+
 #endif /* __ASM_AVR32_SETUP_H__ */
#1 lore raw
Quoted 4 lines · Adrian Bunk

This patch makes the contents of the userspace asm/setup.h header consistent on all architectures:
- export setup.h to userspace on all architectures
- export only COMMAND_LINE_SIZE to userspace

On ARM, all the ATAGs are exported to userspace because they are an API for boot loaders to use. Everything down to the comment "Memory map description" should be exported.

Signature · 3 lines
Russell King
 Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:
#2 lore raw

PATCH 1/1 cleanup asm/setup.h userspace visibility (v2)

Quoted 9 lines · Russell King
Quoted 4 lines · Adrian Bunk

This patch makes the contents of the userspace asm/setup.h header consistent on all architectures:
- export setup.h to userspace on all architectures
- export only COMMAND_LINE_SIZE to userspace

On ARM, all the ATAGs are exported to userspace because they are an API for boot loaders to use. Everything down to the comment "Memory map description" should be exported.

Is the updated patch below OK?

Quoted 1 line

Russell King

cu
Adrian

<-- snip -->

This patch makes the contents of the userspace asm/setup.h header consistent on all architectures:
- export setup.h to userspace on all architectures
- export only COMMAND_LINE_SIZE to userspace
- frv: move COMMAND_LINE_SIZE from param.h
- i386: remove duplicate COMMAND_LINE_SIZE from param.h
- arm:
- export ATAGs to userspace
- change u8/u16/u32 to __u8/__u16/__u32

---

 include/asm-arm/setup.h        |  104 +++++++++++++++++----------------
 include/asm-arm26/setup.h      |    4 +
 include/asm-avr32/setup.h      |    4 +
 include/asm-frv/param.h        |    1 
 include/asm-frv/setup.h        |    6 +
 include/asm-generic/Kbuild.asm |    1 
 include/asm-i386/Kbuild        |    1 
 include/asm-i386/param.h       |    1 
 include/asm-i386/setup.h       |    6 +
 include/asm-ia64/Kbuild        |    1 
 include/asm-m32r/setup.h       |    9 ++
 include/asm-m68k/setup.h       |   12 +--
 include/asm-m68knommu/setup.h  |    5 +
 include/asm-mips/setup.h       |    2 
 include/asm-powerpc/setup.h    |    3 
 include/asm-s390/setup.h       |    3 
 include/asm-sh/setup.h         |    6 +
 include/asm-sh64/setup.h       |    6 +
 include/asm-x86_64/Kbuild      |    1 
 19 files changed, 102 insertions(+), 74 deletions(-)
include/asm-generic/Kbuild.asm renamed from include/asm-generic/Kbuild.asm.old +1 -0
@@ -14,6 +14,7 @@
 unifdef-y += ptrace.h
 unifdef-y += resource.h
 unifdef-y += sembuf.h
+unifdef-y += setup.h
 unifdef-y += shmbuf.h
 unifdef-y += sigcontext.h
 unifdef-y += siginfo.h
include/asm-i386/Kbuild renamed from include/asm-i386/Kbuild.old +0 -1
@@ -7,5 +7,4 @@
 header-y += ucontext.h
 
 unifdef-y += mtrr.h
-unifdef-y += setup.h
 unifdef-y += vm86.h
include/asm-ia64/Kbuild renamed from include/asm-ia64/Kbuild.old +0 -1
@@ -10,7 +10,6 @@
 header-y += perfmon_default_smpl.h
 header-y += ptrace_offsets.h
 header-y += rse.h
-header-y += setup.h
 header-y += ucontext.h
 
 unifdef-y += perfmon.h
include/asm-x86_64/Kbuild renamed from include/asm-x86_64/Kbuild.old +0 -1
@@ -11,7 +11,6 @@
 header-y += msr.h
 header-y += prctl.h
 header-y += ptrace-abi.h
-header-y += setup.h
 header-y += sigcontext32.h
 header-y += ucontext.h
 header-y += vsyscall32.h
include/asm-arm/setup.h renamed from include/asm-arm/setup.h.old +55 -49

198 lines not on this page · raw message

include/asm-arm26/setup.h renamed from include/asm-arm26/setup.h.old +4 -0
@@ -16,6 +16,8 @@
 
 #define COMMAND_LINE_SIZE 1024
 
+#ifdef __KERNEL__
+
 /* The list ends with an ATAG_NONE node. */
 #define ATAG_NONE	0x00000000
 
@@ -202,4 +204,6 @@
 
 extern struct meminfo meminfo;
 
+#endif  /*  __KERNEL__  */
+
 #endif
include/asm-frv/param.h renamed from include/asm-frv/param.h.old +0 -1
@@ -18,6 +18,5 @@
 #endif
 
 #define MAXHOSTNAMELEN		64	/* max length of hostname */
-#define COMMAND_LINE_SIZE	512
 
 #endif /* _ASM_PARAM_H */
include/asm-frv/setup.h renamed from include/asm-frv/setup.h.old +6 -0
@@ -12,6 +12,10 @@
 #ifndef _ASM_SETUP_H
 #define _ASM_SETUP_H
 
+#define COMMAND_LINE_SIZE       512
+
+#ifdef __KERNEL__
+
 #include <linux/init.h>
 
 #ifndef __ASSEMBLY__
@@ -22,4 +26,6 @@
 
 #endif /* !__ASSEMBLY__ */
 
+#endif  /*  __KERNEL__  */
+
 #endif /* _ASM_SETUP_H */
include/asm-i386/param.h renamed from include/asm-i386/param.h.old +0 -1
@@ -18,6 +18,5 @@
 #endif
 
 #define MAXHOSTNAMELEN	64	/* max length of hostname */
-#define COMMAND_LINE_SIZE 256
 
 #endif
include/asm-i386/setup.h renamed from include/asm-i386/setup.h.old +4 -2
@@ -6,6 +6,8 @@
 #ifndef _i386_SETUP_H
 #define _i386_SETUP_H
 
+#define COMMAND_LINE_SIZE 256
+
 #ifdef __KERNEL__
 #include <linux/pfn.h>
 
@@ -14,10 +16,8 @@
  */
 #define MAXMEM_PFN	PFN_DOWN(MAXMEM)
 #define MAX_NONPAE_PFN	(1 << 20)
-#endif
 
 #define PARAM_SIZE 4096
-#define COMMAND_LINE_SIZE 256
 
 #define OLD_CL_MAGIC_ADDR	0x90020
 #define OLD_CL_MAGIC		0xA33F
@@ -79,4 +79,6 @@
 
 #endif /* __ASSEMBLY__ */
 
+#endif  /*  __KERNEL__  */
+
 #endif /* _i386_SETUP_H */
include/asm-m32r/setup.h renamed from include/asm-m32r/setup.h.old +7 -2
@@ -1,6 +1,11 @@
 /*
  * This is set up by the setup-routine at boot-time
  */
+
+#define COMMAND_LINE_SIZE       512
+
+#ifdef __KERNEL__
+
 #define PARAM			((unsigned char *)empty_zero_page)
 
 #define MOUNT_ROOT_RDONLY	(*(unsigned long *) (PARAM+0x000))
@@ -18,8 +23,6 @@
 
 #define SCREEN_INFO		(*(struct screen_info *) (PARAM+0x200))
 
-#define COMMAND_LINE_SIZE	(512)
-
 #define RAMDISK_IMAGE_START_MASK	(0x07FF)
 #define RAMDISK_PROMPT_FLAG		(0x8000)
 #define RAMDISK_LOAD_FLAG		(0x4000)
@@ -27,3 +30,5 @@
 extern unsigned long memory_start;
 extern unsigned long memory_end;
 
+#endif  /*  __KERNEL__  */
+
include/asm-m68k/setup.h renamed from include/asm-m68k/setup.h.old +4 -8
@@ -23,7 +23,11 @@
 #ifndef _M68K_SETUP_H
 #define _M68K_SETUP_H
 
+#define COMMAND_LINE_SIZE 256
 
+#ifdef __KERNEL__
+
+#define CL_SIZE COMMAND_LINE_SIZE
 
     /*
      *  Linux/m68k Architectures
@@ -41,8 +45,6 @@
 #define MACH_Q40     10
 #define MACH_SUN3X   11
 
-#ifdef __KERNEL__
-
 #ifndef __ASSEMBLY__
 extern unsigned long m68k_machtype;
 #endif /* !__ASSEMBLY__ */
@@ -189,8 +191,6 @@
 #  define MACH_TYPE (m68k_machtype)
 #endif
 
-#endif /* __KERNEL__ */
-
 
     /*
      *  CPU, FPU and MMU types
@@ -239,8 +239,6 @@
 #define MMU_SUN3       (1<<MMUB_SUN3)
 #define MMU_APOLLO     (1<<MMUB_APOLLO)
 
-#ifdef __KERNEL__
-
 #ifndef __ASSEMBLY__
 extern unsigned long m68k_cputype;
 extern unsigned long m68k_fputype;
@@ -355,8 +353,6 @@
      */
 
 #define NUM_MEMINFO	4
-#define CL_SIZE		256
-#define COMMAND_LINE_SIZE	CL_SIZE
 
 #ifndef __ASSEMBLY__
 struct mem_info {
include/asm-m68knommu/setup.h renamed from include/asm-m68knommu/setup.h.old +5 -0
@@ -1,5 +1,10 @@
+#ifdef __KERNEL__
+
 #include <asm-m68k/setup.h>
 
 /* We have a bigger command line buffer. */
 #undef COMMAND_LINE_SIZE
+
+#endif  /*  __KERNEL__  */
+
 #define COMMAND_LINE_SIZE	512
include/asm-mips/setup.h renamed from include/asm-mips/setup.h.old +0 -2
@@ -1,8 +1,6 @@
-#ifdef __KERNEL__
 #ifndef _MIPS_SETUP_H
 #define _MIPS_SETUP_H
 
 #define COMMAND_LINE_SIZE	256
 
 #endif /* __SETUP_H */
-#endif /* __KERNEL__ */
include/asm-powerpc/setup.h renamed from include/asm-powerpc/setup.h.old +0 -3
@@ -1,9 +1,6 @@
 #ifndef _ASM_POWERPC_SETUP_H
 #define _ASM_POWERPC_SETUP_H
 
-#ifdef __KERNEL__
-
 #define COMMAND_LINE_SIZE	512
 
-#endif	/* __KERNEL__ */
 #endif	/* _ASM_POWERPC_SETUP_H */
include/asm-s390/setup.h renamed from include/asm-s390/setup.h.old +2 -1
@@ -8,12 +8,13 @@
 #ifndef _ASM_S390_SETUP_H
 #define _ASM_S390_SETUP_H
 
+#define COMMAND_LINE_SIZE 	896
+
 #ifdef __KERNEL__
 
 #include <asm/types.h>
 
 #define PARMAREA		0x10400
-#define COMMAND_LINE_SIZE 	896
 #define MEMORY_CHUNKS		16	/* max 0x7fff */
 #define IPL_PARMBLOCK_ORIGIN	0x2000
 
include/asm-sh/setup.h renamed from include/asm-sh/setup.h.old +4 -2
@@ -1,10 +1,12 @@
-#ifdef __KERNEL__
 #ifndef _SH_SETUP_H
 #define _SH_SETUP_H
 
 #define COMMAND_LINE_SIZE 256
 
+#ifdef __KERNEL__
+
 int setup_early_printk(char *);
 
-#endif /* _SH_SETUP_H */
 #endif /* __KERNEL__ */
+
+#endif /* _SH_SETUP_H */
include/asm-sh64/setup.h renamed from include/asm-sh64/setup.h.old +6 -0
@@ -1,6 +1,10 @@
 #ifndef __ASM_SH64_SETUP_H
 #define __ASM_SH64_SETUP_H
 
+#define COMMAND_LINE_SIZE 256
+
+#ifdef __KERNEL__
+
 #define PARAM ((unsigned char *)empty_zero_page)
 #define MOUNT_ROOT_RDONLY (*(unsigned long *) (PARAM+0x000))
 #define RAMDISK_FLAGS (*(unsigned long *) (PARAM+0x004))
@@ -12,5 +16,7 @@
 #define COMMAND_LINE ((char *) (PARAM+256))
 #define COMMAND_LINE_SIZE 256
 
+#endif  /*  __KERNEL__  */
+
 #endif /* __ASM_SH64_SETUP_H */
 
include/asm-avr32/setup.h renamed from include/asm-avr32/setup.h.old +4 -0
@@ -13,6 +13,8 @@
 
 #define COMMAND_LINE_SIZE 256
 
+#ifdef __KERNEL__
+
 /* Magic number indicating that a tag table is present */
 #define ATAG_MAGIC	0xa2a25441
 
@@ -138,4 +140,6 @@
 
 #endif /* !__ASSEMBLY__ */
 
+#endif  /*  __KERNEL__  */
+
 #endif /* __ASM_AVR32_SETUP_H__ */
#3 lore raw

Re: [2.6 patch] cleanup asm/setup.h userspace visibility (v2)

Quoted 7 lines · Adrian Bunk
Quoted 6 lines · Russell King
Quoted 4 lines · Adrian Bunk

This patch makes the contents of the userspace asm/setup.h header consistent on all architectures:
- export setup.h to userspace on all architectures
- export only COMMAND_LINE_SIZE to userspace

Quoted 5 lines
Quoted 3 lines

On ARM, all the ATAGs are exported to userspace because they are an API for boot loaders to use. Everything down to the comment "Memory map description" should be exported.

Is the updated patch below OK?

Yup, thanks.

Signature · 3 lines
Russell King
 Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:
#4 lore raw
In reply to Russell King
Quoted 9 lines · Russell King
Quoted 4 lines · Adrian Bunk

This patch makes the contents of the userspace asm/setup.h header consistent on all architectures:
- export setup.h to userspace on all architectures
- export only COMMAND_LINE_SIZE to userspace

On ARM, all the ATAGs are exported to userspace because they are an API for boot loaders to use. Everything down to the comment "Memory map description" should be exported.

Same for m68k: at least MACH_*, CPU*, MMU*, and FPU* are needed to compile m68kboot.

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

#5 lore raw

PATCH 1/1 cleanup asm/setup.h userspace visibility (v3)

Quoted 7 lines · Geert Uytterhoeven
Quoted 6 lines · Russell King
Quoted 4 lines · Adrian Bunk

This patch makes the contents of the userspace asm/setup.h header consistent on all architectures:
- export setup.h to userspace on all architectures
- export only COMMAND_LINE_SIZE to userspace

Quoted 6 lines
Quoted 3 lines

On ARM, all the ATAGs are exported to userspace because they are an API for boot loaders to use. Everything down to the comment "Memory map description" should be exported.

Same for m68k: at least MACH_*, CPU*, MMU*, and FPU* are needed to compile m68kboot.

Updated patch below.

Quoted 3 lines

Gr{oetje,eeting}s,

Geert

cu
Adrian

<-- snip -->

This patch makes the contents of the userspace asm/setup.h header consistent on all architectures:
- export setup.h to userspace on all architectures
- export only COMMAND_LINE_SIZE to userspace,
exceptions where architecture specific things are additionally exported:
- arm
- m68k
- frv: move COMMAND_LINE_SIZE from param.h
- i386: remove duplicate COMMAND_LINE_SIZE from param.h
- arm:
- export ATAGs to userspace
- change u8/u16/u32 to __u8/__u16/__u32

---

 include/asm-arm/setup.h        |  104 +++++++++++++++++----------------
 include/asm-arm26/setup.h      |    4 +
 include/asm-avr32/setup.h      |    5 +
 include/asm-frv/param.h        |    1 
 include/asm-frv/setup.h        |    6 +
 include/asm-generic/Kbuild.asm |    1 
 include/asm-i386/Kbuild        |    1 
 include/asm-i386/param.h       |    1 
 include/asm-i386/setup.h       |    6 +
 include/asm-ia64/Kbuild        |    1 
 include/asm-m32r/setup.h       |    9 ++
 include/asm-m68k/setup.h       |    6 +
 include/asm-m68knommu/setup.h  |    5 +
 include/asm-mips/setup.h       |    2 
 include/asm-powerpc/setup.h    |    3 
 include/asm-s390/setup.h       |    3 
 include/asm-sh/setup.h         |    6 +
 include/asm-sh64/setup.h       |    6 +
 include/asm-x86_64/Kbuild      |    1 
 19 files changed, 102 insertions(+), 69 deletions(-)
include/asm-generic/Kbuild.asm renamed from include/asm-generic/Kbuild.asm.old +1 -0
@@ -14,6 +14,7 @@
 unifdef-y += ptrace.h
 unifdef-y += resource.h
 unifdef-y += sembuf.h
+unifdef-y += setup.h
 unifdef-y += shmbuf.h
 unifdef-y += sigcontext.h
 unifdef-y += siginfo.h
include/asm-i386/Kbuild renamed from include/asm-i386/Kbuild.old +0 -1
@@ -7,5 +7,4 @@
 header-y += ucontext.h
 
 unifdef-y += mtrr.h
-unifdef-y += setup.h
 unifdef-y += vm86.h
include/asm-ia64/Kbuild renamed from include/asm-ia64/Kbuild.old +0 -1
@@ -10,7 +10,6 @@
 header-y += perfmon_default_smpl.h
 header-y += ptrace_offsets.h
 header-y += rse.h
-header-y += setup.h
 header-y += ucontext.h
 
 unifdef-y += perfmon.h
include/asm-x86_64/Kbuild renamed from include/asm-x86_64/Kbuild.old +0 -1
@@ -11,7 +11,6 @@
 header-y += msr.h
 header-y += prctl.h
 header-y += ptrace-abi.h
-header-y += setup.h
 header-y += sigcontext32.h
 header-y += ucontext.h
 header-y += vsyscall32.h
include/asm-arm/setup.h renamed from include/asm-arm/setup.h.old +55 -49

198 lines not on this page · raw message

include/asm-arm26/setup.h renamed from include/asm-arm26/setup.h.old +4 -0
@@ -16,6 +16,8 @@
 
 #define COMMAND_LINE_SIZE 1024
 
+#ifdef __KERNEL__
+
 /* The list ends with an ATAG_NONE node. */
 #define ATAG_NONE	0x00000000
 
@@ -202,4 +204,6 @@
 
 extern struct meminfo meminfo;
 
+#endif  /*  __KERNEL__  */
+
 #endif
include/asm-frv/param.h renamed from include/asm-frv/param.h.old +0 -1
@@ -18,6 +18,5 @@
 #endif
 
 #define MAXHOSTNAMELEN		64	/* max length of hostname */
-#define COMMAND_LINE_SIZE	512
 
 #endif /* _ASM_PARAM_H */
include/asm-frv/setup.h renamed from include/asm-frv/setup.h.old +6 -0
@@ -12,6 +12,10 @@
 #ifndef _ASM_SETUP_H
 #define _ASM_SETUP_H
 
+#define COMMAND_LINE_SIZE       512
+
+#ifdef __KERNEL__
+
 #include <linux/init.h>
 
 #ifndef __ASSEMBLY__
@@ -22,4 +26,6 @@
 
 #endif /* !__ASSEMBLY__ */
 
+#endif  /*  __KERNEL__  */
+
 #endif /* _ASM_SETUP_H */
include/asm-i386/param.h renamed from include/asm-i386/param.h.old +0 -1
@@ -18,6 +18,5 @@
 #endif
 
 #define MAXHOSTNAMELEN	64	/* max length of hostname */
-#define COMMAND_LINE_SIZE 256
 
 #endif
include/asm-i386/setup.h renamed from include/asm-i386/setup.h.old +4 -2
@@ -6,6 +6,8 @@
 #ifndef _i386_SETUP_H
 #define _i386_SETUP_H
 
+#define COMMAND_LINE_SIZE 256
+
 #ifdef __KERNEL__
 #include <linux/pfn.h>
 
@@ -14,10 +16,8 @@
  */
 #define MAXMEM_PFN	PFN_DOWN(MAXMEM)
 #define MAX_NONPAE_PFN	(1 << 20)
-#endif
 
 #define PARAM_SIZE 4096
-#define COMMAND_LINE_SIZE 256
 
 #define OLD_CL_MAGIC_ADDR	0x90020
 #define OLD_CL_MAGIC		0xA33F
@@ -79,4 +79,6 @@
 
 #endif /* __ASSEMBLY__ */
 
+#endif  /*  __KERNEL__  */
+
 #endif /* _i386_SETUP_H */
include/asm-m32r/setup.h renamed from include/asm-m32r/setup.h.old +7 -2
@@ -1,6 +1,11 @@
 /*
  * This is set up by the setup-routine at boot-time
  */
+
+#define COMMAND_LINE_SIZE       512
+
+#ifdef __KERNEL__
+
 #define PARAM			((unsigned char *)empty_zero_page)
 
 #define MOUNT_ROOT_RDONLY	(*(unsigned long *) (PARAM+0x000))
@@ -18,8 +23,6 @@
 
 #define SCREEN_INFO		(*(struct screen_info *) (PARAM+0x200))
 
-#define COMMAND_LINE_SIZE	(512)
-
 #define RAMDISK_IMAGE_START_MASK	(0x07FF)
 #define RAMDISK_PROMPT_FLAG		(0x8000)
 #define RAMDISK_LOAD_FLAG		(0x4000)
@@ -27,3 +30,5 @@
 extern unsigned long memory_start;
 extern unsigned long memory_end;
 
+#endif  /*  __KERNEL__  */
+
include/asm-m68k/setup.h renamed from include/asm-m68k/setup.h.old +4 -2
@@ -41,8 +45,12 @@
 #define MACH_Q40     10
 #define MACH_SUN3X   11
 
+#define COMMAND_LINE_SIZE 256
+
 #ifdef __KERNEL__
+
+#define CL_SIZE COMMAND_LINE_SIZE
 
 #ifndef __ASSEMBLY__
 extern unsigned long m68k_machtype;
 #endif /* !__ASSEMBLY__ */
@@ -355,8 +353,6 @@
      */
 
 #define NUM_MEMINFO	4
-#define CL_SIZE		256
-#define COMMAND_LINE_SIZE	CL_SIZE
 
 #ifndef __ASSEMBLY__
 struct mem_info {
include/asm-m68knommu/setup.h renamed from include/asm-m68knommu/setup.h.old +5 -0
@@ -1,5 +1,10 @@
+#ifdef __KERNEL__
+
 #include <asm-m68k/setup.h>
 
 /* We have a bigger command line buffer. */
 #undef COMMAND_LINE_SIZE
+
+#endif  /*  __KERNEL__  */
+
 #define COMMAND_LINE_SIZE	512
include/asm-mips/setup.h renamed from include/asm-mips/setup.h.old +0 -2
@@ -1,8 +1,6 @@
-#ifdef __KERNEL__
 #ifndef _MIPS_SETUP_H
 #define _MIPS_SETUP_H
 
 #define COMMAND_LINE_SIZE	256
 
 #endif /* __SETUP_H */
-#endif /* __KERNEL__ */
include/asm-powerpc/setup.h renamed from include/asm-powerpc/setup.h.old +0 -3
@@ -1,9 +1,6 @@
 #ifndef _ASM_POWERPC_SETUP_H
 #define _ASM_POWERPC_SETUP_H
 
-#ifdef __KERNEL__
-
 #define COMMAND_LINE_SIZE	512
 
-#endif	/* __KERNEL__ */
 #endif	/* _ASM_POWERPC_SETUP_H */
include/asm-s390/setup.h renamed from include/asm-s390/setup.h.old +2 -1
@@ -8,12 +8,13 @@
 #ifndef _ASM_S390_SETUP_H
 #define _ASM_S390_SETUP_H
 
+#define COMMAND_LINE_SIZE 	896
+
 #ifdef __KERNEL__
 
 #include <asm/types.h>
 
 #define PARMAREA		0x10400
-#define COMMAND_LINE_SIZE 	896
 #define MEMORY_CHUNKS		16	/* max 0x7fff */
 #define IPL_PARMBLOCK_ORIGIN	0x2000
 
include/asm-sh/setup.h renamed from include/asm-sh/setup.h.old +4 -2
@@ -1,10 +1,12 @@
-#ifdef __KERNEL__
 #ifndef _SH_SETUP_H
 #define _SH_SETUP_H
 
 #define COMMAND_LINE_SIZE 256
 
+#ifdef __KERNEL__
+
 int setup_early_printk(char *);
 
-#endif /* _SH_SETUP_H */
 #endif /* __KERNEL__ */
+
+#endif /* _SH_SETUP_H */
include/asm-sh64/setup.h renamed from include/asm-sh64/setup.h.old +6 -0
@@ -1,6 +1,10 @@
 #ifndef __ASM_SH64_SETUP_H
 #define __ASM_SH64_SETUP_H
 
+#define COMMAND_LINE_SIZE 256
+
+#ifdef __KERNEL__
+
 #define PARAM ((unsigned char *)empty_zero_page)
 #define MOUNT_ROOT_RDONLY (*(unsigned long *) (PARAM+0x000))
 #define RAMDISK_FLAGS (*(unsigned long *) (PARAM+0x004))
@@ -12,5 +16,7 @@
 #define COMMAND_LINE ((char *) (PARAM+256))
 #define COMMAND_LINE_SIZE 256
 
+#endif  /*  __KERNEL__  */
+
 #endif /* __ASM_SH64_SETUP_H */
 
include/asm-avr32/setup.h renamed from include/asm-avr32/setup.h.old +4 -0
@@ -13,6 +13,8 @@
 
 #define COMMAND_LINE_SIZE 256
 
+#ifdef __KERNEL__
+
 /* Magic number indicating that a tag table is present */
 #define ATAG_MAGIC	0xa2a25441
 
@@ -138,4 +140,6 @@
 
 #endif /* !__ASSEMBLY__ */
 
+#endif  /*  __KERNEL__  */
+
 #endif /* __ASM_AVR32_SETUP_H__ */