1b05d60d60
x86: remove duplicated get_model_name() calling
...
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com >
Signed-off-by: Ingo Molnar <mingo@elte.hu >
2008-09-06 14:09:12 +02:00
deed05b7c0
x86, init_64.c: cleanup
...
Clean up comments.
Signed-off-by: Ingo Molnar <mingo@elte.hu >
2008-09-05 10:23:47 +02:00
bd220a24a9
x86: move nonx_setup etc from common.c to init_64.c
...
like 32 bit put it in init_32.c
Signed-off-by: Yinghai <yhlu.kernel@gmail.com >
Signed-off-by: Ingo Molnar <mingo@elte.hu >
2008-09-05 10:23:47 +02:00
f5017cfa35
x86: use cpu/common.c on 64 bit
...
Use cpu/common.c on both 64-bit and 32-bit and remove cpu/common_64.c.
We started out with this linecount:
816 arch/x86/kernel/cpu/common_64.c
805 arch/x86/kernel/cpu/common.c
and the resulting common.c is 1197 lines long, so there's already
424 lines of code eliminated in this phase of the unification.
Signed-off-by: Yinghai <yhlu.kernel@gmail.com >
Signed-off-by: Ingo Molnar <mingo@elte.hu >
2008-09-05 09:40:57 +02:00
143b604a2d
x86: cpu/common*.c, merge whitespaces
...
Merge leftover whitespaces, to make arch/x86/kernel/cpu/common_64.c
exactly identical to arch/x86/kernel/cpu/common.c.
Signed-off-by: Ingo Molnar <mingo@elte.hu >
2008-09-05 09:40:56 +02:00
102bbe3ab8
x86: cpu/common*.c, merge identify_cpu()
...
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com >
Signed-off-by: Ingo Molnar <mingo@elte.hu >
2008-09-05 09:40:56 +02:00
b89d3b3e2c
x86: cpu/common*.c, merge generic_identify()
...
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com >
Signed-off-by: Ingo Molnar <mingo@elte.hu >
2008-09-05 09:40:55 +02:00
56f0d033be
x86: cpu/common*.c: merge print_cpu_info()
...
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com >
Signed-off-by: Ingo Molnar <mingo@elte.hu >
2008-09-05 09:40:54 +02:00
6627d24230
x86: cpu/common*.c, merge early_identify_cpu()
...
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com >
Signed-off-by: Ingo Molnar <mingo@elte.hu >
2008-09-05 09:40:54 +02:00
5122c890ba
x86: cpu/common.c: merge get_cpu_cap()
...
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com >
Signed-off-by: Ingo Molnar <mingo@elte.hu >
2008-09-05 09:40:53 +02:00
1cd78776c7
x86: cpu/common*.c, merge detect_ht()
...
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com >
Signed-off-by: Ingo Molnar <mingo@elte.hu >
2008-09-05 09:40:52 +02:00
140fc72709
x86: cpu/common*.c, merge display_cacheinfo()
...
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com >
Signed-off-by: Ingo Molnar <mingo@elte.hu >
2008-09-05 09:40:51 +02:00
b9e67f0042
x86: cpu/common.c, merge default_init()
...
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com >
Signed-off-by: Ingo Molnar <mingo@elte.hu >
2008-09-05 09:40:50 +02:00
fab334c1d5
x86: cpu/common*.c, merge switch_to_new_gdt()
...
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com >
Signed-off-by: Ingo Molnar <mingo@elte.hu >
2008-09-05 09:40:50 +02:00
1ba76586f7
x86: cpu/common*.c have same cpu_init(), with copying and #ifdef
...
hard to merge by lines... (as here we have material differences between
32-bit and 64-bit mode) - will try to do it later.
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com >
Signed-off-by: Ingo Molnar <mingo@elte.hu >
2008-09-05 09:40:49 +02:00
d5494d4f51
x86: cpu/common*.c, make 32-bit have 64-bit only functions
...
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com >
Signed-off-by: Ingo Molnar <mingo@elte.hu >
2008-09-05 09:40:48 +02:00
ba51dced0b
x86: cpu/common.c, let 64-bit code have 32-bit only functions
...
No effect on 64-bit.
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com >
Signed-off-by: Ingo Molnar <mingo@elte.hu >
2008-09-05 09:40:47 +02:00
950ad7ff6e
x86: same gdt_page with macro
...
Move the 32-bit and 64-bit gdt_page definitions next to each
other, separated with an #ifdef.
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com >
Signed-off-by: Ingo Molnar <mingo@elte.hu >
2008-09-05 09:40:47 +02:00
f0fc4aff1f
x86: make header file the same in arch/x86/kernel/cpu/common_xx.c
...
Make the files more similar in preparation to unification, no
code changed.
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com >
Signed-off-by: Ingo Molnar <mingo@elte.hu >
2008-09-05 09:40:46 +02:00
97e4db7c87
x86: make detect_ht depend on CONFIG_X86_HT
...
64-bit has X86_HT set too, so use that instead of SMP.
This also removes a include/asm-x86/processor.h ifdef.
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com >
Signed-off-by: Ingo Molnar <mingo@elte.hu >
2008-09-05 09:40:45 +02:00
0c8c708a7e
Merge branch 'x86/core' into x86/unify-cpu-detect
2008-09-05 09:27:23 +02:00
d3d0ba7b8f
Merge commit '63cc8c75156462d4b42cbdd76c293b7eee7ddbfe':
...
"percpu: introduce DEFINE_PER_CPU_PAGE_ALIGNED() macro"
into x86/core
Conflicts:
arch/x86/kernel/cpu/common.c
Signed-off-by: Ingo Molnar <mingo@elte.hu >
2008-09-05 09:24:30 +02:00
9042763808
Merge branch 'x86/x2apic' into x86/core
...
Conflicts:
arch/x86/kernel/cpu/common_64.c
Signed-off-by: Ingo Molnar <mingo@elte.hu >
2008-09-05 09:21:21 +02:00
446d27338d
Merge branch 'x86/cpu' into x86/core
2008-09-05 09:19:50 +02:00
accf0fa697
Merge branch 'x86/xsave' into x86/core
2008-09-05 09:18:39 +02:00
Yinghai Lu
Ingo Molnar