[PATCH] x86_64: Generalize DMI and enable for x86-64

Some people need it now on 64bit so reuse the i386 code for
x86-64. This will be also useful for future bug workarounds.

It is a bit simplified there because there is no need
to do it very early on x86-64. This means it doesn't need
early ioremap et.al. We run it as a core initcall right now.

I hope it's not needed for early setup.

I added a general CONFIG_DMI symbol in case IA64 or someone
else wants to reuse the code later too.

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

2 files changed, 9 insertions, 9 deletions

diff --git a/arch/i386/kernel/dmi_scan.c b/arch/i386/kernel/dmi_scan.c
index 58516e2ac172..6a93d75db431 100644
--- a/arch/i386/kernel/dmi_scan.c
+++ b/arch/i386/kernel/dmi_scan.c
@@ -4,7 +4,7 @@
 #include <linux/module.h>
 #include <linux/dmi.h>
 #include <linux/bootmem.h>
-
+#include <linux/slab.h>
 
 static char * __init dmi_string(struct dmi_header *dm, u8 s)
 {
@@ -19,7 +19,7 @@ static char * __init dmi_string(struct dmi_header *dm, u8 s)
                 }
 
                 if (*bp != 0) {
-                        str = alloc_bootmem(strlen(bp) + 1);
+                        str = dmi_alloc(strlen(bp) + 1);
                         if (str != NULL)
                                 strcpy(str, bp);
                         else
@@ -40,7 +40,7 @@ static int __init dmi_table(u32 base, int len, int num,
         u8 *buf, *data;
         int i = 0;
                 
-        buf = bt_ioremap(base, len);
+        buf = dmi_ioremap(base, len);
         if (buf == NULL)
                 return -1;
 
@@ -65,7 +65,7 @@ static int __init dmi_table(u32 base, int len, int num,
                 data += 2;
                 i++;
         }
-        bt_iounmap(buf, len);
+        dmi_iounmap(buf, len);
         return 0;
 }
 
@@ -112,7 +112,7 @@ static void __init dmi_save_devices(struct dmi_header *dm)
                 if ((*d & 0x80) == 0)
                         continue;
 
-                dev = alloc_bootmem(sizeof(*dev));
+                dev = dmi_alloc(sizeof(*dev));
                 if (!dev) {
                         printk(KERN_ERR "dmi_save_devices: out of memory.\n");
                         break;
@@ -131,7 +131,7 @@ static void __init dmi_save_ipmi_device(struct dmi_header *dm)
         struct dmi_device *dev;
         void * data;
 
-        data = alloc_bootmem(dm->length);
+        data = dmi_alloc(dm->length);
         if (data == NULL) {
                 printk(KERN_ERR "dmi_save_ipmi_device: out of memory.\n");
                 return;
@@ -139,7 +139,7 @@ static void __init dmi_save_ipmi_device(struct dmi_header *dm)
 
         memcpy(data, dm, dm->length);
 
-        dev = alloc_bootmem(sizeof(*dev));
+        dev = dmi_alloc(sizeof(*dev));
         if (!dev) {
                 printk(KERN_ERR "dmi_save_ipmi_device: out of memory.\n");
                 return;
@@ -221,7 +221,7 @@ void __init dmi_scan_machine(void)
                 }
         }
 
-out:    printk(KERN_INFO "DMI not present.\n");
+out:    printk(KERN_INFO "DMI not present or invalid.\n");
 }
 
 
diff --git a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c
index f685637a100d..a720f743ea6e 100644
--- a/arch/i386/kernel/setup.c
+++ b/arch/i386/kernel/setup.c
@@ -45,6 +45,7 @@
 #include <linux/nodemask.h>
 #include <linux/kexec.h>
 #include <linux/crash_dump.h>
+#include <linux/dmi.h>
 
 #include <video/edid.h>
 
@@ -146,7 +147,6 @@ EXPORT_SYMBOL(ist_info);
 struct e820map e820;
 
 extern void early_cpu_init(void);
-extern void dmi_scan_machine(void);
 extern void generic_apic_probe(char *);
 extern int root_mountflags;