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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
i386
/
kernel
/
cpu
/
amd.c
diff --git
a/arch/i386/kernel/cpu/amd.c
b/arch/i386/kernel/cpu/amd.c
index
e6a2d6b
..
41cfea5
100644
(file)
--- a/
arch/i386/kernel/cpu/amd.c
+++ b/
arch/i386/kernel/cpu/amd.c
@@
-22,7
+22,7
@@
extern void vide(void);
__asm__(".align 4\nvide: ret");
extern void vide(void);
__asm__(".align 4\nvide: ret");
-static void __init init_amd(struct cpuinfo_x86 *c)
+static void __
cpu
init init_amd(struct cpuinfo_x86 *c)
{
u32 l, h;
int mbytes = num_physpages >> (20-PAGE_SHIFT);
{
u32 l, h;
int mbytes = num_physpages >> (20-PAGE_SHIFT);
@@
-104,10
+104,7
@@
static void __init init_amd(struct cpuinfo_x86 *c)
f_vide();
rdtscl(d2);
d = d2-d;
f_vide();
rdtscl(d2);
d = d2-d;
-
- /* Knock these two lines out if it debugs out ok */
- printk(KERN_INFO "AMD K6 stepping B detected - ");
- /* -- cut here -- */
+
if (d > 20*K6_BUG_LOOP)
printk("system stability may be impaired when more than 32 MB are used.\n");
else
if (d > 20*K6_BUG_LOOP)
printk("system stability may be impaired when more than 32 MB are used.\n");
else
@@
-246,7
+243,7
@@
static void __init init_amd(struct cpuinfo_x86 *c)
num_cache_leaves = 3;
}
num_cache_leaves = 3;
}
-static unsigned int amd_size_cache(struct cpuinfo_x86 * c, unsigned int size)
+static unsigned int
__cpuinit
amd_size_cache(struct cpuinfo_x86 * c, unsigned int size)
{
/* AMD errata T13 (order #21922) */
if ((c->x86 == 6)) {
{
/* AMD errata T13 (order #21922) */
if ((c->x86 == 6)) {
@@
-259,7
+256,7
@@
static unsigned int amd_size_cache(struct cpuinfo_x86 * c, unsigned int size)
return size;
}
return size;
}
-static struct cpu_dev amd_cpu_dev __initdata = {
+static struct cpu_dev amd_cpu_dev __
cpu
initdata = {
.c_vendor = "AMD",
.c_ident = { "AuthenticAMD" },
.c_models = {
.c_vendor = "AMD",
.c_ident = { "AuthenticAMD" },
.c_models = {
@@
-275,7
+272,6
@@
static struct cpu_dev amd_cpu_dev __initdata = {
},
},
.c_init = init_amd,
},
},
.c_init = init_amd,
- .c_identify = generic_identify,
.c_size_cache = amd_size_cache,
};
.c_size_cache = amd_size_cache,
};