aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2008-05-02 21:14:20 +1000
committerIngo Molnar <mingo@elte.hu>2008-05-04 20:04:45 +0200
commitafaafe50ee15c59010f19273ebfb6c44f0962d7c (patch)
tree1b15c6a1c79c8bf9e27d32ad9ada2a222a4ffbbb
parentx86: relocs ELF handling - use SELFMAG instead of numeric constant (diff)
downloadlinux-dev-afaafe50ee15c59010f19273ebfb6c44f0962d7c.tar.xz
linux-dev-afaafe50ee15c59010f19273ebfb6c44f0962d7c.zip
x86: fix up bootparam.h for userspace inclusion
commit 8b664aa66e824a0ddf4ec56d41fa0cf7bb374de6 (x86, boot: add linked list of struct setup_data) put a new struct in bootparam.h, but didn't use the userspace-safe types. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> Cc: Huang Ying <ying.huang@intel.com> Acked-by: H. Peter Anvin <hpa@zytor.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--include/asm-x86/bootparam.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-x86/bootparam.h b/include/asm-x86/bootparam.h
index e8659909e5f6..f62f4733606b 100644
--- a/include/asm-x86/bootparam.h
+++ b/include/asm-x86/bootparam.h
@@ -14,10 +14,10 @@
/* extensible setup data list node */
struct setup_data {
- u64 next;
- u32 type;
- u32 len;
- u8 data[0];
+ __u64 next;
+ __u32 type;
+ __u32 len;
+ __u8 data[0];
};
struct setup_header {