projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'e1000' of ssh://198.78.49.142/srv/git/intel/linux-2.6
[powerpc.git]
/
arch
/
i386
/
Kconfig
diff --git
a/arch/i386/Kconfig
b/arch/i386/Kconfig
index
d86c865
..
5b1a7d4
100644
(file)
--- a/
arch/i386/Kconfig
+++ b/
arch/i386/Kconfig
@@
-442,6
+442,7
@@
config HIGHMEM4G
config HIGHMEM64G
bool "64GB"
config HIGHMEM64G
bool "64GB"
+ depends on X86_CMPXCHG64
help
Select this if you have a 32-bit processor and more than 4
gigabytes of physical RAM.
help
Select this if you have a 32-bit processor and more than 4
gigabytes of physical RAM.
@@
-732,7
+733,7
@@
config PHYSICAL_START
config HOTPLUG_CPU
bool "Support for hot-pluggable CPUs (EXPERIMENTAL)"
config HOTPLUG_CPU
bool "Support for hot-pluggable CPUs (EXPERIMENTAL)"
- depends on SMP && HOTPLUG && EXPERIMENTAL
+ depends on SMP && HOTPLUG && EXPERIMENTAL
&& !X86_VOYAGER
---help---
Say Y here to experiment with turning CPUs off and on. CPUs
can be controlled through /sys/devices/system/cpu.
---help---
Say Y here to experiment with turning CPUs off and on. CPUs
can be controlled through /sys/devices/system/cpu.
@@
-1059,6
+1060,7
@@
source "arch/i386/oprofile/Kconfig"
config KPROBES
bool "Kprobes (EXPERIMENTAL)"
config KPROBES
bool "Kprobes (EXPERIMENTAL)"
+ depends on EXPERIMENTAL && MODULES
help
Kprobes allows you to trap at almost any kernel address and
execute a callback function. register_kprobe() establishes
help
Kprobes allows you to trap at almost any kernel address and
execute a callback function. register_kprobe() establishes