diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-06 09:23:34 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-06 09:23:34 -0800 |
| commit | 002f421a84c5a9260bf0e312af5d5043b3555511 (patch) | |
| tree | c66e37172d815fbd403f9adbe6e872e7b67f0d58 | |
| parent | cf76c364a1e1e5224af80edf70a1e3023e1fcf8c (diff) | |
| parent | 63e19c8216bb03a1b4d10f6637d1324ae7a2b612 (diff) | |
| download | linux-002f421a84c5a9260bf0e312af5d5043b3555511.tar.bz2 | |
Merge tag 'csky-4.20-rc6' of github.com:c-sky/csky-linux
Pull C-SKY fixes from Guo Ren:
- bugfix for tlb_get_pgd() error
- update MAINTAINERS file for C-SKY drivers
* tag 'csky-4.20-rc6' of github.com:c-sky/csky-linux:
csky: bugfix tlb_get_pgd error.
MAINTAINERS: add maintainer for C-SKY drivers
| -rw-r--r-- | MAINTAINERS | 7 | ||||
| -rw-r--r-- | arch/csky/include/asm/mmu_context.h | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 6682420421c1..d27401df091f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3271,11 +3271,16 @@ S: Maintained F: sound/pci/oxygen/ C-SKY ARCHITECTURE -M: Guo Ren <ren_guo@c-sky.com> +M: Guo Ren <guoren@kernel.org> T: git https://github.com/c-sky/csky-linux.git S: Supported F: arch/csky/ F: Documentation/devicetree/bindings/csky/ +F: drivers/irqchip/irq-csky-* +F: Documentation/devicetree/bindings/interrupt-controller/csky,* +F: drivers/clocksource/timer-gx6605s.c +F: drivers/clocksource/timer-mp-csky.c +F: Documentation/devicetree/bindings/timer/csky,* K: csky N: csky 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]) |