diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-04-25 12:24:16 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-04-25 12:24:16 +0200 |
| commit | cd32b1616bc79b2f2ce1b1c6164beecfecc2259c (patch) | |
| tree | 2e91c49b5c2bd927b9b74b7414dbb6839af601e1 /arch/arm/mm/fault.c | |
| parent | x32, siginfo: Provide proper overrides for x32 siginfo_t (diff) | |
| parent | x86, intel_cacheinfo: Fix error return code in amd_set_l3_disable_slot() (diff) | |
| download | linux-cd32b1616bc79b2f2ce1b1c6164beecfecc2259c.tar.xz linux-cd32b1616bc79b2f2ce1b1c6164beecfecc2259c.zip | |
Merge tag 'l3-fix-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp into x86/urgent
A small L3 cache index disable fix from Srivatsa Bhat which unifies the
way the code checks for already disabled indices.
( Pulling it into v3.4 despite the v3.5 tag - the fix is small and we better
keep the same code across kernel versions for such user facing interfaces. )
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/mm/fault.c')
| -rw-r--r-- | arch/arm/mm/fault.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c index 9055b5a84ec5..f07467533365 100644 --- a/arch/arm/mm/fault.c +++ b/arch/arm/mm/fault.c @@ -320,7 +320,7 @@ retry: */ perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, regs, addr); - if (flags & FAULT_FLAG_ALLOW_RETRY) { + if (!(fault & VM_FAULT_ERROR) && flags & FAULT_FLAG_ALLOW_RETRY) { if (fault & VM_FAULT_MAJOR) { tsk->maj_flt++; perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MAJ, 1, |