diff options
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/Kconfig | 11 | ||||
-rw-r--r-- | arch/x86/kvm/Kconfig | 1 | ||||
-rw-r--r-- | arch/x86/lib/bitops_32.c | 2 | ||||
-rw-r--r-- | arch/x86/lib/bitops_64.c | 2 |
4 files changed, 6 insertions, 10 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 77198f49b383..59eef1c7fdaa 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
@@ -18,6 +18,8 @@ config X86_64 | |||
18 | ### Arch settings | 18 | ### Arch settings |
19 | config X86 | 19 | config X86 |
20 | def_bool y | 20 | def_bool y |
21 | select HAVE_OPROFILE | ||
22 | select HAVE_KPROBES | ||
21 | 23 | ||
22 | config GENERIC_LOCKBREAK | 24 | config GENERIC_LOCKBREAK |
23 | def_bool n | 25 | def_bool n |
@@ -106,10 +108,6 @@ config GENERIC_TIME_VSYSCALL | |||
106 | config HAVE_SETUP_PER_CPU_AREA | 108 | config HAVE_SETUP_PER_CPU_AREA |
107 | def_bool X86_64 | 109 | def_bool X86_64 |
108 | 110 | ||
109 | config ARCH_SUPPORTS_OPROFILE | ||
110 | bool | ||
111 | default y | ||
112 | |||
113 | select HAVE_KVM | 111 | select HAVE_KVM |
114 | 112 | ||
115 | config ARCH_HIBERNATION_POSSIBLE | 113 | config ARCH_HIBERNATION_POSSIBLE |
@@ -204,8 +202,7 @@ config SMP | |||
204 | Y to "Enhanced Real Time Clock Support", below. The "Advanced Power | 202 | Y to "Enhanced Real Time Clock Support", below. The "Advanced Power |
205 | Management" code will be disabled if you say Y here. | 203 | Management" code will be disabled if you say Y here. |
206 | 204 | ||
207 | See also the <file:Documentation/smp.txt>, | 205 | See also <file:Documentation/i386/IO-APIC.txt>, |
208 | <file:Documentation/i386/IO-APIC.txt>, | ||
209 | <file:Documentation/nmi_watchdog.txt> and the SMP-HOWTO available at | 206 | <file:Documentation/nmi_watchdog.txt> and the SMP-HOWTO available at |
210 | <http://www.tldp.org/docs.html#howto>. | 207 | <http://www.tldp.org/docs.html#howto>. |
211 | 208 | ||
@@ -1598,8 +1595,6 @@ source "drivers/firmware/Kconfig" | |||
1598 | 1595 | ||
1599 | source "fs/Kconfig" | 1596 | source "fs/Kconfig" |
1600 | 1597 | ||
1601 | source "kernel/Kconfig.instrumentation" | ||
1602 | |||
1603 | source "arch/x86/Kconfig.debug" | 1598 | source "arch/x86/Kconfig.debug" |
1604 | 1599 | ||
1605 | source "security/Kconfig" | 1600 | source "security/Kconfig" |
diff --git a/arch/x86/kvm/Kconfig b/arch/x86/kvm/Kconfig index c83e1c9b5129..41962e793c0f 100644 --- a/arch/x86/kvm/Kconfig +++ b/arch/x86/kvm/Kconfig | |||
@@ -53,5 +53,6 @@ config KVM_AMD | |||
53 | # OK, it's a little counter-intuitive to do this, but it puts it neatly under | 53 | # OK, it's a little counter-intuitive to do this, but it puts it neatly under |
54 | # the virtualization menu. | 54 | # the virtualization menu. |
55 | source drivers/lguest/Kconfig | 55 | source drivers/lguest/Kconfig |
56 | source drivers/virtio/Kconfig | ||
56 | 57 | ||
57 | endif # VIRTUALIZATION | 58 | endif # VIRTUALIZATION |
diff --git a/arch/x86/lib/bitops_32.c b/arch/x86/lib/bitops_32.c index afd0045595d4..b65440459859 100644 --- a/arch/x86/lib/bitops_32.c +++ b/arch/x86/lib/bitops_32.c | |||
@@ -2,7 +2,7 @@ | |||
2 | #include <linux/module.h> | 2 | #include <linux/module.h> |
3 | 3 | ||
4 | /** | 4 | /** |
5 | * find_next_bit - find the first set bit in a memory region | 5 | * find_next_bit - find the next set bit in a memory region |
6 | * @addr: The address to base the search on | 6 | * @addr: The address to base the search on |
7 | * @offset: The bitnumber to start searching at | 7 | * @offset: The bitnumber to start searching at |
8 | * @size: The maximum size to search | 8 | * @size: The maximum size to search |
diff --git a/arch/x86/lib/bitops_64.c b/arch/x86/lib/bitops_64.c index 95b6d9639fba..0e8f491e6ccc 100644 --- a/arch/x86/lib/bitops_64.c +++ b/arch/x86/lib/bitops_64.c | |||
@@ -58,7 +58,7 @@ long find_first_zero_bit(const unsigned long * addr, unsigned long size) | |||
58 | } | 58 | } |
59 | 59 | ||
60 | /** | 60 | /** |
61 | * find_next_zero_bit - find the first zero bit in a memory region | 61 | * find_next_zero_bit - find the next zero bit in a memory region |
62 | * @addr: The address to base the search on | 62 | * @addr: The address to base the search on |
63 | * @offset: The bitnumber to start searching at | 63 | * @offset: The bitnumber to start searching at |
64 | * @size: The maximum size to search | 64 | * @size: The maximum size to search |