string: factorize skip_spaces and export it to be generally available

[safe/jmp/linux-2.6] / arch / x86 / boot / header.S

diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S
index 68c3bfb..b31cc54 100644 (file)
--- a/arch/x86/boot/header.S
+++ b/arch/x86/boot/header.S
@@ -226,7 +226,7 @@ setup_data:         .quad 0                 # 64-bit physical pointer to
 
 pref_address:          .quad LOAD_PHYSICAL_ADDR        # preferred load addr
 
-#define ZO_INIT_SIZE   (ZO__end - ZO_startup_32 + ZO_extract_offset)
+#define ZO_INIT_SIZE   (ZO__end - ZO_startup_32 + ZO_z_extract_offset)
 #define VO_INIT_SIZE   (VO__end - VO__text)
 #if ZO_INIT_SIZE > VO_INIT_SIZE
 #define INIT_SIZE ZO_INIT_SIZE
@@ -237,7 +237,7 @@ init_size:          .long INIT_SIZE         # kernel initialization size
 
 # End of setup header #####################################################
 
-       .section ".inittext", "ax"
+       .section ".entrytext", "ax"
 start_of_setup:
 #ifdef SAFE_RESET_DISK_CONTROLLER
 # Reset the disk controller.