summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2009-10-20 02:26:29 +0200
committerTony Lindgren <tony@atomide.com>2009-10-20 02:26:29 +0200
commit72464dbae2749dd57bc2b3cd57d4fc6ba7abca37 (patch)
tree97a822b312880414275f6d30c92bd29ac0201917 /arch
parentomap: headers: Split entry-macro.S for mach-omap1 and mach-omap2 (diff)
downloadlinux-72464dbae2749dd57bc2b3cd57d4fc6ba7abca37.tar.xz
linux-72464dbae2749dd57bc2b3cd57d4fc6ba7abca37.zip
omap: Split vmalloc.h for mach-omap1 and mach-omap2
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-omap1/include/mach/vmalloc.h (renamed from arch/arm/plat-omap/include/mach/vmalloc.h)6
-rw-r--r--arch/arm/mach-omap2/include/mach/vmalloc.h20
2 files changed, 21 insertions, 5 deletions
diff --git a/arch/arm/plat-omap/include/mach/vmalloc.h b/arch/arm/mach-omap1/include/mach/vmalloc.h
index fc338a5db769..1b2af14df151 100644
--- a/arch/arm/plat-omap/include/mach/vmalloc.h
+++ b/arch/arm/mach-omap1/include/mach/vmalloc.h
@@ -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
index 000000000000..9ce9b6e8ad23
--- /dev/null
+++ b/arch/arm/mach-omap2/include/mach/vmalloc.h
@@ -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)