projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
[firefly-linux-kernel-4.4.55.git]
/
arch
/
tile
/
Kconfig
diff --git
a/arch/tile/Kconfig
b/arch/tile/Kconfig
index 106c21bd7f449d947094db5fdefce8a9a6e1b142..8ec7a4599c085dd0d05f7ad819c11d4659223c51 100644
(file)
--- a/
arch/tile/Kconfig
+++ b/
arch/tile/Kconfig
@@
-176,8
+176,6
@@
config NR_CPUS
smaller kernel memory footprint results from using a smaller
value on chips with fewer tiles.
smaller kernel memory footprint results from using a smaller
value on chips with fewer tiles.
-if TILEGX
-
choice
prompt "Kernel page size"
default PAGE_SIZE_64KB
choice
prompt "Kernel page size"
default PAGE_SIZE_64KB
@@
-188,8
+186,11
@@
choice
connections, etc., it may be better to select 16KB, which uses
memory more efficiently at some cost in TLB performance.
connections, etc., it may be better to select 16KB, which uses
memory more efficiently at some cost in TLB performance.
- Note that this option is TILE-Gx specific; currently
- TILEPro page size is set by rebuilding the hypervisor.
+ Note that for TILEPro, you must also rebuild the hypervisor
+ with a matching page size.
+
+config PAGE_SIZE_4KB
+ bool "4KB" if TILEPRO
config PAGE_SIZE_16KB
bool "16KB"
config PAGE_SIZE_16KB
bool "16KB"
@@
-199,8
+200,6
@@
config PAGE_SIZE_64KB
endchoice
endchoice
-endif
-
source "kernel/Kconfig.hz"
config KEXEC
source "kernel/Kconfig.hz"
config KEXEC