diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/Kconfig | 136 | ||||
-rw-r--r-- | arch/x86/Kconfig.i386 | 119 | ||||
-rw-r--r-- | arch/x86/Kconfig.x86_64 | 115 |
3 files changed, 136 insertions, 234 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 9fbb049950d1..d47b5a2e4a32 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
@@ -1,6 +1,86 @@ | |||
1 | # x86 configuration | 1 | # x86 configuration |
2 | 2 | ||
3 | ### Arch settings | 3 | ### Arch settings |
4 | config X86 | ||
5 | bool | ||
6 | default y | ||
7 | |||
8 | config 64BIT | ||
9 | def_bool X86_64 | ||
10 | |||
11 | config GENERIC_TIME | ||
12 | bool | ||
13 | default y | ||
14 | |||
15 | config GENERIC_CMOS_UPDATE | ||
16 | bool | ||
17 | default y | ||
18 | |||
19 | config CLOCKSOURCE_WATCHDOG | ||
20 | bool | ||
21 | default y | ||
22 | |||
23 | config GENERIC_CLOCKEVENTS | ||
24 | bool | ||
25 | default y | ||
26 | |||
27 | config GENERIC_CLOCKEVENTS_BROADCAST | ||
28 | bool | ||
29 | default y | ||
30 | depends on X86_64 || (X86_32 && X86_LOCAL_APIC) | ||
31 | |||
32 | config LOCKDEP_SUPPORT | ||
33 | bool | ||
34 | default y | ||
35 | |||
36 | config STACKTRACE_SUPPORT | ||
37 | bool | ||
38 | default y | ||
39 | |||
40 | config SEMAPHORE_SLEEPERS | ||
41 | bool | ||
42 | default y | ||
43 | |||
44 | config MMU | ||
45 | bool | ||
46 | default y | ||
47 | |||
48 | config ZONE_DMA | ||
49 | bool | ||
50 | default y | ||
51 | |||
52 | config QUICKLIST | ||
53 | bool | ||
54 | default X86_32 | ||
55 | |||
56 | config SBUS | ||
57 | bool | ||
58 | |||
59 | config GENERIC_ISA_DMA | ||
60 | bool | ||
61 | default y | ||
62 | |||
63 | config GENERIC_IOMAP | ||
64 | bool | ||
65 | default y | ||
66 | |||
67 | config GENERIC_BUG | ||
68 | bool | ||
69 | default y | ||
70 | depends on BUG | ||
71 | |||
72 | config GENERIC_HWEIGHT | ||
73 | bool | ||
74 | default y | ||
75 | |||
76 | config ARCH_MAY_HAVE_PC_FDC | ||
77 | bool | ||
78 | default y | ||
79 | |||
80 | config DMI | ||
81 | bool | ||
82 | default y | ||
83 | |||
4 | config RWSEM_GENERIC_SPINLOCK | 84 | config RWSEM_GENERIC_SPINLOCK |
5 | def_bool !X86_XADD | 85 | def_bool !X86_XADD |
6 | 86 | ||
@@ -16,6 +96,62 @@ config ARCH_HAS_ILOG2_U64 | |||
16 | config GENERIC_CALIBRATE_DELAY | 96 | config GENERIC_CALIBRATE_DELAY |
17 | def_bool y | 97 | def_bool y |
18 | 98 | ||
99 | config GENERIC_TIME_VSYSCALL | ||
100 | bool | ||
101 | default X86_64 | ||
102 | |||
103 | |||
104 | |||
105 | |||
106 | |||
107 | config ZONE_DMA32 | ||
108 | bool | ||
109 | default X86_64 | ||
110 | |||
111 | config ARCH_POPULATES_NODE_MAP | ||
112 | def_bool y | ||
113 | |||
114 | config AUDIT_ARCH | ||
115 | bool | ||
116 | default X86_64 | ||
117 | |||
118 | # Use the generic interrupt handling code in kernel/irq/: | ||
119 | config GENERIC_HARDIRQS | ||
120 | bool | ||
121 | default y | ||
122 | |||
123 | config GENERIC_IRQ_PROBE | ||
124 | bool | ||
125 | default y | ||
126 | |||
127 | config GENERIC_PENDING_IRQ | ||
128 | bool | ||
129 | depends on GENERIC_HARDIRQS && SMP | ||
130 | default y | ||
131 | |||
132 | config X86_SMP | ||
133 | bool | ||
134 | depends on X86_32 && SMP && !X86_VOYAGER | ||
135 | default y | ||
136 | |||
137 | config X86_HT | ||
138 | bool | ||
139 | depends on SMP && !(X86_VISWS || X86_VOYAGER || MK8) | ||
140 | default y | ||
141 | |||
142 | config X86_BIOS_REBOOT | ||
143 | bool | ||
144 | depends on X86_32 && !(X86_VISWS || X86_VOYAGER) | ||
145 | default y | ||
146 | |||
147 | config X86_TRAMPOLINE | ||
148 | bool | ||
149 | depends on X86_SMP || (X86_VOYAGER && SMP) | ||
150 | default y | ||
151 | |||
152 | config KTIME_SCALAR | ||
153 | def_bool X86_32 | ||
154 | |||
19 | 155 | ||
20 | menu "Power management options" | 156 | menu "Power management options" |
21 | depends on !X86_VOYAGER | 157 | depends on !X86_VOYAGER |
diff --git a/arch/x86/Kconfig.i386 b/arch/x86/Kconfig.i386 index 3be76720e896..b8b462a91dc7 100644 --- a/arch/x86/Kconfig.i386 +++ b/arch/x86/Kconfig.i386 | |||
@@ -14,83 +14,6 @@ config X86_32 | |||
14 | 486, 586, Pentiums, and various instruction-set-compatible chips by | 14 | 486, 586, Pentiums, and various instruction-set-compatible chips by |
15 | AMD, Cyrix, and others. | 15 | AMD, Cyrix, and others. |
16 | 16 | ||
17 | config GENERIC_TIME | ||
18 | bool | ||
19 | default y | ||
20 | |||
21 | config GENERIC_CMOS_UPDATE | ||
22 | bool | ||
23 | default y | ||
24 | |||
25 | config CLOCKSOURCE_WATCHDOG | ||
26 | bool | ||
27 | default y | ||
28 | |||
29 | config GENERIC_CLOCKEVENTS | ||
30 | bool | ||
31 | default y | ||
32 | |||
33 | config GENERIC_CLOCKEVENTS_BROADCAST | ||
34 | bool | ||
35 | default y | ||
36 | depends on X86_LOCAL_APIC | ||
37 | |||
38 | config LOCKDEP_SUPPORT | ||
39 | bool | ||
40 | default y | ||
41 | |||
42 | config STACKTRACE_SUPPORT | ||
43 | bool | ||
44 | default y | ||
45 | |||
46 | config SEMAPHORE_SLEEPERS | ||
47 | bool | ||
48 | default y | ||
49 | |||
50 | config X86 | ||
51 | bool | ||
52 | default y | ||
53 | |||
54 | config MMU | ||
55 | bool | ||
56 | default y | ||
57 | |||
58 | config ZONE_DMA | ||
59 | bool | ||
60 | default y | ||
61 | |||
62 | config QUICKLIST | ||
63 | bool | ||
64 | default y | ||
65 | |||
66 | config SBUS | ||
67 | bool | ||
68 | |||
69 | config GENERIC_ISA_DMA | ||
70 | bool | ||
71 | default y | ||
72 | |||
73 | config GENERIC_IOMAP | ||
74 | bool | ||
75 | default y | ||
76 | |||
77 | config GENERIC_BUG | ||
78 | bool | ||
79 | default y | ||
80 | depends on BUG | ||
81 | |||
82 | config GENERIC_HWEIGHT | ||
83 | bool | ||
84 | default y | ||
85 | |||
86 | config ARCH_MAY_HAVE_PC_FDC | ||
87 | bool | ||
88 | default y | ||
89 | |||
90 | config DMI | ||
91 | bool | ||
92 | default y | ||
93 | |||
94 | source "init/Kconfig" | 17 | source "init/Kconfig" |
95 | 18 | ||
96 | menu "Processor type and features" | 19 | menu "Processor type and features" |
@@ -837,9 +760,6 @@ config ARCH_SELECT_MEMORY_MODEL | |||
837 | def_bool y | 760 | def_bool y |
838 | depends on X86_32 && ARCH_SPARSEMEM_ENABLE | 761 | depends on X86_32 && ARCH_SPARSEMEM_ENABLE |
839 | 762 | ||
840 | config ARCH_POPULATES_NODE_MAP | ||
841 | def_bool y | ||
842 | |||
843 | config ARCH_MEMORY_PROBE | 763 | config ARCH_MEMORY_PROBE |
844 | def_bool X86_64 | 764 | def_bool X86_64 |
845 | depends on MEMORY_HOTPLUG | 765 | depends on MEMORY_HOTPLUG |
@@ -1148,43 +1068,4 @@ config OUT_OF_LINE_PFN_TO_PAGE | |||
1148 | def_bool X86_64 | 1068 | def_bool X86_64 |
1149 | depends on DISCONTIGMEM | 1069 | depends on DISCONTIGMEM |
1150 | 1070 | ||
1151 | # | ||
1152 | # Use the generic interrupt handling code in kernel/irq/: | ||
1153 | # | ||
1154 | config GENERIC_HARDIRQS | ||
1155 | bool | ||
1156 | default y | ||
1157 | |||
1158 | config GENERIC_IRQ_PROBE | ||
1159 | bool | ||
1160 | default y | ||
1161 | |||
1162 | config GENERIC_PENDING_IRQ | ||
1163 | bool | ||
1164 | depends on GENERIC_HARDIRQS && SMP | ||
1165 | default y | ||
1166 | |||
1167 | config X86_SMP | ||
1168 | bool | ||
1169 | depends on X86_32 && SMP && !X86_VOYAGER | ||
1170 | default y | ||
1171 | |||
1172 | config X86_HT | ||
1173 | bool | ||
1174 | depends on SMP && !(X86_VISWS || X86_VOYAGER || MK8) | ||
1175 | default y | ||
1176 | |||
1177 | config X86_BIOS_REBOOT | ||
1178 | bool | ||
1179 | depends on X86_32 && !(X86_VISWS || X86_VOYAGER) | ||
1180 | default y | ||
1181 | |||
1182 | config X86_TRAMPOLINE | ||
1183 | bool | ||
1184 | depends on X86_SMP || (X86_VOYAGER && SMP) | ||
1185 | default y | ||
1186 | |||
1187 | config KTIME_SCALAR | ||
1188 | def_bool X86_32 | ||
1189 | |||
1190 | source "arch/x86/Kconfig" | 1071 | source "arch/x86/Kconfig" |
diff --git a/arch/x86/Kconfig.x86_64 b/arch/x86/Kconfig.x86_64 index 36bb856f5a3f..e441062472a8 100644 --- a/arch/x86/Kconfig.x86_64 +++ b/arch/x86/Kconfig.x86_64 | |||
@@ -17,100 +17,6 @@ config X86_64 | |||
17 | classical 32-bit x86 architecture. For details see | 17 | classical 32-bit x86 architecture. For details see |
18 | <http://www.x86-64.org/>. | 18 | <http://www.x86-64.org/>. |
19 | 19 | ||
20 | config 64BIT | ||
21 | def_bool X86_64 | ||
22 | |||
23 | config X86 | ||
24 | bool | ||
25 | default y | ||
26 | |||
27 | config GENERIC_TIME | ||
28 | bool | ||
29 | default y | ||
30 | |||
31 | config GENERIC_TIME_VSYSCALL | ||
32 | bool | ||
33 | default y | ||
34 | |||
35 | config GENERIC_CMOS_UPDATE | ||
36 | bool | ||
37 | default y | ||
38 | |||
39 | config CLOCKSOURCE_WATCHDOG | ||
40 | bool | ||
41 | default y | ||
42 | |||
43 | config GENERIC_CLOCKEVENTS | ||
44 | bool | ||
45 | default y | ||
46 | |||
47 | config GENERIC_CLOCKEVENTS_BROADCAST | ||
48 | bool | ||
49 | default y | ||
50 | |||
51 | config ZONE_DMA32 | ||
52 | bool | ||
53 | default y | ||
54 | |||
55 | config LOCKDEP_SUPPORT | ||
56 | bool | ||
57 | default y | ||
58 | |||
59 | config STACKTRACE_SUPPORT | ||
60 | bool | ||
61 | default y | ||
62 | |||
63 | config SEMAPHORE_SLEEPERS | ||
64 | bool | ||
65 | default y | ||
66 | |||
67 | config MMU | ||
68 | bool | ||
69 | default y | ||
70 | |||
71 | config ZONE_DMA | ||
72 | bool | ||
73 | default y | ||
74 | |||
75 | config ISA | ||
76 | bool | ||
77 | |||
78 | config SBUS | ||
79 | bool | ||
80 | |||
81 | config GENERIC_HWEIGHT | ||
82 | bool | ||
83 | default y | ||
84 | |||
85 | config GENERIC_ISA_DMA | ||
86 | bool | ||
87 | default y | ||
88 | |||
89 | config GENERIC_IOMAP | ||
90 | bool | ||
91 | default y | ||
92 | |||
93 | config ARCH_MAY_HAVE_PC_FDC | ||
94 | bool | ||
95 | default y | ||
96 | |||
97 | config ARCH_POPULATES_NODE_MAP | ||
98 | def_bool y | ||
99 | |||
100 | config DMI | ||
101 | bool | ||
102 | default y | ||
103 | |||
104 | config AUDIT_ARCH | ||
105 | bool | ||
106 | default y | ||
107 | |||
108 | config GENERIC_BUG | ||
109 | bool | ||
110 | default y | ||
111 | depends on BUG | ||
112 | |||
113 | |||
114 | source "init/Kconfig" | 20 | source "init/Kconfig" |
115 | 21 | ||
116 | 22 | ||
@@ -179,11 +85,6 @@ config X86_CPUID | |||
179 | with major 203 and minors 0 to 31 for /dev/cpu/0/cpuid to | 85 | with major 203 and minors 0 to 31 for /dev/cpu/0/cpuid to |
180 | /dev/cpu/31/cpuid. | 86 | /dev/cpu/31/cpuid. |
181 | 87 | ||
182 | config X86_HT | ||
183 | bool | ||
184 | depends on SMP && !MK8 | ||
185 | default y | ||
186 | |||
187 | config MATH_EMULATION | 88 | config MATH_EMULATION |
188 | bool | 89 | bool |
189 | 90 | ||
@@ -606,20 +507,4 @@ config K8_NB | |||
606 | 507 | ||
607 | endmenu | 508 | endmenu |
608 | 509 | ||
609 | # | ||
610 | # Use the generic interrupt handling code in kernel/irq/: | ||
611 | # | ||
612 | config GENERIC_HARDIRQS | ||
613 | bool | ||
614 | default y | ||
615 | |||
616 | config GENERIC_IRQ_PROBE | ||
617 | bool | ||
618 | default y | ||
619 | |||
620 | config GENERIC_PENDING_IRQ | ||
621 | bool | ||
622 | depends on GENERIC_HARDIRQS && SMP | ||
623 | default y | ||
624 | |||
625 | source "arch/x86/Kconfig" | 510 | source "arch/x86/Kconfig" |