git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull trivial into release branch
[sfrench/cifs-2.6.git]
/
arch
/
sparc64
/
Kconfig
diff --git
a/arch/sparc64/Kconfig
b/arch/sparc64/Kconfig
index c3685b314d71469ad9319736b5ddf247a3e547b9..43a66f5407f45b2b5d04666f0f765f2cd287778b 100644
(file)
--- a/
arch/sparc64/Kconfig
+++ b/
arch/sparc64/Kconfig
@@
-162,6
+162,14
@@
config RWSEM_XCHGADD_ALGORITHM
bool
default y
bool
default y
+config GENERIC_FIND_NEXT_BIT
+ bool
+ default y
+
+config GENERIC_HWEIGHT
+ bool
+ default y if !ULTRA_HAS_POPULATION_COUNT
+
config GENERIC_CALIBRATE_DELAY
bool
default y
config GENERIC_CALIBRATE_DELAY
bool
default y
@@
-175,17
+183,20
@@
config HUGETLB_PAGE_SIZE_4MB
bool "4MB"
config HUGETLB_PAGE_SIZE_512K
bool "4MB"
config HUGETLB_PAGE_SIZE_512K
- depends on !SPARC64_PAGE_SIZE_4MB
+ depends on !SPARC64_PAGE_SIZE_4MB
&& !SPARC64_PAGE_SIZE_512KB
bool "512K"
config HUGETLB_PAGE_SIZE_64K
bool "512K"
config HUGETLB_PAGE_SIZE_64K
- depends on !SPARC64_PAGE_SIZE_4MB && !SPARC64_PAGE_SIZE_512KB
+ depends on !SPARC64_PAGE_SIZE_4MB && !SPARC64_PAGE_SIZE_512KB
&& !SPARC64_PAGE_SIZE_64KB
bool "64K"
endchoice
endmenu
bool "64K"
endchoice
endmenu
+config ARCH_SELECT_MEMORY_MODEL
+ def_bool y
+
config ARCH_SPARSEMEM_ENABLE
def_bool y
config ARCH_SPARSEMEM_ENABLE
def_bool y