[PATCH] [1/2] Move iomap.h into arch/x86/include/asm

[PATCH] [1/2] Move iomap.h into arch/x86/include/asm

[Andi Kleen]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 3236 bytes --]


Otherwise DRM doesn't compile:

In file included from linux-2.6.28-rc4/drivers/gpu/drm/i915/i915_drv.h:34,
                 from linux-2.6.28-rc4/drivers/gpu/drm/i915/i915_drv.c:33:
linux-2.6.28-rc4/include/linux/io-mapping.h:24:23: error: asm/iomap.h: No such file or directory


Signed-off-by: Andi Kleen <ak@linux.intel.com>

---
 arch/x86/include/asm/iomap.h |   30 ++++++++++++++++++++++++++++++
 include/asm-x86/iomap.h      |   30 ------------------------------
 2 files changed, 30 insertions(+), 30 deletions(-)

Index: linux-2.6.28-rc4-test/include/asm-x86/iomap.h
===================================================================
--- linux-2.6.28-rc4-test.orig/include/asm-x86/iomap.h	2008-11-10 09:03:09.000000000 +0100
+++ /dev/null	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-/*
- * Copyright © 2008 Ingo Molnar
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- */
-
-#include <linux/fs.h>
-#include <linux/mm.h>
-#include <linux/uaccess.h>
-#include <asm/cacheflush.h>
-#include <asm/pgtable.h>
-#include <asm/tlbflush.h>
-
-void *
-iomap_atomic_prot_pfn(unsigned long pfn, enum km_type type, pgprot_t prot);
-
-void
-iounmap_atomic(void *kvaddr, enum km_type type);
Index: linux-2.6.28-rc4-test/arch/x86/include/asm/iomap.h
===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.28-rc4-test/arch/x86/include/asm/iomap.h	2008-11-10 09:03:09.000000000 +0100
@@ -0,0 +1,30 @@
+/*
+ * Copyright © 2008 Ingo Molnar
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+#include <linux/fs.h>
+#include <linux/mm.h>
+#include <linux/uaccess.h>
+#include <asm/cacheflush.h>
+#include <asm/pgtable.h>
+#include <asm/tlbflush.h>
+
+void *
+iomap_atomic_prot_pfn(unsigned long pfn, enum km_type type, pgprot_t prot);
+
+void
+iounmap_atomic(void *kvaddr, enum km_type type);

[PATCH] [2/2] Fix warning with !CONFIG_X86_RESERVE_LOW_64K

[Andi Kleen]

Signed-off-by: Andi Kleen <ak@linux.intel.com>

---
 arch/x86/kernel/setup.c |    2 ++
 1 file changed, 2 insertions(+)

Index: linux-2.6.28-rc4-test/arch/x86/kernel/setup.c
===================================================================
--- linux-2.6.28-rc4-test.orig/arch/x86/kernel/setup.c	2008-10-24 13:34:40.000000000 +0200
+++ linux-2.6.28-rc4-test/arch/x86/kernel/setup.c	2008-11-10 09:06:00.000000000 +0100
@@ -738,6 +738,7 @@
 }
 #endif
 
+#ifdef CONFIG_X86_RESERVE_LOW_64K
 static int __init dmi_low_memory_corruption(const struct dmi_system_id *d)
 {
 	printk(KERN_NOTICE
@@ -749,6 +750,7 @@
 
 	return 0;
 }
+#endif
 
 /* List of systems that have known low memory corruption BIOS problems */
 static struct dmi_system_id __initdata bad_bios_dmi_table[] = {