projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
84dfcb4
2515ddc
)
Merge commit 'origin' into master
author
Benjamin Herrenschmidt
<benh@kernel.crashing.org>
Tue, 21 Oct 2008 04:52:04 +0000
(15:52 +1100)
committer
Benjamin Herrenschmidt
<benh@kernel.crashing.org>
Tue, 21 Oct 2008 04:52:04 +0000
(15:52 +1100)
Manual merge of:
arch/powerpc/Kconfig
arch/powerpc/include/asm/page.h
1
2
arch/powerpc/Kconfig
patch
|
diff1
|
diff2
|
blob
|
history
arch/powerpc/include/asm/page.h
patch
|
diff1
|
diff2
|
blob
|
history
arch/powerpc/platforms/cell/spufs/sputrace.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
arch/powerpc/Kconfig
index
bbe149c
,
9391199
..
369d93e
---
1
/
arch/powerpc/Kconfig
---
2
/
arch/powerpc/Kconfig
+++ b/
arch/powerpc/Kconfig
@@@
-19,6
-19,12
+19,9
@@@
config WORD_SIZ
default 64 if PPC64
default 32 if !PPC64
-config PPC_MERGE
- def_bool y
-
+ config ARCH_PHYS_ADDR_T_64BIT
+ def_bool PPC64 || PHYS_64BIT
+
config MMU
bool
default y
diff --cc
arch/powerpc/include/asm/page.h
Simple merge
diff --cc
arch/powerpc/platforms/cell/spufs/sputrace.c
Simple merge