diff options
author | Adrian Bunk <bunk@stusta.de> | 2006-12-06 23:40:38 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-07 11:39:46 -0500 |
commit | 7d1362c0d05b8543807ab403ac8ce813cab41fa4 (patch) | |
tree | 78f4f97229af02e4a8e3d1851b003b296db6dcda /include/asm-i386 | |
parent | f46ba2235feab5e686b1234c328a0577cde86e21 (diff) |
[PATCH] cleanup asm/setup.h userspace visibility
Make 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
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Acked-by: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-i386')
-rw-r--r-- | include/asm-i386/Kbuild | 1 | ||||
-rw-r--r-- | include/asm-i386/param.h | 1 | ||||
-rw-r--r-- | include/asm-i386/setup.h | 6 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-i386/Kbuild b/include/asm-i386/Kbuild index 147e4ac1ebf0..5ae93afc67e1 100644 --- a/include/asm-i386/Kbuild +++ b/include/asm-i386/Kbuild | |||
@@ -7,5 +7,4 @@ header-y += ptrace-abi.h | |||
7 | header-y += ucontext.h | 7 | header-y += ucontext.h |
8 | 8 | ||
9 | unifdef-y += mtrr.h | 9 | unifdef-y += mtrr.h |
10 | unifdef-y += setup.h | ||
11 | unifdef-y += vm86.h | 10 | unifdef-y += vm86.h |
diff --git a/include/asm-i386/param.h b/include/asm-i386/param.h index 745dc5bd0fbc..21b32466fcdc 100644 --- a/include/asm-i386/param.h +++ b/include/asm-i386/param.h | |||
@@ -18,6 +18,5 @@ | |||
18 | #endif | 18 | #endif |
19 | 19 | ||
20 | #define MAXHOSTNAMELEN 64 /* max length of hostname */ | 20 | #define MAXHOSTNAMELEN 64 /* max length of hostname */ |
21 | #define COMMAND_LINE_SIZE 256 | ||
22 | 21 | ||
23 | #endif | 22 | #endif |
diff --git a/include/asm-i386/setup.h b/include/asm-i386/setup.h index 2734909eff84..c5b504bfbaad 100644 --- a/include/asm-i386/setup.h +++ b/include/asm-i386/setup.h | |||
@@ -6,6 +6,8 @@ | |||
6 | #ifndef _i386_SETUP_H | 6 | #ifndef _i386_SETUP_H |
7 | #define _i386_SETUP_H | 7 | #define _i386_SETUP_H |
8 | 8 | ||
9 | #define COMMAND_LINE_SIZE 256 | ||
10 | |||
9 | #ifdef __KERNEL__ | 11 | #ifdef __KERNEL__ |
10 | #include <linux/pfn.h> | 12 | #include <linux/pfn.h> |
11 | 13 | ||
@@ -14,10 +16,8 @@ | |||
14 | */ | 16 | */ |
15 | #define MAXMEM_PFN PFN_DOWN(MAXMEM) | 17 | #define MAXMEM_PFN PFN_DOWN(MAXMEM) |
16 | #define MAX_NONPAE_PFN (1 << 20) | 18 | #define MAX_NONPAE_PFN (1 << 20) |
17 | #endif | ||
18 | 19 | ||
19 | #define PARAM_SIZE 4096 | 20 | #define PARAM_SIZE 4096 |
20 | #define COMMAND_LINE_SIZE 256 | ||
21 | 21 | ||
22 | #define OLD_CL_MAGIC_ADDR 0x90020 | 22 | #define OLD_CL_MAGIC_ADDR 0x90020 |
23 | #define OLD_CL_MAGIC 0xA33F | 23 | #define OLD_CL_MAGIC 0xA33F |
@@ -78,4 +78,6 @@ void __init add_memory_region(unsigned long long start, | |||
78 | 78 | ||
79 | #endif /* __ASSEMBLY__ */ | 79 | #endif /* __ASSEMBLY__ */ |
80 | 80 | ||
81 | #endif /* __KERNEL__ */ | ||
82 | |||
81 | #endif /* _i386_SETUP_H */ | 83 | #endif /* _i386_SETUP_H */ |