5 files changed, 88 insertions, 14 deletions

diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
index 349b81a39c40..f88458e83ef0 100644
--- a/arch/x86/boot/Makefile
+++ b/arch/x86/boot/Makefile
@@ -26,7 +26,7 @@ SVGA_MODE := -DSVGA_MODE=NORMAL_VGA
 #RAMDISK := -DRAMDISK=512
 
 targets         := vmlinux.bin setup.bin setup.elf zImage bzImage
-subdir-         := compressed
+subdir-         := compressed
 
 setup-y         += a20.o cmdline.o copy.o cpu.o cpucheck.o edd.o
 setup-y         += header.o main.o mca.o memory.o pm.o pmjump.o
@@ -43,9 +43,17 @@ setup-y		+= video-vesa.o
 setup-y         += video-bios.o
 
 targets         += $(setup-y)
-hostprogs-y     := tools/build
+hostprogs-y     := mkcpustr tools/build
 
-HOSTCFLAGS_build.o := $(LINUXINCLUDE)
+HOST_EXTRACFLAGS += $(LINUXINCLUDE)
+
+$(obj)/cpu.o: $(obj)/cpustr.h
+
+quiet_cmd_cpustr = CPUSTR  $@
+      cmd_cpustr = $(obj)/mkcpustr > $@
+targets         += cpustr.h
+$(obj)/cpustr.h: $(obj)/mkcpustr FORCE
+        $(call if_changed,cpustr)
 
 # ---------------------------------------------------------------------------
 
@@ -80,6 +88,7 @@ $(obj)/zImage $(obj)/bzImage: $(obj)/setup.bin \
         $(call if_changed,image)
         @echo 'Kernel: $@ is ready' ' (#'`cat .version`')'
 
+OBJCOPYFLAGS_vmlinux.bin := -O binary -R .note -R .comment -S
 $(obj)/vmlinux.bin: $(obj)/compressed/vmlinux FORCE
         $(call if_changed,objcopy)
 
@@ -90,7 +99,6 @@ $(obj)/setup.elf: $(src)/setup.ld $(SETUP_OBJS) FORCE
         $(call if_changed,ld)
 
 OBJCOPYFLAGS_setup.bin  := -O binary
-
 $(obj)/setup.bin: $(obj)/setup.elf FORCE
         $(call if_changed,objcopy)
 
@@ -98,7 +106,7 @@ $(obj)/compressed/vmlinux: FORCE
         $(Q)$(MAKE) $(build)=$(obj)/compressed IMAGE_OFFSET=$(IMAGE_OFFSET) $@
 
 # Set this if you want to pass append arguments to the zdisk/fdimage/isoimage kernel
-FDARGS = 
+FDARGS =
 # Set this if you want an initrd included with the zdisk/fdimage/isoimage kernel
 FDINITRD =
 
diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
index fe24ceabd909..d2b9f3bb87c0 100644
--- a/arch/x86/boot/compressed/Makefile
+++ b/arch/x86/boot/compressed/Makefile
@@ -22,6 +22,7 @@ $(obj)/vmlinux: $(src)/vmlinux_$(BITS).lds $(obj)/head_$(BITS).o $(obj)/misc.o $
         $(call if_changed,ld)
         @:
 
+OBJCOPYFLAGS_vmlinux.bin := -O binary -R .note -R .comment -S
 $(obj)/vmlinux.bin: vmlinux FORCE
         $(call if_changed,objcopy)
 
diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S
index 1ccb38a7f0d2..e8657b98c902 100644
--- a/arch/x86/boot/compressed/head_64.S
+++ b/arch/x86/boot/compressed/head_64.S
@@ -80,8 +80,8 @@ startup_32:
 
 #ifdef CONFIG_RELOCATABLE
         movl    %ebp, %ebx
-        addl    $(LARGE_PAGE_SIZE -1), %ebx
-        andl    $LARGE_PAGE_MASK, %ebx
+        addl    $(PMD_PAGE_SIZE -1), %ebx
+        andl    $PMD_PAGE_MASK, %ebx
 #else
         movl    $CONFIG_PHYSICAL_START, %ebx
 #endif
@@ -220,8 +220,8 @@ ENTRY(startup_64)
         /* Start with the delta to where the kernel will run at. */
 #ifdef CONFIG_RELOCATABLE
         leaq    startup_32(%rip) /* - $startup_32 */, %rbp
