projects
/
platform
/
kernel
/
linux-rpi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'powerpc-4.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...
[platform/kernel/linux-rpi.git]
/
arch
/
powerpc
/
mm
/
pgtable_64.c
diff --git
a/arch/powerpc/mm/pgtable_64.c
b/arch/powerpc/mm/pgtable_64.c
index
1ec3aee
..
813ea22
100644
(file)
--- a/
arch/powerpc/mm/pgtable_64.c
+++ b/
arch/powerpc/mm/pgtable_64.c
@@
-57,7
+57,7
@@
#include "mmu_decl.h"
-#ifdef CONFIG_PPC_
STD_MMU
_64
+#ifdef CONFIG_PPC_
BOOK3S
_64
#if TASK_SIZE_USER64 > (1UL << (ESID_BITS + SID_SHIFT))
#error TASK_SIZE_USER64 exceeds user VSID range
#endif