kernel: adding padding for multi boot information to match size on all archs.

Signed-off-by: Reto Achermann <reto.achermann@inf.ethz.ch>

diff --git a/kernel/include/multiboot.h b/kernel/include/multiboot.h
index d6b2580..6546f46 100644 (file)
--- a/kernel/include/multiboot.h
+++ b/kernel/include/multiboot.h
@@ -102,6 +102,8 @@ struct multiboot_info {
 
 #ifdef __k1om__
     uint8_t     xeon_phi_id;
+#else
+    uint8_t     padding;
 #endif
 };
 

diff --git a/tools/weever/loader.c b/tools/weever/loader.c
index 8d932c3..7fdbf1a 100644 (file)
--- a/tools/weever/loader.c
+++ b/tools/weever/loader.c
@@ -248,7 +248,7 @@ loader(uint64_t magic,
         eabort('E', '4');
     }
 
-    multiboot_info->xeon_phi_id = (uint8_t)bp->xeon_phi_id;
+    multiboot_info->xeon_phi_id = (uint8_t)(bp->xeon_phi_id & 0xff);
 
 
     print_status('S', '3');