-        addq    $(LARGE_PAGE_SIZE - 1), %rbp
-        andq    $LARGE_PAGE_MASK, %rbp
+        addq    $(PMD_PAGE_SIZE - 1), %rbp
+        andq    $PMD_PAGE_MASK, %rbp
         movq    %rbp, %rbx
 #else
         movq    $CONFIG_PHYSICAL_START, %rbp
diff --git a/arch/x86/boot/cpu.c b/arch/x86/boot/cpu.c
index 2a5c32da5852..00e19edd852c 100644
--- a/arch/x86/boot/cpu.c
+++ b/arch/x86/boot/cpu.c
@@ -1,7 +1,7 @@
 /* -*- linux-c -*- ------------------------------------------------------- *
  *
  *   Copyright (C) 1991, 1992 Linus Torvalds
- *   Copyright 2007 rPath, Inc. - All Rights Reserved
+ *   Copyright 2007-2008 rPath, Inc. - All Rights Reserved
  *
  *   This file is part of the Linux kernel, and is made available under
  *   the terms of the GNU General Public License version 2.
@@ -9,7 +9,7 @@
  * ----------------------------------------------------------------------- */
 
 /*
- * arch/i386/boot/cpu.c
+ * arch/x86/boot/cpu.c
  *
  * Check for obligatory CPU features and abort if the features are not
  * present.
@@ -19,6 +19,8 @@
 #include "bitops.h"
 #include <asm/cpufeature.h>
 
+#include "cpustr.h"
+
 static char *cpu_name(int level)
 {
         static char buf[6];
@@ -35,6 +37,7 @@ int validate_cpu(void)
 {
         u32 *err_flags;
         int cpu_level, req_level;
+        const unsigned char *msg_strs;
 
         check_cpu(&cpu_level, &req_level, &err_flags);
 
@@ -51,13 +54,26 @@ int validate_cpu(void)
                 puts("This kernel requires the following features "
                      "not present on the CPU:\n");
 
+                msg_strs = (const unsigned char *)x86_cap_strs;
+
                 for (i = 0; i < NCAPINTS; i++) {
                         u32 e = err_flags[i];
 
                         for (j = 0; j < 32; j++) {
-                                if (e & 1)
-                                        printf("%d:%d ", i, j);
-
+                                int n = (i << 5)+j;
+                                if (*msg_strs < n) {
+                                        /* Skip to the next string */
+                                        do {
+                                                msg_strs++;
+                                        } while (*msg_strs);
+                                        msg_strs++;
+                                }
+                                if (e & 1) {
+                                        if (*msg_strs == n && msg_strs[1])
+                                                printf("%s ", msg_strs+1);
+                                        else
+                                                printf("%d:%d ", i, j);
+                                }
                                 e >>= 1;
                         }
                 }
diff --git a/arch/x86/boot/mkcpustr.c b/arch/x86/boot/mkcpustr.c
new file mode 100644
index 000000000000..bbe76953bae9
--- /dev/null
+++ b/arch/x86/boot/mkcpustr.c
@@ -0,0 +1,49 @@
+/* ----------------------------------------------------------------------- *
+ *
+ *   Copyright 2008 rPath, Inc. - All Rights Reserved
+ *
+ *   This file is part of the Linux kernel, and is made available under
+ *   the terms of the GNU General Public License version 2 or (at your
+ *   option) any later version; incorporated herein by reference.
+ *
+ * ----------------------------------------------------------------------- */
+
+/*
+ * This is a host program to preprocess the CPU strings into a
+ * compact format suitable for the setup code.
+ */
+
+#include <stdio.h>
+
+#include "../kernel/cpu/feature_names.c"
+
+#if NCAPFLAGS > 8
+# error "Need to adjust the boot code handling of CPUID strings"
+#endif
+
+int main(void)
+{
+        int i;
+        const char *str;
+
+        printf("static const char x86_cap_strs[] = \n");
+
+        for (i = 0; i < NCAPINTS*32; i++) {
+                str = x86_cap_flags[i];
+
+                if (i == NCAPINTS*32-1) {
+                        /* The last entry must be unconditional; this
+                           also consumes the compiler-added null character */
+                        if (!str)
+                                str = "";
+                        printf("\t\"\\x%02x\"\"%s\"\n", i, str);
+                } else if (str) {
+                        printf("#if REQUIRED_MASK%d & (1 << %d)\n"
+                               "\t\"\\x%02x\"\"%s\\0\"\n"
+                               "#endif\n",
+                               i >> 5, i & 31, i, str);
+                }
+        }
+        printf("\t;\n");
+        return 0;
+}