openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

C-SKY fixes/update for 4.20-rc6 

- Bugfix tlb_get_pgd error.
 
  - Update MAINTAINERS file for C-SKY drivers.
 -----BEGIN PGP SIGNATURE-----
 
 iQJGBAABCAAwFiEE2KAv+isbWR/viAKHAXH1GYaIxXsFAlwIkagSHHJlbl9ndW9A
 Yy1za3kuY29tAAoJEAFx9RmGiMV7masP/RSILViW+HYKhl5peYuWr9cajNpLqwQt
 zCGHNkYTl/vObNq9HCKS9EfbB88k81SEEP4FOO/I83nTS0IuCWHvvLXyaPHqqMet
 6W0R7hlXUxllMESu02jiHLFF2UOoWqx6XJ5POh5b2/EyADVSYQ6SYeCjDJsWlxUL
 BUI7Po/H9D8c1/5vgMv3mROswmE/GsuRnea5y3mXSBWBQcxsp70rMcUKPIxge8E2
 uBVJp0naznp3Eupp68DkSgHI+6UbC7KSjLnqV7MOKvP/GR8CQ7MzGK75BAXaXhTD
 OReBz1EWc1RaE6wzCe/TyUx2nyqkpZsPjY9r+7ZbTIvyjCTw0OOlf+wiqoSfkWe+
 GDUMt71g6Fw5l9zqAwyPxew9lklmp/hWxMk3gy24yb22ptmIOojigTJsC7BHg456
 77bD+doV+0dN5VUJ3grKSOJ+b9REdOZVMLWjGw9fy1L+r/8+3GU5iKXZ9CJAop15
 s/EMiqZ9uEZp3ass9Y1okZMjpRL1Px6UVaXJtUs/LKaWxYnBWvA4Jj2N09d87Qmq
 32CItTt6W+PAHgQuNfStruiDoJ3COzxje4jA0LjUy4Km81njEfmyJdlId5BuNYeo
 0ug3a9QLMsSpuZjIC+HVzVUyqaFwDHHoEjpyXwLWOQ65CgeDv7K6m4AEF2nj+sui
 5dilmumX3Zfg
 =tE+D
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2018-12-06 09:23:34 -08:00
parent cf76c364a1 63e19c8216
commit 002f421a84
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
MAINTAINERS
View File

@ -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

4
arch/csky/include/asm/mmu_context.h
View File

@ -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])