diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2016-01-18 23:20:18 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2016-01-18 23:20:18 +0000 |
| commit | 6715c1e6c65f1215c0fbd1a51cb0a36ed5b6c04b (patch) | |
| tree | 58f21884617d1d6d425501b24ea3f9a74985744e /target/linux | |
| parent | 16cfed3365a82eeeff2d6b93a3dd6711effb6424 (diff) | |
| download | master-187ad058-6715c1e6c65f1215c0fbd1a51cb0a36ed5b6c04b.tar.gz master-187ad058-6715c1e6c65f1215c0fbd1a51cb0a36ed5b6c04b.tar.bz2 master-187ad058-6715c1e6c65f1215c0fbd1a51cb0a36ed5b6c04b.zip | |
kernel: work around CONFIG_CPU_SW_DOMAIN_PAN breakage on ARM11 MPCore
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48335 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/generic/patches-4.4/100-ARM-work-around-CONFIG_CPU_SW_DOMAIN_PAN-breakage-on.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/target/linux/generic/patches-4.4/100-ARM-work-around-CONFIG_CPU_SW_DOMAIN_PAN-breakage-on.patch b/target/linux/generic/patches-4.4/100-ARM-work-around-CONFIG_CPU_SW_DOMAIN_PAN-breakage-on.patch new file mode 100644 index 0000000000..3156a54fee --- /dev/null +++ b/target/linux/generic/patches-4.4/100-ARM-work-around-CONFIG_CPU_SW_DOMAIN_PAN-breakage-on.patch @@ -0,0 +1,44 @@ +From: Felix Fietkau <nbd@openwrt.org> +Date: Tue, 19 Jan 2016 00:18:09 +0100 +Subject: [PATCH] ARM: work around CONFIG_CPU_SW_DOMAIN_PAN breakage on ARM11 + MPCore + +Patch taken from http://www.spinics.net/lists/arm-kernel/msg450888.html + +Signed-off-by: Felix Fietkau <nbd@openwrt.org> +--- + +--- a/arch/arm/kernel/smp_tlb.c ++++ b/arch/arm/kernel/smp_tlb.c +@@ -9,6 +9,7 @@ + */ + #include <linux/preempt.h> + #include <linux/smp.h> ++#include <linux/uaccess.h> + + #include <asm/smp_plat.h> + #include <asm/tlbflush.h> +@@ -40,8 +41,11 @@ static inline void ipi_flush_tlb_mm(void + static inline void ipi_flush_tlb_page(void *arg) + { + struct tlb_args *ta = (struct tlb_args *)arg; ++ unsigned int __ua_flags = uaccess_save_and_enable(); + + local_flush_tlb_page(ta->ta_vma, ta->ta_start); ++ ++ uaccess_restore(__ua_flags); + } + + static inline void ipi_flush_tlb_kernel_page(void *arg) +@@ -54,8 +58,11 @@ static inline void ipi_flush_tlb_kernel_ + static inline void ipi_flush_tlb_range(void *arg) + { + struct tlb_args *ta = (struct tlb_args *)arg; ++ unsigned int __ua_flags = uaccess_save_and_enable(); + + local_flush_tlb_range(ta->ta_vma, ta->ta_start, ta->ta_end); ++ ++ uaccess_restore(__ua_flags); + } + + static inline void ipi_flush_tlb_kernel_range(void *arg) |