git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into gfs2
[pandora-kernel.git]
/
arch
/
i386
/
kernel
/
cpu
/
nexgen.c
diff --git
a/arch/i386/kernel/cpu/nexgen.c
b/arch/i386/kernel/cpu/nexgen.c
index
ad87fa5
..
8bf23cc
100644
(file)
--- a/
arch/i386/kernel/cpu/nexgen.c
+++ b/
arch/i386/kernel/cpu/nexgen.c
@@
-10,7
+10,7
@@
* to have CPUID. (Thanks to Herbert Oppmann)
*/
* to have CPUID. (Thanks to Herbert Oppmann)
*/
-static int __init deep_magic_nexgen_probe(void)
+static int __
cpu
init deep_magic_nexgen_probe(void)
{
int ret;
{
int ret;
@@
-27,21
+27,20
@@
static int __init deep_magic_nexgen_probe(void)
return ret;
}
return ret;
}
-static void __init init_nexgen(struct cpuinfo_x86 * c)
+static void __
cpu
init init_nexgen(struct cpuinfo_x86 * c)
{
c->x86_cache_size = 256; /* A few had 1 MB... */
}
{
c->x86_cache_size = 256; /* A few had 1 MB... */
}
-static void __init nexgen_identify(struct cpuinfo_x86 * c)
+static void __
cpu
init nexgen_identify(struct cpuinfo_x86 * c)
{
/* Detect NexGen with old hypercode */
if ( deep_magic_nexgen_probe() ) {
strcpy(c->x86_vendor_id, "NexGenDriven");
}
{
/* Detect NexGen with old hypercode */
if ( deep_magic_nexgen_probe() ) {
strcpy(c->x86_vendor_id, "NexGenDriven");
}
- generic_identify(c);
}
}
-static struct cpu_dev nexgen_cpu_dev __initdata = {
+static struct cpu_dev nexgen_cpu_dev __
cpu
initdata = {
.c_vendor = "Nexgen",
.c_ident = { "NexGenDriven" },
.c_models = {
.c_vendor = "Nexgen",
.c_ident = { "NexGenDriven" },
.c_models = {