diff for duplicates of <20091020165714.GC12576@atomide.com> diff --git a/a/1.txt b/N1/1.txt index e63de81..129db81 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -4,62 +4,3 @@ different VMALLOC_END on omap1 and omap2. Regards, Tony - ->From 72464dbae2749dd57bc2b3cd57d4fc6ba7abca37 Mon Sep 17 00:00:00 2001 -From: Tony Lindgren <tony@atomide.com> -Date: Mon, 19 Oct 2009 17:26:29 -0700 -Subject: [PATCH] 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> - -diff --git a/arch/arm/plat-omap/include/mach/vmalloc.h b/arch/arm/mach-omap1/include/mach/vmalloc.h -similarity index 86% -copy from arch/arm/plat-omap/include/mach/vmalloc.h -copy to arch/arm/mach-omap1/include/mach/vmalloc.h -index fc338a5..1b2af14 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/plat-omap/include/mach/vmalloc.h b/arch/arm/mach-omap2/include/mach/vmalloc.h -similarity index 85% -rename from arch/arm/plat-omap/include/mach/vmalloc.h -rename to arch/arm/mach-omap2/include/mach/vmalloc.h -index fc338a5..9ce9b6e 100644 ---- a/arch/arm/plat-omap/include/mach/vmalloc.h -+++ b/arch/arm/mach-omap2/include/mach/vmalloc.h -@@ -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 -+#define VMALLOC_END (PAGE_OFFSET + 0x38000000) diff --git a/a/content_digest b/N1/content_digest index 84d8061..77ea7b9 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,10 +1,9 @@ "ref\020091014213748.30227.71513.stgit@kaulin.muru.com\0" "ref\020091014214920.30227.10280.stgit@kaulin.muru.com\0" - "From\0Tony Lindgren <tony@atomide.com>\0" + "From\0tony@atomide.com (Tony Lindgren)\0" "Subject\0[PATCH 3b/6] omap: Split vmalloc.h for mach-omap1 and mach-omap2\0" "Date\0Tue, 20 Oct 2009 09:57:14 -0700\0" "To\0linux-arm-kernel@lists.infradead.org\0" - "Cc\0linux-omap@vger.kernel.org\0" "\00:1\0" "b\0" "I've added a patch to split vmalloc.h into this series to allow\n" @@ -12,65 +11,6 @@ "\n" "Regards,\n" "\n" - "Tony\n" - "\n" - ">From 72464dbae2749dd57bc2b3cd57d4fc6ba7abca37 Mon Sep 17 00:00:00 2001\n" - "From: Tony Lindgren <tony@atomide.com>\n" - "Date: Mon, 19 Oct 2009 17:26:29 -0700\n" - "Subject: [PATCH] omap: Split vmalloc.h for mach-omap1 and mach-omap2\n" - "\n" - "Earlier patch \"omap: Remap L3, L4 to get more kernel io address space\"\n" - "changed the VMALLOC_END.\n" - "\n" - "However, this change causes problems on mach-omap1:\n" - "\n" - "BUG: mapping for 0xe0000000 at 0xe0000000 overlaps vmalloc space\n" - "BUG: mapping for 0xe1000000 at 0xe1000000 overlaps vmalloc space\n" - "\n" - "Fix this by creating separate vmalloc.h files for mach-omap1\n" - "and mach-omap2.\n" - "\n" - "Signed-off-by: Tony Lindgren <tony@atomide.com>\n" - "\n" - "diff --git a/arch/arm/plat-omap/include/mach/vmalloc.h b/arch/arm/mach-omap1/include/mach/vmalloc.h\n" - "similarity index 86%\n" - "copy from arch/arm/plat-omap/include/mach/vmalloc.h\n" - "copy to arch/arm/mach-omap1/include/mach/vmalloc.h\n" - "index fc338a5..1b2af14 100644\n" - "--- a/arch/arm/plat-omap/include/mach/vmalloc.h\n" - "+++ b/arch/arm/mach-omap1/include/mach/vmalloc.h\n" - "@@ -1,5 +1,5 @@\n" - " /*\n" - "- * arch/arm/plat-omap/include/mach/vmalloc.h\n" - "+ * arch/arm/mach-omap1/include/mach/vmalloc.h\n" - " *\n" - " * Copyright (C) 2000 Russell King.\n" - " *\n" - "@@ -17,8 +17,4 @@\n" - " * along with this program; if not, write to the Free Software\n" - " * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" - " */\n" - "-#ifdef CONFIG_ARCH_OMAP1\n" - " #define VMALLOC_END\t(PAGE_OFFSET + 0x18000000)\n" - "-#else\n" - "-#define VMALLOC_END\t(PAGE_OFFSET + 0x38000000)\n" - "-#endif\n" - "diff --git a/arch/arm/plat-omap/include/mach/vmalloc.h b/arch/arm/mach-omap2/include/mach/vmalloc.h\n" - "similarity index 85%\n" - "rename from arch/arm/plat-omap/include/mach/vmalloc.h\n" - "rename to arch/arm/mach-omap2/include/mach/vmalloc.h\n" - "index fc338a5..9ce9b6e 100644\n" - "--- a/arch/arm/plat-omap/include/mach/vmalloc.h\n" - "+++ b/arch/arm/mach-omap2/include/mach/vmalloc.h\n" - "@@ -17,8 +17,4 @@\n" - " * along with this program; if not, write to the Free Software\n" - " * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" - " */\n" - "-#ifdef CONFIG_ARCH_OMAP1\n" - "-#define VMALLOC_END\t(PAGE_OFFSET + 0x18000000)\n" - "-#else\n" - "-#define VMALLOC_END\t(PAGE_OFFSET + 0x38000000)\n" - "-#endif\n" - "+#define VMALLOC_END\t (PAGE_OFFSET + 0x38000000)" + Tony -df516b79e28eb70ef8bdde944298616998d4682ec08b7ad7ddf21ec5ab290c75 +43f9cfc8ee9c1cf48a0e1ce0703a5f2d01cf39702c69aa3f624e5de4702b91e0
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.