diff for duplicates of <20091020002059.GZ12576@atomide.com> diff --git a/a/2.hdr b/a/2.hdr deleted file mode 100644 index 8ccfcfd..0000000 --- a/a/2.hdr +++ /dev/null @@ -1,2 +0,0 @@ -Content-Type: text/x-diff; charset=us-ascii -Content-Disposition: inline; filename="vmalloc-fix.patch" diff --git a/a/2.txt b/a/2.txt deleted file mode 100644 index 8d130e3..0000000 --- a/a/2.txt +++ /dev/null @@ -1,101 +0,0 @@ ->From 4155da6fc9ac453636bbc505311b105a64da81f8 Mon Sep 17 00:00:00 2001 -From: Tony Lindgren <tony@atomide.com> -Date: Mon, 19 Oct 2009 17:11:27 -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/mach-omap1/include/mach/vmalloc.h b/arch/arm/mach-omap1/include/mach/vmalloc.h -index 085a18a..1b2af14 100644 ---- a/arch/arm/mach-omap1/include/mach/vmalloc.h -+++ b/arch/arm/mach-omap1/include/mach/vmalloc.h -@@ -1,5 +1,20 @@ - /* -- * arch/arm/mach-omap1/include/mach/vmalloc.h -+ * arch/arm/mach-omap1/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 - */ -- --#include <plat/vmalloc.h> -+#define VMALLOC_END (PAGE_OFFSET + 0x18000000) -diff --git a/arch/arm/mach-omap2/include/mach/vmalloc.h b/arch/arm/mach-omap2/include/mach/vmalloc.h -index 1423223..9ce9b6e 100644 ---- a/arch/arm/mach-omap2/include/mach/vmalloc.h -+++ b/arch/arm/mach-omap2/include/mach/vmalloc.h -@@ -1,5 +1,20 @@ - /* -- * arch/arm/mach-omap2/include/mach/vmalloc.h -+ * 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 - */ -- --#include <plat/vmalloc.h> -+#define VMALLOC_END (PAGE_OFFSET + 0x38000000) -diff --git a/arch/arm/plat-omap/include/plat/vmalloc.h b/arch/arm/plat-omap/include/plat/vmalloc.h -deleted file mode 100644 -index 9eebf62..0000000 ---- a/arch/arm/plat-omap/include/plat/vmalloc.h -+++ /dev/null -@@ -1,21 +0,0 @@ --/* -- * 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) -- diff --git a/a/content_digest b/N1/content_digest index d240ea9..ec2fdc2 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,12 +1,10 @@ "ref\020091016233624.2463.26653.stgit@localhost\0" "ref\020091016234213.2463.61298.stgit@localhost\0" - "From\0Tony Lindgren <tony@atomide.com>\0" - "Subject\0Re: [PATCH 11/14] omap: Remap L3, L4 to get more kernel io address space\0" + "From\0tony@atomide.com (Tony Lindgren)\0" + "Subject\0[PATCH 11/14] omap: Remap L3, L4 to get more kernel io address space\0" "Date\0Mon, 19 Oct 2009 17:20:59 -0700\0" "To\0linux-arm-kernel@lists.infradead.org\0" - "Cc\0linux-omap@vger.kernel.org" - " Santosh Shilimkar <santosh.shilimkar@ti.com>\0" - "\01:1\0" + "\00:1\0" "b\0" "* Tony Lindgren <tony@atomide.com> [091016 16:42]:\n" "> From: Santosh Shilimkar <santosh.shilimkar@ti.com>\n" @@ -50,109 +48,5 @@ "Regards,\n" "\n" Tony - "\01:2\0" - "fn\0vmalloc-fix.patch\0" - "b\0" - ">From 4155da6fc9ac453636bbc505311b105a64da81f8 Mon Sep 17 00:00:00 2001\n" - "From: Tony Lindgren <tony@atomide.com>\n" - "Date: Mon, 19 Oct 2009 17:11:27 -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/mach-omap1/include/mach/vmalloc.h b/arch/arm/mach-omap1/include/mach/vmalloc.h\n" - "index 085a18a..1b2af14 100644\n" - "--- a/arch/arm/mach-omap1/include/mach/vmalloc.h\n" - "+++ b/arch/arm/mach-omap1/include/mach/vmalloc.h\n" - "@@ -1,5 +1,20 @@\n" - " /*\n" - "- * arch/arm/mach-omap1/include/mach/vmalloc.h\n" - "+ * arch/arm/mach-omap1/include/mach/vmalloc.h\n" - "+ *\n" - "+ * Copyright (C) 2000 Russell King.\n" - "+ *\n" - "+ * This program is free software; you can redistribute it and/or modify\n" - "+ * it under the terms of the GNU General Public License as published by\n" - "+ * the Free Software Foundation; either version 2 of the License, or\n" - "+ * (at your option) any later version.\n" - "+ *\n" - "+ * This program is distributed in the hope that it will be useful,\n" - "+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\n" - "+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" - "+ * GNU General Public License for more details.\n" - "+ *\n" - "+ * You should have received a copy of the GNU General Public License\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" - "-\n" - "-#include <plat/vmalloc.h>\n" - "+#define VMALLOC_END\t(PAGE_OFFSET + 0x18000000)\n" - "diff --git a/arch/arm/mach-omap2/include/mach/vmalloc.h b/arch/arm/mach-omap2/include/mach/vmalloc.h\n" - "index 1423223..9ce9b6e 100644\n" - "--- a/arch/arm/mach-omap2/include/mach/vmalloc.h\n" - "+++ b/arch/arm/mach-omap2/include/mach/vmalloc.h\n" - "@@ -1,5 +1,20 @@\n" - " /*\n" - "- * arch/arm/mach-omap2/include/mach/vmalloc.h\n" - "+ * arch/arm/plat-omap/include/mach/vmalloc.h\n" - "+ *\n" - "+ * Copyright (C) 2000 Russell King.\n" - "+ *\n" - "+ * This program is free software; you can redistribute it and/or modify\n" - "+ * it under the terms of the GNU General Public License as published by\n" - "+ * the Free Software Foundation; either version 2 of the License, or\n" - "+ * (at your option) any later version.\n" - "+ *\n" - "+ * This program is distributed in the hope that it will be useful,\n" - "+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\n" - "+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" - "+ * GNU General Public License for more details.\n" - "+ *\n" - "+ * You should have received a copy of the GNU General Public License\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" - "-\n" - "-#include <plat/vmalloc.h>\n" - "+#define VMALLOC_END\t (PAGE_OFFSET + 0x38000000)\n" - "diff --git a/arch/arm/plat-omap/include/plat/vmalloc.h b/arch/arm/plat-omap/include/plat/vmalloc.h\n" - "deleted file mode 100644\n" - "index 9eebf62..0000000\n" - "--- a/arch/arm/plat-omap/include/plat/vmalloc.h\n" - "+++ /dev/null\n" - "@@ -1,21 +0,0 @@\n" - "-/*\n" - "- * arch/arm/plat-omap/include/mach/vmalloc.h\n" - "- *\n" - "- * Copyright (C) 2000 Russell King.\n" - "- *\n" - "- * This program is free software; you can redistribute it and/or modify\n" - "- * it under the terms of the GNU General Public License as published by\n" - "- * the Free Software Foundation; either version 2 of the License, or\n" - "- * (at your option) any later version.\n" - "- *\n" - "- * This program is distributed in the hope that it will be useful,\n" - "- * but WITHOUT ANY WARRANTY; without even the implied warranty of\n" - "- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" - "- * GNU General Public License for more details.\n" - "- *\n" - "- * You should have received a copy of the GNU General Public License\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" - "-#define VMALLOC_END\t (PAGE_OFFSET + 0x38000000)\n" - - -aa160fcabb23734a032639d69611dc349816092b722a1cbff6695757ce38a268 +74e76f8e5734bccf1b7664241ad1b51c896d6674fb8dc5d96965cc9b5077cd54
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.