diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2015-02-04 12:03:21 +1100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2015-02-04 12:03:21 +1100 |
| commit | a604c96eb07b2b65734a8aa0e9e8c1bfc435ee4f (patch) | |
| tree | b1fad9ec35f0282acddbf71f3885a0b6a85f399b /arch/powerpc/mm/tlb_nohash.c | |
| parent | 5c65670c9bfa3be1234d29f36b742897c0360ef3 (diff) | |
| parent | 0dc294f717d41bfbafc746a7a96a7bc0f114c20c (diff) | |
| download | blackbird-op-linux-a604c96eb07b2b65734a8aa0e9e8c1bfc435ee4f.tar.gz blackbird-op-linux-a604c96eb07b2b65734a8aa0e9e8c1bfc435ee4f.zip | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into next
Freescale updates from Scott:
"Highlights include 8xx optimizations, some more work on datapath device
tree content, e300 machine check support, t1040 corenet error reporting,
and various cleanups and fixes."
Diffstat (limited to 'arch/powerpc/mm/tlb_nohash.c')
| -rw-r--r-- | arch/powerpc/mm/tlb_nohash.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/powerpc/mm/tlb_nohash.c b/arch/powerpc/mm/tlb_nohash.c index f38ea4df6a85..ab0616b0e6c2 100644 --- a/arch/powerpc/mm/tlb_nohash.c +++ b/arch/powerpc/mm/tlb_nohash.c @@ -284,8 +284,11 @@ void __flush_tlb_page(struct mm_struct *mm, unsigned long vmaddr, struct cpumask *cpu_mask; unsigned int pid; + if (unlikely(!mm)) + return; + preempt_disable(); - pid = mm ? mm->context.id : 0; + pid = mm->context.id; if (unlikely(pid == MMU_NO_CONTEXT)) goto bail; cpu_mask = mm_cpumask(mm); |
