6 files changed, 30 insertions, 10 deletions

diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index 815878ebd30f..81ae9627701d 100644
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -41,6 +41,10 @@ config ARCH_MAY_HAVE_PC_FDC
         bool
         default y
 
+config DMI
+        bool
+        default y
+
 source "init/Kconfig"
 
 menu "Processor type and features"
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;
 
diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig
index 348b4a0d0d6f..150e1ac0bfed 100644
--- a/arch/x86_64/Kconfig
+++ b/arch/x86_64/Kconfig
@@ -69,6 +69,10 @@ config ARCH_MAY_HAVE_PC_FDC
         bool
         default y
 
+config DMI
+        bool
+        default y
+
 source "init/Kconfig"
 
 
diff --git a/arch/x86_64/kernel/Makefile b/arch/x86_64/kernel/Makefile
index 12bc54005e2f..4601fdafb7cb 100644
--- a/arch/x86_64/kernel/Makefile
+++ b/arch/x86_64/kernel/Makefile
@@ -7,7 +7,8 @@ EXTRA_AFLAGS	:= -traditional
 obj-y   := process.o signal.o entry.o traps.o irq.o \
                 ptrace.o time.o ioport.o ldt.o setup.o i8259.o sys_x86_64.o \
                 x8664_ksyms.o i387.o syscall.o vsyscall.o \
-                setup64.o bootflag.o e820.o reboot.o quirks.o i8237.o
+                setup64.o bootflag.o e820.o reboot.o quirks.o i8237.o \
+                dmi_scan.o
 
 obj-$(CONFIG_X86_MCE)         += mce.o
 obj-$(CONFIG_X86_MCE_INTEL)     += mce_intel.o
@@ -47,3 +48,5 @@ intel_cacheinfo-y		+= ../../i386/kernel/cpu/intel_cacheinfo.o
 quirks-y                        += ../../i386/kernel/quirks.o
 i8237-y                         += ../../i386/kernel/i8237.o
 msr-$(subst m,y,$(CONFIG_X86_MSR))  += ../../i386/kernel/msr.o
+dmi_scan-y                      += ../../i386/kernel/dmi_scan.o
+
diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c
index 33e77ec8da22..6810690d6045 100644
--- a/arch/x86_64/kernel/setup.c
+++ b/arch/x86_64/kernel/setup.c
@@ -44,6 +44,7 @@
 #include <linux/mmzone.h>
 #include <linux/kexec.h>
 #include <linux/cpufreq.h>
+#include <linux/dmi.h>
 
 #include <asm/mtrr.h>
 #include <asm/uaccess.h>
@@ -1392,3 +1393,11 @@ struct seq_operations cpuinfo_op = {
         .stop = c_stop,
         .show = show_cpuinfo,
 };
+
+static int __init run_dmi_scan(void)
+{
+        dmi_scan_machine();
+        return 0;
+}
+core_initcall(run_dmi_scan);
+