Commit 002f421a authored by Linus Torvalds's avatar Linus Torvalds

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
parents cf76c364 63e19c82
...@@ -3271,11 +3271,16 @@ S: Maintained ...@@ -3271,11 +3271,16 @@ S: Maintained
F: sound/pci/oxygen/ F: sound/pci/oxygen/
C-SKY ARCHITECTURE 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 T: git https://github.com/c-sky/csky-linux.git
S: Supported S: Supported
F: arch/csky/ F: arch/csky/
F: Documentation/devicetree/bindings/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 K: csky
N: csky N: csky
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
static inline void tlbmiss_handler_setup_pgd(unsigned long pgd, bool kernel) static inline void tlbmiss_handler_setup_pgd(unsigned long pgd, bool kernel)
{ {
pgd &= ~(1<<31); pgd -= PAGE_OFFSET;
pgd += PHYS_OFFSET; pgd += PHYS_OFFSET;
pgd |= 1; pgd |= 1;
setup_pgd(pgd, kernel); setup_pgd(pgd, kernel);
...@@ -29,7 +29,7 @@ static inline void tlbmiss_handler_setup_pgd(unsigned long pgd, bool 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) 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]) #define cpu_context(cpu, mm) ((mm)->context.asid[cpu])
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment