Skip to contentSkip to conversation

x86: fix up bootparam.h for userspace inclusion

PATCH Applied Rusty Russell 3 participants 3 messages May 2, 2008 – May 3, 2008

lore
Share & tools
lore

Rusty Russell

author
#0 lore raw

PATCH 1/1 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.

CC Huang, Ying <[email protected]>
Signed-off-by Rusty Russell <[email protected]>
include/asm-x86/bootparam.h +4 -4
diff -r 3b015cd747e0 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 {
Applied
#2 lore raw
In reply to Rusty Russell
Quoted 15 lines · Rusty Russell

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.

CC Huang, Ying <[email protected]>
Signed-off-by Rusty Russell <[email protected]>

diff -r 3b015cd747e0 include/asm-x86/bootparam.h

include/asm-x86/bootparam.h +0 -1
@@ -14,10 +14,10 @@
 
 /* extensible setup data list node */
 struct setup_data {
-	u64 next;

include/asm-x86/bootparam.h line 23

Quoted 10 lines
include/asm-x86/bootparam.h +4 -3
-	u32 type;
-	u32 len;
-	u8 data[0];
+	__u64 next;
+	__u32 type;
+	__u32 len;
+	__u8 data[0];
 };
 
 struct setup_header {

Applied, thanks

tglx