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
/
centaur.c
diff --git
a/arch/i386/kernel/cpu/centaur.c
b/arch/i386/kernel/cpu/centaur.c
index
bd75629
..
8c25047
100644
(file)
--- a/
arch/i386/kernel/cpu/centaur.c
+++ b/
arch/i386/kernel/cpu/centaur.c
@@
-9,7
+9,7
@@
#ifdef CONFIG_X86_OOSTORE
#ifdef CONFIG_X86_OOSTORE
-static u32 __init power2(u32 x)
+static u32 __
cpu
init power2(u32 x)
{
u32 s=1;
while(s<=x)
{
u32 s=1;
while(s<=x)
@@
-22,7
+22,7
@@
static u32 __init power2(u32 x)
* Set up an actual MCR
*/
* Set up an actual MCR
*/
-static void __init centaur_mcr_insert(int reg, u32 base, u32 size, int key)
+static void __
cpu
init centaur_mcr_insert(int reg, u32 base, u32 size, int key)
{
u32 lo, hi;
{
u32 lo, hi;
@@
-40,7
+40,7
@@
static void __init centaur_mcr_insert(int reg, u32 base, u32 size, int key)
* Shortcut: We know you can't put 4Gig of RAM on a winchip
*/
* Shortcut: We know you can't put 4Gig of RAM on a winchip
*/
-static u32 __
init ramtop(void)
/* 16388 */
+static u32 __
cpuinit ramtop(void)
/* 16388 */
{
int i;
u32 top = 0;
{
int i;
u32 top = 0;
@@
-91,7
+91,7
@@
static u32 __init ramtop(void) /* 16388 */
* Compute a set of MCR's to give maximum coverage
*/
* Compute a set of MCR's to give maximum coverage
*/
-static int __init centaur_mcr_compute(int nr, int key)
+static int __
cpu
init centaur_mcr_compute(int nr, int key)
{
u32 mem = ramtop();
u32 root = power2(mem);
{
u32 mem = ramtop();
u32 root = power2(mem);
@@
-166,7
+166,7
@@
static int __init centaur_mcr_compute(int nr, int key)
return ct;
}
return ct;
}
-static void __init centaur_create_optimal_mcr(void)
+static void __
cpu
init centaur_create_optimal_mcr(void)
{
int i;
/*
{
int i;
/*
@@
-189,7
+189,7
@@
static void __init centaur_create_optimal_mcr(void)
wrmsr(MSR_IDT_MCR0+i, 0, 0);
}
wrmsr(MSR_IDT_MCR0+i, 0, 0);
}
-static void __init winchip2_create_optimal_mcr(void)
+static void __
cpu
init winchip2_create_optimal_mcr(void)
{
u32 lo, hi;
int i;
{
u32 lo, hi;
int i;
@@
-227,7
+227,7
@@
static void __init winchip2_create_optimal_mcr(void)
* Handle the MCR key on the Winchip 2.
*/
* Handle the MCR key on the Winchip 2.
*/
-static void __init winchip2_unprotect_mcr(void)
+static void __
cpu
init winchip2_unprotect_mcr(void)
{
u32 lo, hi;
u32 key;
{
u32 lo, hi;
u32 key;
@@
-239,7
+239,7
@@
static void __init winchip2_unprotect_mcr(void)
wrmsr(MSR_IDT_MCR_CTRL, lo, hi);
}
wrmsr(MSR_IDT_MCR_CTRL, lo, hi);
}
-static void __init winchip2_protect_mcr(void)
+static void __
cpu
init winchip2_protect_mcr(void)
{
u32 lo, hi;
{
u32 lo, hi;
@@
-257,7
+257,7
@@
static void __init winchip2_protect_mcr(void)
#define RNG_ENABLED (1 << 3)
#define RNG_ENABLE (1 << 6) /* MSR_VIA_RNG */
#define RNG_ENABLED (1 << 3)
#define RNG_ENABLE (1 << 6) /* MSR_VIA_RNG */
-static void __init init_c3(struct cpuinfo_x86 *c)
+static void __
cpu
init init_c3(struct cpuinfo_x86 *c)
{
u32 lo, hi;
{
u32 lo, hi;
@@
-303,7
+303,7
@@
static void __init init_c3(struct cpuinfo_x86 *c)
display_cacheinfo(c);
}
display_cacheinfo(c);
}
-static void __init init_centaur(struct cpuinfo_x86 *c)
+static void __
cpu
init init_centaur(struct cpuinfo_x86 *c)
{
enum {
ECX8=1<<1,
{
enum {
ECX8=1<<1,
@@
-442,7
+442,7
@@
static void __init init_centaur(struct cpuinfo_x86 *c)
}
}
}
}
-static unsigned int centaur_size_cache(struct cpuinfo_x86 * c, unsigned int size)
+static unsigned int
__cpuinit
centaur_size_cache(struct cpuinfo_x86 * c, unsigned int size)
{
/* VIA C3 CPUs (670-68F) need further shifting. */
if ((c->x86 == 6) && ((c->x86_model == 7) || (c->x86_model == 8)))
{
/* VIA C3 CPUs (670-68F) need further shifting. */
if ((c->x86 == 6) && ((c->x86_model == 7) || (c->x86_model == 8)))
@@
-457,7
+457,7
@@
static unsigned int centaur_size_cache(struct cpuinfo_x86 * c, unsigned int size
return size;
}
return size;
}
-static struct cpu_dev centaur_cpu_dev __initdata = {
+static struct cpu_dev centaur_cpu_dev __
cpu
initdata = {
.c_vendor = "Centaur",
.c_ident = { "CentaurHauls" },
.c_init = init_centaur,
.c_vendor = "Centaur",
.c_ident = { "CentaurHauls" },
.c_init = init_centaur,