rpms/kernel/devel linux-2.6-x86-dont-delete-cpu_devs-data.patch, NONE, 1.1 kernel-2.6.spec, 1.3152, 1.3153
Dave Jones (davej)
fedora-extras-commits at redhat.com
Sun May 13 21:05:14 UTC 2007
Author: davej
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19448
Modified Files:
kernel-2.6.spec
Added Files:
linux-2.6-x86-dont-delete-cpu_devs-data.patch
Log Message:
* Sun May 13 2007 Dave Jones <davej at redhat.com>
- Don't delete cpu_devs data to identify different x86 types in late_initcall
linux-2.6-x86-dont-delete-cpu_devs-data.patch:
--- NEW FILE linux-2.6-x86-dont-delete-cpu_devs-data.patch ---
http://bugzilla.kernel.org/show_bug.cgi?id=8033
Don't delete cpu_devs data to identify different x86 types in late_initcall
In arch/i386/cpu/common.c there is:
cpu_devs[X86_VENDOR_INTEL]
cpu_devs[X86_VENDOR_CYRIX]
cpu_devs[X86_VENDOR_AMD]
...
They are all filled with data early.
The data (struct) got set to NULL for all, but Intel in different
late_initcall (exit_cpu_vendor) calls.
I don't see what sense this makes at all, maybe something that got
forgotten with the HOTPLUG_CPU extenstions?
Please check/review whether initdata, cpuinitdata is still ok and this
still works with HOTPLUG_CPU and without, it should...
Signed-off-by: Thomas Renninger <trenn at suse.de>
---
arch/i386/kernel/cpu/amd.c | 10 ----------
arch/i386/kernel/cpu/centaur.c | 10 ----------
arch/i386/kernel/cpu/cyrix.c | 19 -------------------
arch/i386/kernel/cpu/nexgen.c | 10 ----------
arch/i386/kernel/cpu/rise.c | 9 ---------
arch/i386/kernel/cpu/transmeta.c | 10 ----------
arch/i386/kernel/cpu/umc.c | 10 ----------
7 files changed, 78 deletions(-)
Index: linux-2.6.21/arch/i386/kernel/cpu/amd.c
===================================================================
--- linux-2.6.21.orig/arch/i386/kernel/cpu/amd.c
+++ linux-2.6.21/arch/i386/kernel/cpu/amd.c
@@ -314,13 +314,3 @@ int __init amd_init_cpu(void)
cpu_devs[X86_VENDOR_AMD] = &amd_cpu_dev;
return 0;
}
-
-//early_arch_initcall(amd_init_cpu);
-
-static int __init amd_exit_cpu(void)
-{
- cpu_devs[X86_VENDOR_AMD] = NULL;
- return 0;
-}
-
-late_initcall(amd_exit_cpu);
Index: linux-2.6.21/arch/i386/kernel/cpu/cyrix.c
===================================================================
--- linux-2.6.21.orig/arch/i386/kernel/cpu/cyrix.c
+++ linux-2.6.21/arch/i386/kernel/cpu/cyrix.c
@@ -448,16 +448,6 @@ int __init cyrix_init_cpu(void)
return 0;
}
-//early_arch_initcall(cyrix_init_cpu);
-
-static int __init cyrix_exit_cpu(void)
-{
- cpu_devs[X86_VENDOR_CYRIX] = NULL;
- return 0;
-}
-
-late_initcall(cyrix_exit_cpu);
-
static struct cpu_dev nsc_cpu_dev __cpuinitdata = {
.c_vendor = "NSC",
.c_ident = { "Geode by NSC" },
@@ -470,12 +460,3 @@ int __init nsc_init_cpu(void)
return 0;
}
-//early_arch_initcall(nsc_init_cpu);
-
-static int __init nsc_exit_cpu(void)
-{
- cpu_devs[X86_VENDOR_NSC] = NULL;
- return 0;
-}
-
-late_initcall(nsc_exit_cpu);
Index: linux-2.6.21/arch/i386/kernel/cpu/rise.c
===================================================================
--- linux-2.6.21.orig/arch/i386/kernel/cpu/rise.c
+++ linux-2.6.21/arch/i386/kernel/cpu/rise.c
@@ -50,12 +50,3 @@ int __init rise_init_cpu(void)
return 0;
}
-//early_arch_initcall(rise_init_cpu);
-
-static int __init rise_exit_cpu(void)
-{
- cpu_devs[X86_VENDOR_RISE] = NULL;
- return 0;
-}
-
-late_initcall(rise_exit_cpu);
Index: linux-2.6.21/arch/i386/kernel/cpu/umc.c
===================================================================
--- linux-2.6.21.orig/arch/i386/kernel/cpu/umc.c
+++ linux-2.6.21/arch/i386/kernel/cpu/umc.c
@@ -24,13 +24,3 @@ int __init umc_init_cpu(void)
cpu_devs[X86_VENDOR_UMC] = &umc_cpu_dev;
return 0;
}
-
-//early_arch_initcall(umc_init_cpu);
-
-static int __init umc_exit_cpu(void)
-{
- cpu_devs[X86_VENDOR_UMC] = NULL;
- return 0;
-}
-
-late_initcall(umc_exit_cpu);
Index: linux-2.6.21/arch/i386/kernel/cpu/centaur.c
===================================================================
--- linux-2.6.21.orig/arch/i386/kernel/cpu/centaur.c
+++ linux-2.6.21/arch/i386/kernel/cpu/centaur.c
@@ -469,13 +469,3 @@ int __init centaur_init_cpu(void)
cpu_devs[X86_VENDOR_CENTAUR] = ¢aur_cpu_dev;
return 0;
}
-
-//early_arch_initcall(centaur_init_cpu);
-
-static int __init centaur_exit_cpu(void)
-{
- cpu_devs[X86_VENDOR_CENTAUR] = NULL;
- return 0;
-}
-
-late_initcall(centaur_exit_cpu);
Index: linux-2.6.21/arch/i386/kernel/cpu/transmeta.c
===================================================================
--- linux-2.6.21.orig/arch/i386/kernel/cpu/transmeta.c
+++ linux-2.6.21/arch/i386/kernel/cpu/transmeta.c
@@ -112,13 +112,3 @@ int __init transmeta_init_cpu(void)
cpu_devs[X86_VENDOR_TRANSMETA] = &transmeta_cpu_dev;
return 0;
}
-
-//early_arch_initcall(transmeta_init_cpu);
-
-static int __init transmeta_exit_cpu(void)
-{
- cpu_devs[X86_VENDOR_TRANSMETA] = NULL;
- return 0;
-}
-
-late_initcall(transmeta_exit_cpu);
Index: linux-2.6.21/arch/i386/kernel/cpu/nexgen.c
===================================================================
--- linux-2.6.21.orig/arch/i386/kernel/cpu/nexgen.c
+++ linux-2.6.21/arch/i386/kernel/cpu/nexgen.c
@@ -58,13 +58,3 @@ int __init nexgen_init_cpu(void)
cpu_devs[X86_VENDOR_NEXGEN] = &nexgen_cpu_dev;
return 0;
}
-
-//early_arch_initcall(nexgen_init_cpu);
-
-static int __init nexgen_exit_cpu(void)
-{
- cpu_devs[X86_VENDOR_NEXGEN] = NULL;
- return 0;
-}
-
-late_initcall(nexgen_exit_cpu);
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3152
retrieving revision 1.3153
diff -u -r1.3152 -r1.3153
--- kernel-2.6.spec 11 May 2007 19:56:46 -0000 1.3152
+++ kernel-2.6.spec 13 May 2007 21:04:40 -0000 1.3153
@@ -408,6 +408,7 @@
Patch201: linux-2.6-x86-vga-vidfail.patch
Patch202: linux-2.6-x86-64-edac-support.patch
Patch203: linux-2.6-x86_64-silence-up-apic-errors.patch
+Patch204: linux-2.6-x86-dont-delete-cpu_devs-data.patch
# 300 - 399 ppc(64)
Patch300: linux-2.6-g5-therm-shutdown.patch
@@ -1046,6 +1047,8 @@
%patch202 -p1
# Suppress APIC errors on UP x86-64.
%patch203 -p1
+# Don't delete cpu_devs data to identify different x86 types in late_initcall
+%patch204 -p1
#
# PowerPC
@@ -2324,6 +2327,9 @@
%endif
%changelog
+* Sun May 13 2007 Dave Jones <davej at redhat.com>
+- Don't delete cpu_devs data to identify different x86 types in late_initcall
+
* Thu May 10 2007 Dave Jones <davej at redhat.com>
- Disable RTC class CMOS driver.
More information about the fedora-extras-commits
mailing list