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
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
arch
/
sparc
/
kernel
/
cpu.c
diff --git
a/arch/sparc/kernel/cpu.c
b/arch/sparc/kernel/cpu.c
index
6a4ebc6
..
259a559
100644
(file)
--- a/
arch/sparc/kernel/cpu.c
+++ b/
arch/sparc/kernel/cpu.c
@@
-4,7
+4,6
@@
* 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/smp.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/smp.h>
@@
-75,7
+74,7
@@
struct cpu_fp_info linux_sparc_fpu[] = {
{ 9, 3, "Fujitsu or Weitek on-chip FPU"},
};
{ 9, 3, "Fujitsu or Weitek on-chip FPU"},
};
-#define NSPARCFPU
(sizeof(linux_sparc_fpu)/sizeof(struct cpu_fp_info)
)
+#define NSPARCFPU
ARRAY_SIZE(linux_sparc_fpu
)
struct cpu_iu_info linux_sparc_chips[] = {
/* Sun4/100, 4/200, SLC */
struct cpu_iu_info linux_sparc_chips[] = {
/* Sun4/100, 4/200, SLC */
@@
-120,7
+119,7
@@
struct cpu_iu_info linux_sparc_chips[] = {
{ 0xf, 0, "UNKNOWN CPU-VENDOR/TYPE"},
};
{ 0xf, 0, "UNKNOWN CPU-VENDOR/TYPE"},
};
-#define NSPARCCHIPS
(sizeof(linux_sparc_chips)/sizeof(struct cpu_iu_info)
)
+#define NSPARCCHIPS
ARRAY_SIZE(linux_sparc_chips
)
char *sparc_cpu_type;
char *sparc_fpu_type;
char *sparc_cpu_type;
char *sparc_fpu_type;