diff options
author | Jan Kara <jack@suse.cz> | 2013-08-09 10:49:58 +0200 |
---|---|---|
committer | Jan Kara <jack@suse.cz> | 2013-08-09 10:49:58 +0200 |
commit | 97a2847d064e2fdd2e3cd4ff14cad2f377f0677a (patch) | |
tree | e49ce105dc6febc25dc3ceba6070ea3998c7330c /arch/arm/kernel/smp_tlb.c | |
parent | e99a03c6f50a699d63b5751e3e88f84e43b037a7 (diff) | |
parent | d2d0395fd1778d4bf714adc5bfd23a5d748d7802 (diff) | |
download | op-kernel-dev-97a2847d064e2fdd2e3cd4ff14cad2f377f0677a.zip op-kernel-dev-97a2847d064e2fdd2e3cd4ff14cad2f377f0677a.tar.gz |
Merge branch 'for-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/jeffm/linux-reiserfs into for_next_testing
Reiserfs locking fixes.
Diffstat (limited to 'arch/arm/kernel/smp_tlb.c')
-rw-r--r-- | arch/arm/kernel/smp_tlb.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/arch/arm/kernel/smp_tlb.c b/arch/arm/kernel/smp_tlb.c index a98b62d..c2edfff 100644 --- a/arch/arm/kernel/smp_tlb.c +++ b/arch/arm/kernel/smp_tlb.c @@ -70,23 +70,6 @@ static inline void ipi_flush_bp_all(void *ignored) local_flush_bp_all(); } -#ifdef CONFIG_ARM_ERRATA_798181 -static int erratum_a15_798181(void) -{ - unsigned int midr = read_cpuid_id(); - - /* Cortex-A15 r0p0..r3p2 affected */ - if ((midr & 0xff0ffff0) != 0x410fc0f0 || midr > 0x413fc0f2) - return 0; - return 1; -} -#else -static int erratum_a15_798181(void) -{ - return 0; -} -#endif - static void ipi_flush_tlb_a15_erratum(void *arg) { dmb(); |