git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
container freezer: implement freezer cgroup subsystem
[safe/jmp/linux-2.6]
/
arch
/
ia64
/
Kconfig
diff --git
a/arch/ia64/Kconfig
b/arch/ia64/Kconfig
index
9778958
..
912c57d
100644
(file)
--- a/
arch/ia64/Kconfig
+++ b/
arch/ia64/Kconfig
@@
-7,6
+7,8
@@
mainmenu "IA-64 Linux Kernel Configuration"
source "init/Kconfig"
source "init/Kconfig"
+source "kernel/Kconfig.freezer"
+
menu "Processor type and features"
config IA64
menu "Processor type and features"
config IA64
@@
-60,14
+62,6
@@
config RWSEM_XCHGADD_ALGORITHM
bool
default y
bool
default y
-config ARCH_HAS_ILOG2_U32
- bool
- default n
-
-config ARCH_HAS_ILOG2_U64
- bool
- default n
-
config HUGETLB_PAGE_SIZE_VARIABLE
bool
depends on HUGETLB_PAGE
config HUGETLB_PAGE_SIZE_VARIABLE
bool
depends on HUGETLB_PAGE
@@
-171,8
+165,8
@@
config IA64_SGI_SN2
to select this option. If in doubt, select ia64 generic support
instead.
to select this option. If in doubt, select ia64 generic support
instead.
-config IA64_SGI_UV
`
- bool "SGI-UV
`
"
+config IA64_SGI_UV
+ bool "SGI-UV"
select NUMA
select ACPI_NUMA
select SWIOTLB
select NUMA
select ACPI_NUMA
select SWIOTLB