git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
arch
/
sparc64
/
kernel
/
cpu.c
diff --git
a/arch/sparc64/kernel/cpu.c
b/arch/sparc64/kernel/cpu.c
index
7eb81d3
..
00eed88
100644
(file)
--- a/
arch/sparc64/kernel/cpu.c
+++ b/
arch/sparc64/kernel/cpu.c
@@
-4,6
+4,7
@@
* Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu)
*/
* Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu)
*/
+#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/sched.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/sched.h>
@@
-12,7
+13,6
@@
#include <asm/system.h>
#include <asm/fpumacro.h>
#include <asm/cpudata.h>
#include <asm/system.h>
#include <asm/fpumacro.h>
#include <asm/cpudata.h>
-#include <asm/spitfire.h>
DEFINE_PER_CPU(cpuinfo_sparc, __cpu_data) = { 0 };
DEFINE_PER_CPU(cpuinfo_sparc, __cpu_data) = { 0 };
@@
-71,12
+71,6
@@
void __init cpu_probe(void)
unsigned long ver, fpu_vers, manuf, impl, fprs;
int i;
unsigned long ver, fpu_vers, manuf, impl, fprs;
int i;
- if (tlb_type == hypervisor) {
- sparc_cpu_type = "UltraSparc T1 (Niagara)";
- sparc_fpu_type = "UltraSparc T1 integrated FPU";
- return;
- }
-
fprs = fprs_read();
fprs_write(FPRS_FEF);
__asm__ __volatile__ ("rdpr %%ver, %0; stx %%fsr, [%1]"
fprs = fprs_read();
fprs_write(FPRS_FEF);
__asm__ __volatile__ ("rdpr %%ver, %0; stx %%fsr, [%1]"