aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorSam Ravnborg <sam@ravnborg.org>2007-11-06 17:30:30 -0500
committerSam Ravnborg <sam@ravnborg.org>2007-11-12 15:02:19 -0500
commit8d5fffb928cd86a70823f66f8335fa41709ec109 (patch)
tree43ca642a71ff46f71d62adc0a8e0d903f3afef3f /arch/x86
parentbc0120fdb4798421a577630bf5cbd77fc2d6661d (diff)
x86: move all simple arch settings to Kconfig
Most of the arch settings were equal so combine them in the first part of Kconfig. Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@redhat.com> Cc: "H. Peter Anvin" <hpa@zytor.com>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/Kconfig136
-rw-r--r--arch/x86/Kconfig.i386119
-rw-r--r--arch/x86/Kconfig.x86_64115
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
4config X86
5 bool
6 default y
7
8config 64BIT
9 def_bool X86_64
10
11config GENERIC_TIME
12 bool
13 default y
14
15config GENERIC_CMOS_UPDATE
16 bool
17 default y
18
19config CLOCKSOURCE_WATCHDOG
20 bool
21 default y
22
23config GENERIC_CLOCKEVENTS
24 bool
25 default y
26
27config GENERIC_CLOCKEVENTS_BROADCAST
28 bool
29 default y
30 depends on X86_64 || (X86_32 && X86_LOCAL_APIC)
31
32config LOCKDEP_SUPPORT
33 bool
34 default y
35
36config STACKTRACE_SUPPORT
37 bool
38 default y
39
40config SEMAPHORE_SLEEPERS
41 bool
42 default y
43
44config MMU
45 bool
46 default y
47
48config ZONE_DMA
49 bool
50 default y
51
52config QUICKLIST
53 bool
54 default X86_32
55
56config SBUS
57 bool
58
59config GENERIC_ISA_DMA
60 bool
61 default y
62
63config GENERIC_IOMAP
64 bool
65 default y
66
67config GENERIC_BUG
68 bool
69 default y
70 depends on BUG
71
72config GENERIC_HWEIGHT
73 bool
74 default y
75
76config ARCH_MAY_HAVE_PC_FDC
77 bool
78 default y
79
80config DMI
81 bool
82 default y
83
4config RWSEM_GENERIC_SPINLOCK 84config RWSEM_GENERIC_SPINLOCK
5 def_bool !X86_XADD 85 def_bool !X86_XADD
6 86
@@ -16,6 +96,62 @@ config ARCH_HAS_ILOG2_U64
16config GENERIC_CALIBRATE_DELAY 96config GENERIC_CALIBRATE_DELAY
17 def_bool y 97 def_bool y
18 98
99config GENERIC_TIME_VSYSCALL
100 bool
101 default X86_64
102
103
104
105
106
107config ZONE_DMA32
108 bool
109 default X86_64
110
111config ARCH_POPULATES_NODE_MAP
112 def_bool y
113
114config AUDIT_ARCH
115 bool
116 default X86_64
117
118# Use the generic interrupt handling code in kernel/irq/:
119config GENERIC_HARDIRQS
120 bool
121 default y
122
123config GENERIC_IRQ_PROBE
124 bool
125 default y
126
127config GENERIC_PENDING_IRQ
128 bool
129 depends on GENERIC_HARDIRQS && SMP
130 default y
131
132config X86_SMP
133 bool
134 depends on X86_32 && SMP && !X86_VOYAGER
135 default y
136
137config X86_HT
138 bool
139 depends on SMP && !(X86_VISWS || X86_VOYAGER || MK8)
140 default y
141
142config X86_BIOS_REBOOT
143 bool
144 depends on X86_32 && !(X86_VISWS || X86_VOYAGER)
145 default y
146
147config X86_TRAMPOLINE
148 bool
149 depends on X86_SMP || (X86_VOYAGER && SMP)
150 default y
151
152config KTIME_SCALAR
153 def_bool X86_32
154
19 155
20menu "Power management options" 156menu "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
17config GENERIC_TIME
18 bool
19 default y
20
21config GENERIC_CMOS_UPDATE
22 bool
23 default y
24
25config CLOCKSOURCE_WATCHDOG
26 bool
27 default y
28
29config GENERIC_CLOCKEVENTS
30 bool
31 default y
32
33config GENERIC_CLOCKEVENTS_BROADCAST
34 bool
35 default y
36 depends on X86_LOCAL_APIC
37
38config LOCKDEP_SUPPORT
39 bool
40 default y
41
42config STACKTRACE_SUPPORT
43 bool
44 default y
45
46config SEMAPHORE_SLEEPERS
47 bool
48 default y
49
50config X86
51 bool
52 default y
53
54config MMU
55 bool
56 default y
57
58config ZONE_DMA
59 bool
60 default y
61
62config QUICKLIST
63 bool
64 default y
65
66config SBUS
67 bool
68
69config GENERIC_ISA_DMA
70 bool
71 default y
72
73config GENERIC_IOMAP
74 bool
75 default y
76
77config GENERIC_BUG
78 bool
79 default y
80 depends on BUG
81
82config GENERIC_HWEIGHT
83 bool
84 default y
85
86config ARCH_MAY_HAVE_PC_FDC
87 bool
88 default y
89
90config DMI
91 bool
92 default y
93
94source "init/Kconfig" 17source "init/Kconfig"
95 18
96menu "Processor type and features" 19menu "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
840config ARCH_POPULATES_NODE_MAP
841 def_bool y
842
843config ARCH_MEMORY_PROBE 763config 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#
1154config GENERIC_HARDIRQS
1155 bool
1156 default y
1157
1158config GENERIC_IRQ_PROBE
1159 bool
1160 default y
1161
1162config GENERIC_PENDING_IRQ
1163 bool
1164 depends on GENERIC_HARDIRQS && SMP
1165 default y
1166
1167config X86_SMP
1168 bool
1169 depends on X86_32 && SMP && !X86_VOYAGER
1170 default y
1171
1172config X86_HT
1173 bool
1174 depends on SMP && !(X86_VISWS || X86_VOYAGER || MK8)
1175 default y
1176
1177config X86_BIOS_REBOOT
1178 bool
1179 depends on X86_32 && !(X86_VISWS || X86_VOYAGER)
1180 default y
1181
1182config X86_TRAMPOLINE
1183 bool
1184 depends on X86_SMP || (X86_VOYAGER && SMP)
1185 default y
1186
1187config KTIME_SCALAR
1188 def_bool X86_32
1189
1190source "arch/x86/Kconfig" 1071source "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
20config 64BIT
21 def_bool X86_64
22
23config X86
24 bool
25 default y
26
27config GENERIC_TIME
28 bool
29 default y
30
31config GENERIC_TIME_VSYSCALL
32 bool
33 default y
34
35config GENERIC_CMOS_UPDATE
36 bool
37 default y
38
39config CLOCKSOURCE_WATCHDOG
40 bool
41 default y
42
43config GENERIC_CLOCKEVENTS
44 bool
45 default y
46
47config GENERIC_CLOCKEVENTS_BROADCAST
48 bool
49 default y
50
51config ZONE_DMA32
52 bool
53 default y
54
55config LOCKDEP_SUPPORT
56 bool
57 default y
58
59config STACKTRACE_SUPPORT
60 bool
61 default y
62
63config SEMAPHORE_SLEEPERS
64 bool
65 default y
66
67config MMU
68 bool
69 default y
70
71config ZONE_DMA
72 bool
73 default y
74
75config ISA
76 bool
77
78config SBUS
79 bool
80
81config GENERIC_HWEIGHT
82 bool
83 default y
84
85config GENERIC_ISA_DMA
86 bool
87 default y
88
89config GENERIC_IOMAP
90 bool
91 default y
92
93config ARCH_MAY_HAVE_PC_FDC
94 bool
95 default y
96
97config ARCH_POPULATES_NODE_MAP
98 def_bool y
99
100config DMI
101 bool
102 default y
103
104config AUDIT_ARCH
105 bool
106 default y
107
108config GENERIC_BUG
109 bool
110 default y
111 depends on BUG
112
113
114source "init/Kconfig" 20source "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
182config X86_HT
183 bool
184 depends on SMP && !MK8
185 default y
186
187config MATH_EMULATION 88config MATH_EMULATION
188 bool 89 bool
189 90
@@ -606,20 +507,4 @@ config K8_NB
606 507
607endmenu 508endmenu
608 509
609#
610# Use the generic interrupt handling code in kernel/irq/:
611#
612config GENERIC_HARDIRQS
613 bool
614 default y
615
616config GENERIC_IRQ_PROBE
617 bool
618 default y
619
620config GENERIC_PENDING_IRQ
621 bool
622 depends on GENERIC_HARDIRQS && SMP
623 default y
624
625source "arch/x86/Kconfig" 510source "arch/x86/Kconfig"
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-21 11:54:31 -0500