1 files changed, 16 insertions, 10 deletions

diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index 7d6fe65c93f4..dc7dd7648ec5 100644
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -91,8 +91,6 @@ static struct resource code_resource = {
         .name   = "Kernel code",
         .flags  = IORESOURCE_BUSY | IORESOURCE_MEM
 };
-extern void efi_initialize_iomem_resources(struct resource *,
-                struct resource *);
 extern char _text[], _end[], _etext[];
 
 unsigned long ia64_max_cacheline_size;
@@ -642,7 +640,7 @@ show_cpuinfo (struct seq_file *m, void *v)
                    "features   : %s\n"
                    "cpu number : %lu\n"
                    "cpu regs   : %u\n"
-                   "cpu MHz    : %lu.%06lu\n"
+                   "cpu MHz    : %lu.%03lu\n"
                    "itc MHz    : %lu.%06lu\n"
                    "BogoMIPS   : %lu.%02lu\n",
                    cpunum, c->vendor, c->family, c->model,
@@ -694,12 +692,15 @@ struct seq_operations cpuinfo_op = {
         .show =         show_cpuinfo
 };
 
-static char brandname[128];
+#define MAX_BRANDS      8
+static char brandname[MAX_BRANDS][128];
 
 static char * __cpuinit
 get_model_name(__u8 family, __u8 model)
 {
+        static int overflow;
         char brand[128];
+        int i;
 
         memcpy(brand, "Unknown", 8);
         if (ia64_pal_get_brand_info(brand)) {
@@ -711,12 +712,17 @@ get_model_name(__u8 family, __u8 model)
                         case 2: memcpy(brand, "Madison up to 9M cache", 23); break;
                 }
         }
-        if (brandname[0] == '\0')
-                return strcpy(brandname, brand);
-        else if (strcmp(brandname, brand) == 0)
-                return brandname;
-        else
-                return kstrdup(brand, GFP_KERNEL);
+        for (i = 0; i < MAX_BRANDS; i++)
+                if (strcmp(brandname[i], brand) == 0)
+                        return brandname[i];
+        for (i = 0; i < MAX_BRANDS; i++)
+                if (brandname[i][0] == '\0')
+                        return strcpy(brandname[i], brand);
+        if (overflow++ == 0)
+                printk(KERN_ERR
+                       "%s: Table overflow. Some processor model information will be missing\n",
+                       __FUNCTION__);
+        return "Unknown";
 }
 
 static void __cpuinit