diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-22 19:24:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-22 19:24:13 -0700 |
| commit | 21f9debf74c3ae8fdd26fd2bc3c0169a08eba6b4 (patch) | |
| tree | a7e9cdcaf0177bb9606d6e5982937cce55df9898 /arch/sparc/include/asm/pgtable_32.h | |
| parent | bd28b14591b98f696bc9f94c5ba2e598ca487dfd (diff) | |
| parent | 24e49ee3d76b70853a96520e46b8837e5eae65b2 (diff) | |
| download | linux-21f9debf74c3ae8fdd26fd2bc3c0169a08eba6b4.tar.gz linux-21f9debf74c3ae8fdd26fd2bc3c0169a08eba6b4.tar.bz2 linux-21f9debf74c3ae8fdd26fd2bc3c0169a08eba6b4.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull sparc updates from David Miller:
"Some 32-bit kgdb cleanups from Sam Ravnborg, and a hugepage TLB flush
overhead fix on 64-bit from Nitin Gupta"
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
sparc64: Reduce TLB flushes during hugepte changes
aeroflex/greth: fix warning about unused variable
openprom: fix warning
sparc32: drop superfluous cast in calls to __nocache_pa()
sparc32: fix build with STRICT_MM_TYPECHECKS
sparc32: use proper prototype for trapbase
sparc32: drop local prototype in kgdb_32
sparc32: drop hardcoding trap_level in kgdb_trap
Diffstat (limited to 'arch/sparc/include/asm/pgtable_32.h')
| -rw-r--r-- | arch/sparc/include/asm/pgtable_32.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/include/asm/pgtable_32.h b/arch/sparc/include/asm/pgtable_32.h index 91b963a887b7..ce6f56980aef 100644 --- a/arch/sparc/include/asm/pgtable_32.h +++ b/arch/sparc/include/asm/pgtable_32.h @@ -298,7 +298,7 @@ static inline pte_t mk_pte_io(unsigned long page, pgprot_t pgprot, int space) #define pgprot_noncached pgprot_noncached static inline pgprot_t pgprot_noncached(pgprot_t prot) { - prot &= ~__pgprot(SRMMU_CACHE); + pgprot_val(prot) &= ~pgprot_val(__pgprot(SRMMU_CACHE)); return prot; } |