diff options
author | Mark Brown <broonie@kernel.org> | 2018-12-11 20:44:49 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2018-12-11 20:44:49 +0000 |
commit | e6202e8249aa7115af65f2d80b43c132816224ef (patch) | |
tree | 8865dd722ad55bb5e6bd5d446057395336ed0169 /arch/csky/include/asm/mmu_context.h | |
parent | 2b96edb570709d6ca2e06842941c4bdf04b55f47 (diff) | |
parent | d407c81adae57041ba82577e604e351f36b8afce (diff) |
Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-4.21
Diffstat (limited to 'arch/csky/include/asm/mmu_context.h')
-rw-r--r-- | arch/csky/include/asm/mmu_context.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/csky/include/asm/mmu_context.h b/arch/csky/include/asm/mmu_context.h index c410aa4fff1a..b2905c0485a7 100644 --- a/arch/csky/include/asm/mmu_context.h +++ b/arch/csky/include/asm/mmu_context.h @@ -16,7 +16,7 @@ static inline void tlbmiss_handler_setup_pgd(unsigned long pgd, bool kernel) { - pgd &= ~(1<<31); + pgd -= PAGE_OFFSET; pgd += PHYS_OFFSET; pgd |= 1; setup_pgd(pgd, kernel); @@ -29,7 +29,7 @@ static inline void tlbmiss_handler_setup_pgd(unsigned long pgd, bool kernel) static inline unsigned long tlb_get_pgd(void) { - return ((get_pgd()|(1<<31)) - PHYS_OFFSET) & ~1; + return ((get_pgd() - PHYS_OFFSET) & ~1) + PAGE_OFFSET; } #define cpu_context(cpu, mm) ((mm)->context.asid[cpu]) |