omap: Split vmalloc.h for mach-omap1 and mach-omap2
authorTony Lindgren <tony@atomide.com>
Tue, 20 Oct 2009 00:26:29 +0000 (17:26 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 20 Oct 2009 00:26:29 +0000 (17:26 -0700)
Earlier patch "omap: Remap L3, L4 to get more kernel io address space"
changed the VMALLOC_END.

However, this change causes problems on mach-omap1:

BUG: mapping for 0xe0000000 at 0xe0000000 overlaps vmalloc space
BUG: mapping for 0xe1000000 at 0xe1000000 overlaps vmalloc space

Fix this by creating separate vmalloc.h files for mach-omap1
and mach-omap2.

Signed-off-by: Tony Lindgren <tony@atomide.com>
arch/arm/mach-omap1/include/mach/vmalloc.h [moved from arch/arm/plat-omap/include/mach/vmalloc.h with 86% similarity]
arch/arm/mach-omap2/include/mach/vmalloc.h [new file with mode: 0644]

similarity index 86%
rename from arch/arm/plat-omap/include/mach/vmalloc.h
rename to arch/arm/mach-omap1/include/mach/vmalloc.h
index fc338a5..1b2af14 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  arch/arm/plat-omap/include/mach/vmalloc.h
+ *  arch/arm/mach-omap1/include/mach/vmalloc.h
  *
  *  Copyright (C) 2000 Russell King.
  *
@@ -17,8 +17,4 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-#ifdef CONFIG_ARCH_OMAP1
 #define VMALLOC_END    (PAGE_OFFSET + 0x18000000)
-#else
-#define VMALLOC_END    (PAGE_OFFSET + 0x38000000)
-#endif
diff --git a/arch/arm/mach-omap2/include/mach/vmalloc.h b/arch/arm/mach-omap2/include/mach/vmalloc.h
new file mode 100644 (file)
index 0000000..9ce9b6e
--- /dev/null
@@ -0,0 +1,20 @@
+/*
+ *  arch/arm/plat-omap/include/mach/vmalloc.h
+ *
+ *  Copyright (C) 2000 Russell King.
+ *
+ * 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
+ */
+#define VMALLOC_END      (PAGE_OFFSET + 0x38000000)