Merge branch 'slab-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/christoph/vm

[linux-2.6-omap-h63xx.git] / include / asm-x86 / dmi.h

diff --git a/include/asm-x86/dmi.h b/include/asm-x86/dmi.h
index c9e4e8ebc2708611c18bf367ffe94cad1e64fed9..1241e6ad1935b99c6273554eb8501f05833b28cb 100644 (file)
--- a/include/asm-x86/dmi.h
+++ b/include/asm-x86/dmi.h
@@ -1,5 +1,33 @@
+#ifndef _ASM_X86_DMI_H
+#define _ASM_X86_DMI_H
+
+#include <asm/io.h>
+
 #ifdef CONFIG_X86_32
-# include "dmi_32.h"
-#else
-# include "dmi_64.h"
+
+#define dmi_alloc alloc_bootmem
+
+#else /* CONFIG_X86_32 */
+
+#define DMI_MAX_DATA 2048
+
+extern int dmi_alloc_index;
+extern char dmi_alloc_data[DMI_MAX_DATA];
+
+/* This is so early that there is no good way to allocate dynamic memory.
+   Allocate data in an BSS array. */
+static inline void *dmi_alloc(unsigned len)
+{
+       int idx = dmi_alloc_index;
+       if ((dmi_alloc_index + len) > DMI_MAX_DATA)
+               return NULL;
+       dmi_alloc_index += len;
+       return dmi_alloc_data + idx;
+}
+
+#endif
+
+#define dmi_ioremap early_ioremap
+#define dmi_iounmap early_iounmap
+
 #endif