git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[pandora-kernel.git]
/
arch
/
sparc64
/
Kconfig
diff --git
a/arch/sparc64/Kconfig
b/arch/sparc64/Kconfig
index
d1e2fc5
..
8d8ca71
100644
(file)
--- a/
arch/sparc64/Kconfig
+++ b/
arch/sparc64/Kconfig
@@
-34,6
+34,10
@@
config ARCH_MAY_HAVE_PC_FDC
bool
default y
bool
default y
+config AUDIT_ARCH
+ bool
+ default y
+
choice
prompt "Kernel page size"
default SPARC64_PAGE_SIZE_8KB
choice
prompt "Kernel page size"
default SPARC64_PAGE_SIZE_8KB
@@
-87,6
+91,10
@@
config SYSVIPC_COMPAT
depends on COMPAT && SYSVIPC
default y
depends on COMPAT && SYSVIPC
default y
+config GENERIC_HARDIRQS
+ bool
+ default y
+
menu "General machine setup"
config SMP
menu "General machine setup"
config SMP
@@
-187,13
+195,16
@@
config HUGETLB_PAGE_SIZE_512K
bool "512K"
config HUGETLB_PAGE_SIZE_64K
bool "512K"
config HUGETLB_PAGE_SIZE_64K
- depends on !SPARC64_PAGE_SIZE_4MB && !SPARC64_PAGE_SIZE_512KB && !SPARC64_PAGE_SIZE_64K
+ depends on !SPARC64_PAGE_SIZE_4MB && !SPARC64_PAGE_SIZE_512KB && !SPARC64_PAGE_SIZE_64K
B
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
@@
-327,7
+338,7
@@
config COMPAT
default y
config BINFMT_ELF32
default y
config BINFMT_ELF32
-
tristate
"Kernel support for 32-bit ELF binaries"
+
bool
"Kernel support for 32-bit ELF binaries"
depends on SPARC32_COMPAT
help
This allows you to run 32-bit Linux/ELF binaries on your Ultra.
depends on SPARC32_COMPAT
help
This allows you to run 32-bit Linux/ELF binaries on your Ultra.