3 files changed, 2 insertions, 9 deletions

diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h
index 20bab9431acb..5f9a2e72a731 100644
--- a/arch/x86/boot/boot.h
+++ b/arch/x86/boot/boot.h
@@ -23,7 +23,7 @@
 #include <linux/types.h>
 #include <linux/edd.h>
 #include <asm/boot.h>
-#include <asm/bootparam.h>
+#include <asm/setup.h>
 
 /* Useful macros */
 #define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)]))
diff --git a/arch/x86/boot/main.c b/arch/x86/boot/main.c
index 0eeef3989a17..1f95750ede28 100644
--- a/arch/x86/boot/main.c
+++ b/arch/x86/boot/main.c
@@ -26,8 +26,6 @@ char *heap_end = _end;		/* Default end of heap = no heap */
  * screws up the old-style command line protocol, adjust by
  * filling in the new-style command line pointer instead.
  */
-#define OLD_CL_MAGIC    0xA33F
-#define OLD_CL_ADDRESS  0x20
 
 static void copy_boot_params(void)
 {
diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
index 00b1c2c56454..374b7ece8961 100644
--- a/arch/x86/kernel/head_32.S
+++ b/arch/x86/kernel/head_32.S
@@ -124,12 +124,7 @@ ENTRY(startup_32)
         movsl
         movl boot_params - __PAGE_OFFSET + NEW_CL_POINTER,%esi
         andl %esi,%esi
-        jnz 2f                  # New command line protocol
-        cmpw $(OLD_CL_MAGIC),OLD_CL_MAGIC_ADDR
-        jne 1f
-        movzwl OLD_CL_OFFSET,%esi
-        addl $(OLD_CL_BASE_ADDR),%esi
-2:
+        jz 1f                   # No comand line
         movl $(boot_command_line - __PAGE_OFFSET),%edi
         movl $(COMMAND_LINE_SIZE/4),%ecx
         rep