From: Greg Kroah-Hartman Date: Tue, 7 May 2013 17:24:00 +0000 (-0700) Subject: delete arm-7702-1-set-the-page-table-freeing-ceiling-to-task_size.patch X-Git-Tag: v3.0.77~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=38105eabc5c0ae6a67f69b7577417a4c44f52032;p=thirdparty%2Fkernel%2Fstable-queue.git delete arm-7702-1-set-the-page-table-freeing-ceiling-to-task_size.patch From 3.4, 3.8, and 3.9 trees, it duplicated an existing patch. --- diff --git a/queue-3.4/arm-7702-1-set-the-page-table-freeing-ceiling-to-task_size.patch b/queue-3.4/arm-7702-1-set-the-page-table-freeing-ceiling-to-task_size.patch deleted file mode 100644 index a4e7760b57e..00000000000 --- a/queue-3.4/arm-7702-1-set-the-page-table-freeing-ceiling-to-task_size.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 6aaa189f8712471a250bfdf8fc8d08277258b8ab Mon Sep 17 00:00:00 2001 -From: Catalin Marinas -Date: Tue, 23 Apr 2013 11:21:44 +0100 -Subject: ARM: 7702/1: Set the page table freeing ceiling to TASK_SIZE - -From: Catalin Marinas - -commit 6aaa189f8712471a250bfdf8fc8d08277258b8ab upstream. - -ARM processors with LPAE enabled use 3 levels of page tables, with an -entry in the top level (pgd) covering 1GB of virtual space. Because of -the branch relocation limitations on ARM, the loadable modules are -mapped 16MB below PAGE_OFFSET, making the corresponding 1GB pgd shared -between kernel modules and user space. - -If free_pgtables() is called with the default ceiling 0, -free_pgd_range() (and subsequently called functions) also frees the page -table shared between user space and kernel modules (which is normally -handled by the ARM-specific pgd_free() function). This patch changes -defines the ARM USER_PGTABLES_CEILING to TASK_SIZE when CONFIG_ARM_LPAE -is enabled. - -Note that the pgd_free() function already checks the presence of the -shared pmd page allocated by pgd_alloc() and frees it, though with -ceiling 0 this wasn't necessary. - -Signed-off-by: Catalin Marinas -Cc: Hugh Dickins -Cc: Andrew Morton -Signed-off-by: Russell King -Signed-off-by: Greg Kroah-Hartman - ---- - arch/arm/include/asm/pgtable.h | 9 +++++++++ - 1 file changed, 9 insertions(+) - ---- a/arch/arm/include/asm/pgtable.h -+++ b/arch/arm/include/asm/pgtable.h -@@ -70,6 +70,15 @@ extern void __pgd_error(const char *file - #endif - - /* -+ * Use TASK_SIZE as the ceiling argument for free_pgtables() and -+ * free_pgd_range() to avoid freeing the modules pmd when LPAE is enabled (pmd -+ * page shared between user and kernel). -+ */ -+#ifdef CONFIG_ARM_LPAE -+#define USER_PGTABLES_CEILING TASK_SIZE -+#endif -+ -+/* - * The pgprot_* and protection_map entries will be fixed up in runtime - * to include the cachable and bufferable bits based on memory policy, - * as well as any architecture dependent bits like global/ASID and SMP diff --git a/queue-3.4/series b/queue-3.4/series index 4bd3c72f395..3aabcfbe519 100644 --- a/queue-3.4/series +++ b/queue-3.4/series @@ -35,7 +35,6 @@ mm-allow-arch-code-to-control-the-user-page-table-ceiling.patch alsa-snd-usb-try-harder-to-find-usb_dt_cs_endpoint.patch alsa-usb-audio-disable-autopm-for-midi-devices.patch alsa-usb-audio-fix-autopm-error-during-probing.patch -arm-7702-1-set-the-page-table-freeing-ceiling-to-task_size.patch asoc-max98088-fix-logging-of-hardware-revision.patch hrtimer-fix-ktime_add_ns-overflow-on-32bit-architectures.patch hrtimer-add-expiry-time-overflow-check-in-hrtimer_interrupt.patch diff --git a/queue-3.8/arm-7702-1-set-the-page-table-freeing-ceiling-to-task_size.patch b/queue-3.8/arm-7702-1-set-the-page-table-freeing-ceiling-to-task_size.patch deleted file mode 100644 index a4e7760b57e..00000000000 --- a/queue-3.8/arm-7702-1-set-the-page-table-freeing-ceiling-to-task_size.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 6aaa189f8712471a250bfdf8fc8d08277258b8ab Mon Sep 17 00:00:00 2001 -From: Catalin Marinas -Date: Tue, 23 Apr 2013 11:21:44 +0100 -Subject: ARM: 7702/1: Set the page table freeing ceiling to TASK_SIZE - -From: Catalin Marinas - -commit 6aaa189f8712471a250bfdf8fc8d08277258b8ab upstream. - -ARM processors with LPAE enabled use 3 levels of page tables, with an -entry in the top level (pgd) covering 1GB of virtual space. Because of -the branch relocation limitations on ARM, the loadable modules are -mapped 16MB below PAGE_OFFSET, making the corresponding 1GB pgd shared -between kernel modules and user space. - -If free_pgtables() is called with the default ceiling 0, -free_pgd_range() (and subsequently called functions) also frees the page -table shared between user space and kernel modules (which is normally -handled by the ARM-specific pgd_free() function). This patch changes -defines the ARM USER_PGTABLES_CEILING to TASK_SIZE when CONFIG_ARM_LPAE -is enabled. - -Note that the pgd_free() function already checks the presence of the -shared pmd page allocated by pgd_alloc() and frees it, though with -ceiling 0 this wasn't necessary. - -Signed-off-by: Catalin Marinas -Cc: Hugh Dickins -Cc: Andrew Morton -Signed-off-by: Russell King -Signed-off-by: Greg Kroah-Hartman - ---- - arch/arm/include/asm/pgtable.h | 9 +++++++++ - 1 file changed, 9 insertions(+) - ---- a/arch/arm/include/asm/pgtable.h -+++ b/arch/arm/include/asm/pgtable.h -@@ -70,6 +70,15 @@ extern void __pgd_error(const char *file - #endif - - /* -+ * Use TASK_SIZE as the ceiling argument for free_pgtables() and -+ * free_pgd_range() to avoid freeing the modules pmd when LPAE is enabled (pmd -+ * page shared between user and kernel). -+ */ -+#ifdef CONFIG_ARM_LPAE -+#define USER_PGTABLES_CEILING TASK_SIZE -+#endif -+ -+/* - * The pgprot_* and protection_map entries will be fixed up in runtime - * to include the cachable and bufferable bits based on memory policy, - * as well as any architecture dependent bits like global/ASID and SMP diff --git a/queue-3.8/series b/queue-3.8/series index 15f021dd736..2f840796a3f 100644 --- a/queue-3.8/series +++ b/queue-3.8/series @@ -60,7 +60,6 @@ alsa-usb-audio-disable-autopm-for-midi-devices.patch alsa-usb-audio-fix-autopm-error-during-probing.patch alsa-usb-adjust-for-changed-3.8-usb-api.patch alsa-hda-add-the-support-for-alc286-codec.patch -arm-7702-1-set-the-page-table-freeing-ceiling-to-task_size.patch asoc-max98088-fix-logging-of-hardware-revision.patch hrtimer-fix-ktime_add_ns-overflow-on-32bit-architectures.patch hrtimer-add-expiry-time-overflow-check-in-hrtimer_interrupt.patch diff --git a/queue-3.9/arm-7702-1-set-the-page-table-freeing-ceiling-to-task_size.patch b/queue-3.9/arm-7702-1-set-the-page-table-freeing-ceiling-to-task_size.patch deleted file mode 100644 index a4e7760b57e..00000000000 --- a/queue-3.9/arm-7702-1-set-the-page-table-freeing-ceiling-to-task_size.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 6aaa189f8712471a250bfdf8fc8d08277258b8ab Mon Sep 17 00:00:00 2001 -From: Catalin Marinas -Date: Tue, 23 Apr 2013 11:21:44 +0100 -Subject: ARM: 7702/1: Set the page table freeing ceiling to TASK_SIZE - -From: Catalin Marinas - -commit 6aaa189f8712471a250bfdf8fc8d08277258b8ab upstream. - -ARM processors with LPAE enabled use 3 levels of page tables, with an -entry in the top level (pgd) covering 1GB of virtual space. Because of -the branch relocation limitations on ARM, the loadable modules are -mapped 16MB below PAGE_OFFSET, making the corresponding 1GB pgd shared -between kernel modules and user space. - -If free_pgtables() is called with the default ceiling 0, -free_pgd_range() (and subsequently called functions) also frees the page -table shared between user space and kernel modules (which is normally -handled by the ARM-specific pgd_free() function). This patch changes -defines the ARM USER_PGTABLES_CEILING to TASK_SIZE when CONFIG_ARM_LPAE -is enabled. - -Note that the pgd_free() function already checks the presence of the -shared pmd page allocated by pgd_alloc() and frees it, though with -ceiling 0 this wasn't necessary. - -Signed-off-by: Catalin Marinas -Cc: Hugh Dickins -Cc: Andrew Morton -Signed-off-by: Russell King -Signed-off-by: Greg Kroah-Hartman - ---- - arch/arm/include/asm/pgtable.h | 9 +++++++++ - 1 file changed, 9 insertions(+) - ---- a/arch/arm/include/asm/pgtable.h -+++ b/arch/arm/include/asm/pgtable.h -@@ -70,6 +70,15 @@ extern void __pgd_error(const char *file - #endif - - /* -+ * Use TASK_SIZE as the ceiling argument for free_pgtables() and -+ * free_pgd_range() to avoid freeing the modules pmd when LPAE is enabled (pmd -+ * page shared between user and kernel). -+ */ -+#ifdef CONFIG_ARM_LPAE -+#define USER_PGTABLES_CEILING TASK_SIZE -+#endif -+ -+/* - * The pgprot_* and protection_map entries will be fixed up in runtime - * to include the cachable and bufferable bits based on memory policy, - * as well as any architecture dependent bits like global/ASID and SMP diff --git a/queue-3.9/series b/queue-3.9/series index 8d831c97748..47bf21d4325 100644 --- a/queue-3.9/series +++ b/queue-3.9/series @@ -64,7 +64,6 @@ alsa-usb-audio-fix-autopm-error-during-probing.patch alsa-usb-adjust-for-changed-3.8-usb-api.patch alsa-hda-fix-aamix-activation-with-loopback-control-on-via-codecs.patch alsa-hda-add-the-support-for-alc286-codec.patch -arm-7702-1-set-the-page-table-freeing-ceiling-to-task_size.patch asoc-max98088-fix-logging-of-hardware-revision.patch hrtimer-fix-ktime_add_ns-overflow-on-32bit-architectures.patch hrtimer-add-expiry-time-overflow-check-in-hrtimer_interrupt.patch