diff for duplicates of <20141118172146.3784.81151.stgit@buzz> diff --git a/a/1.txt b/N1/1.txt index ba1f40b..e7319f7 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -140,7 +140,7 @@ index e731018..17745c2 100644 +#endif /* CONFIG_MODULES_USE_VMALLOC */ + /* - * The XIP kernel gets mapped@the bottom of the module vm area. + * The XIP kernel gets mapped at the bottom of the module vm area. * Since we use sections to map it, this macro replaces the physical address diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h index 4767eb9..c4c8d26 100644 @@ -252,7 +252,7 @@ index 9481f85..985aed8 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c @@ -595,7 +595,9 @@ void __init mem_init(void) - * be detected@build time already. + * be detected at build time already. */ #ifdef CONFIG_MMU +#ifndef CONFIG_MODULES_USE_VMALLOC diff --git a/a/content_digest b/N1/content_digest index 6f2b8c7..881ead2 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,10 @@ - "From\0k.khlebnikov@samsung.com (Konstantin Khlebnikov)\0" + "From\0Konstantin Khlebnikov <k.khlebnikov@samsung.com>\0" "Subject\0[PATCH RFC] ARM: option for loading modules into vmalloc area\0" "Date\0Tue, 18 Nov 2014 20:21:46 +0400\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Russell King <linux@arm.linux.org.uk>" + linux-kernel@vger.kernel.org + " linux-arm-kernel@lists.infradead.org\0" + "Cc\0Andrey Ryabinin <a.ryabinin@samsung.com>\0" "\00:1\0" "b\0" "Usually modules are loaded into small area prior to the kernel\n" @@ -146,7 +149,7 @@ "+#endif /* CONFIG_MODULES_USE_VMALLOC */\n" "+\n" " /*\n" - " * The XIP kernel gets mapped@the bottom of the module vm area.\n" + " * The XIP kernel gets mapped at the bottom of the module vm area.\n" " * Since we use sections to map it, this macro replaces the physical address\n" "diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h\n" "index 4767eb9..c4c8d26 100644\n" @@ -258,7 +261,7 @@ "--- a/arch/arm/mm/init.c\n" "+++ b/arch/arm/mm/init.c\n" "@@ -595,7 +595,9 @@ void __init mem_init(void)\n" - " \t * be detected@build time already.\n" + " \t * be detected at build time already.\n" " \t */\n" " #ifdef CONFIG_MMU\n" "+#ifndef CONFIG_MODULES_USE_VMALLOC\n" @@ -318,4 +321,4 @@ " \tif (!vectors_high()) {\n" " \t\t/*" -e573239bc603076ae0fc96a8da96f6b7ba668db31b7daa65f97bfabdb8a9efb4 +21b3ce3328bd7face2834f14b5cc73724e9b630f0ddaaa5ab67a243a3d8fd990
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.