Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 arch/i386/Kconfig           |    4 ++++
 arch/i386/kernel/dmi_scan.c |   16 ++++++++--------
 arch/i386/kernel/setup.c    |    2 +-
 arch/x86_64/Kconfig         |    4 ++++
 arch/x86_64/kernel/Makefile |    5 ++++-
 arch/x86_64/kernel/setup.c  |    9 +++++++++
 include/asm-i386/io.h       |    5 +++++
 include/asm-x86_64/io.h     |    5 +++++
 include/linux/dmi.h         |    5 ++++-
 9 files changed, 44 insertions(+), 11 deletions(-)

diff -puN arch/i386/Kconfig~x86_64-dmi arch/i386/Kconfig
--- devel/arch/i386/Kconfig~x86_64-dmi	2006-01-07 01:17:27.000000000 -0800
+++ devel-akpm/arch/i386/Kconfig	2006-01-07 01:17:27.000000000 -0800
@@ -45,6 +45,10 @@ config ARCH_MAY_HAVE_PC_FDC
 	bool
 	default y
 
+config DMI
+	bool
+	default y
+
 source "init/Kconfig"
 
 menu "Processor type and features"
diff -puN arch/i386/kernel/dmi_scan.c~x86_64-dmi arch/i386/kernel/dmi_scan.c
--- devel/arch/i386/kernel/dmi_scan.c~x86_64-dmi	2006-01-07 01:17:27.000000000 -0800
+++ devel-akpm/arch/i386/kernel/dmi_scan.c	2006-01-07 01:17:27.000000000 -0800
@@ -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 d
 		}
 
 		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, in
 	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, in
 		data += 2;
 		i++;
 	}
-	bt_iounmap(buf, len);
+	dmi_iounmap(buf, len);
 	return 0;
 }
 
@@ -112,7 +112,7 @@ static void __init dmi_save_devices(stru
 		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_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(
 
 	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 -puN arch/i386/kernel/setup.c~x86_64-dmi arch/i386/kernel/setup.c
--- devel/arch/i386/kernel/setup.c~x86_64-dmi	2006-01-07 01:17:27.000000000 -0800
+++ devel-akpm/arch/i386/kernel/setup.c	2006-01-07 01:17:27.000000000 -0800
@@ -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 -puN arch/x86_64/Kconfig~x86_64-dmi arch/x86_64/Kconfig
--- devel/arch/x86_64/Kconfig~x86_64-dmi	2006-01-07 01:17:27.000000000 -0800
+++ devel-akpm/arch/x86_64/Kconfig	2006-01-07 01:17:27.000000000 -0800
@@ -69,6 +69,10 @@ config ARCH_MAY_HAVE_PC_FDC
 	bool
 	default y
 
+config DMI
+	bool
+	default y
+
 source "init/Kconfig"
 
 
diff -puN arch/x86_64/kernel/Makefile~x86_64-dmi arch/x86_64/kernel/Makefile
--- devel/arch/x86_64/kernel/Makefile~x86_64-dmi	2006-01-07 01:17:27.000000000 -0800
+++ devel-akpm/arch/x86_64/kernel/Makefile	2006-01-07 01:17:27.000000000 -0800
@@ -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
@@ -46,3 +47,5 @@ intel_cacheinfo-y		+= ../../i386/kernel/
 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 -puN arch/x86_64/kernel/setup.c~x86_64-dmi arch/x86_64/kernel/setup.c
--- devel/arch/x86_64/kernel/setup.c~x86_64-dmi	2006-01-07 01:17:27.000000000 -0800
+++ devel-akpm/arch/x86_64/kernel/setup.c	2006-01-07 01:17:46.000000000 -0800
@@ -43,6 +43,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>
@@ -1356,3 +1357,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);
+
diff -puN include/asm-i386/io.h~x86_64-dmi include/asm-i386/io.h
--- devel/include/asm-i386/io.h~x86_64-dmi	2006-01-07 01:17:27.000000000 -0800
+++ devel-akpm/include/asm-i386/io.h	2006-01-07 01:17:27.000000000 -0800
@@ -131,6 +131,11 @@ extern void iounmap(volatile void __iome
 extern void *bt_ioremap(unsigned long offset, unsigned long size);
 extern void bt_iounmap(void *addr, unsigned long size);
 
+/* Use early IO mappings for DMI because it's initialized early */
+#define dmi_ioremap bt_ioremap
+#define dmi_iounmap bt_iounmap
+#define dmi_alloc alloc_bootmem
+
 /*
  * ISA I/O bus memory addresses are 1:1 with the physical address.
  */
diff -puN include/asm-x86_64/io.h~x86_64-dmi include/asm-x86_64/io.h
--- devel/include/asm-x86_64/io.h~x86_64-dmi	2006-01-07 01:17:27.000000000 -0800
+++ devel-akpm/include/asm-x86_64/io.h	2006-01-07 01:17:27.000000000 -0800
@@ -143,6 +143,11 @@ static inline void __iomem * ioremap (un
 extern void __iomem * ioremap_nocache (unsigned long offset, unsigned long size);
 extern void iounmap(volatile void __iomem *addr);
 
+/* Use normal IO mappings for DMI */
+#define dmi_ioremap ioremap
+#define dmi_iounmap(x,l) iounmap(x)
+#define dmi_alloc(l) kmalloc(l, GFP_ATOMIC)
+
 /*
  * ISA I/O bus memory addresses are 1:1 with the physical address.
  */
diff -puN include/linux/dmi.h~x86_64-dmi include/linux/dmi.h
--- devel/include/linux/dmi.h~x86_64-dmi	2006-01-07 01:17:27.000000000 -0800
+++ devel-akpm/include/linux/dmi.h	2006-01-07 01:17:27.000000000 -0800
@@ -2,6 +2,7 @@
 #define __DMI_H__
 
 #include <linux/list.h>
+#include <linux/config.h>
 
 enum dmi_field {
 	DMI_NONE,
@@ -60,12 +61,14 @@ struct dmi_device {
 	void *device_data;	/* Type specific data */
 };
 
-#if defined(CONFIG_X86_32)
+#ifdef CONFIG_DMI
 
 extern int dmi_check_system(struct dmi_system_id *list);
 extern char * dmi_get_system_info(int field);
 extern struct dmi_device * dmi_find_device(int type, const char *name,
 	struct dmi_device *from);
+extern void dmi_scan_machine(void);
+
 #else
 
 static inline int dmi_check_system(struct dmi_system_id *list) { return 0; }
_