projects / GitHub / LineageOS / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8d30c14 5955c7a)
Merge commit 'origin/master' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 18 Feb 2009 02:19:25 +0000 (13:19 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 18 Feb 2009 02:19:25 +0000 (13:19 +1100)
Manual merge of:
arch/powerpc/include/asm/pgtable-ppc32.h

1  2 
arch/powerpc/include/asm/pgtable-ppc32.h patch | diff1 | diff2 | blob | history
arch/powerpc/mm/numa.c patch | diff1 | diff2 | blob | history
drivers/watchdog/Kconfig patch | diff1 | diff2 | blob | history
include/linux/pci_ids.h patch | diff1 | diff2 | blob | history

diff --cc arch/powerpc/include/asm/pgtable-ppc32.h
index 211c90df4763fffa137bc82733691f198a1a12eb,820b5f0a35ce309fcc1b2f662625d0205abfc8dc..98bd7c5fcd0e3e803edb4a4a87c4af5a015cadbf
--- 1/arch/powerpc/include/asm/pgtable-ppc32.h
--- 2/arch/powerpc/include/asm/pgtable-ppc32.h
+++ b/arch/powerpc/include/asm/pgtable-ppc32.h
@@@ -429,11 -429,10 +429,11 @@@ extern int icache_44x_need_flush
  #define PMD_PAGE_SIZE(pmd)    bad_call_to_PMD_PAGE_SIZE()
  #endif
  
- #define _PAGE_CHG_MASK        (PAGE_MASK | _PAGE_ACCESSED | _PAGE_DIRTY)
- 
 +#define _PAGE_HPTEFLAGS _PAGE_HASHPTE
 +
+ #define _PAGE_CHG_MASK        (PAGE_MASK | _PAGE_ACCESSED | _PAGE_DIRTY | \
+                        _PAGE_SPECIAL)
  
 -
  #define PAGE_PROT_BITS        (_PAGE_GUARDED | _PAGE_COHERENT | _PAGE_NO_CACHE | \
                         _PAGE_WRITETHRU | _PAGE_ENDIAN | \
                         _PAGE_USER | _PAGE_ACCESSED | \
diff --cc arch/powerpc/mm/numa.c
Simple merge
diff --cc drivers/watchdog/Kconfig
Simple merge
diff --cc include/linux/pci_ids.h
Simple merge