Yinghai Lu
4052704d92
x86: intel.c put workaround for old cpus together
...
consolidate the code some more.
No change in functionality intended.
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com >
Signed-off-by: Ingo Molnar <mingo@elte.hu >
2008-09-10 08:21:06 +02:00
Yinghai Lu
879d792b66
x86: let intel 64-bit use intel.c
...
now that arch/x86/kernel/cpu/intel_64.c and
arch/x86/kernel/cpu/intel.c are equal, drop
arch/x86/kernel/cpu/intel_64.c and fix up
the glue.
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com >
Signed-off-by: Ingo Molnar <mingo@elte.hu >
2008-09-10 08:21:05 +02:00
Yinghai Lu
58602c1681
x86: make intel_64.c the same as intel.c
...
No change in functionality intended - this only adds the 32-bit side.
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com >
Signed-off-by: Ingo Molnar <mingo@elte.hu >
2008-09-10 08:21:04 +02:00
Yinghai Lu
185f3b9da2
x86: make intel.c have 64-bit support code
...
prepare for unification.
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com >
Signed-off-by: Ingo Molnar <mingo@elte.hu >
2008-09-10 08:21:03 +02:00
Ingo Molnar
81faaae457
Merge branch 'x86/pebs' into x86/unify-cpu-detect
...
Conflicts:
arch/x86/Kconfig.cpu
include/asm-x86/ds.h
Signed-off-by: Ingo Molnar <mingo@elte.hu >
2008-09-10 08:20:51 +02:00
Yinghai Lu
f69feff720
x86: little clean up of intel.c/intel_64.c
...
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com >
Signed-off-by: Ingo Molnar <mingo@elte.hu >
2008-09-08 15:46:03 +02:00
Yinghai Lu
ff73152ced
x86: make 64 bit to use amd.c
...
arch/x86/kernel/cpu/amd.c is now 100% identical to
arch/x86/kernel/cpu/amd_64.c, so use amd.c on 64-bit too
and fix up the namespace impact.
Simplify the Kconfig glue as well.
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com >
Signed-off-by: Ingo Molnar <mingo@elte.hu >
2008-09-08 15:32:06 +02:00
Yinghai Lu
2a02505055
x86: make amd_64 have 32 bit code
...
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com >
Cc: Yinghai Lu <yhlu.kernel@gmail.com >
Cc: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Ingo Molnar <mingo@elte.hu >
2008-09-08 15:32:03 +02:00
Yinghai Lu
6c62aa4a3c
x86: make amd.c have 64bit support code
...
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com >
Signed-off-by: Ingo Molnar <mingo@elte.hu >
2008-09-08 15:32:02 +02:00
Yinghai Lu
8d71a2ea0a
x86: merge header in amd_64.c
...
Singed-off-by: Yinghai Lu <yhlu.kernel@gmail.com >
Signed-off-by: Ingo Molnar <mingo@elte.hu >
2008-09-08 15:32:01 +02:00
Yinghai Lu
2b86473604
x86: add srat_detect_node for amd64
...
separate that from amd_detect_cmp()
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com >
Signed-off-by: Ingo Molnar <mingo@elte.hu >
2008-09-08 15:32:00 +02:00
Yinghai Lu
c58606ad55
x86: remove duplicated force_mwait
...
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com >
Signed-off-by: Ingo Molnar <mingo@elte.hu >
2008-09-08 15:31:59 +02:00
Yinghai Lu
11fdd252bb
x86: cpu make amd.c more like amd_64.c v2
...
1. make 32bit have early_init_amd_mc and amd_detect_cmp
2. seperate init_amd_k5/k6/k7 ...
v2: fix compiling for !CONFIG_SMP
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com >
Signed-off-by: Ingo Molnar <mingo@elte.hu >
2008-09-08 15:31:58 +02:00
Jan Beulich
2d9cd6c27f
x86-64: add two __cpuinit annotations
...
Signed-off-by: Jan Beulich <jbeulich@novell.com >
Signed-off-by: Ingo Molnar <mingo@elte.hu >
2008-09-06 19:50:41 +02:00
Yinghai Lu
e322423471
x86, cpu init: call early_init_xxx in init_xxx
...
so we:
1. could set some cap to ap
2. restore some cap after memset in identify_cpu for boot cpu
esp for CONSTANT_TSC this matters, as:
before this patch:
flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt pdpe1gb rdtscp lm 3dnowext 3dnow rep_good nopl pni monitor cx16 lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw ibs
after this patch:
flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt pdpe1gb rdtscp lm 3dnowext 3dnow constant_tsc rep_good nopl pni monitor cx16 lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw ibs
so constant_tsc is back...
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com >
Signed-off-by: Ingo Molnar <mingo@elte.hu >
2008-09-06 14:09:14 +02:00
Yinghai Lu
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
Ingo Molnar
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
Yinghai Lu
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
Yinghai Lu
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
Ingo Molnar
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
Yinghai Lu
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
Yinghai Lu
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
Yinghai Lu
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
Yinghai Lu
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
Yinghai Lu
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