rpms/kernel/devel linux-2.6-smp-boot-delay.patch, NONE, 1.1 kernel.spec, 1.586, 1.587
Chuck Ebbert (cebbert)
fedora-extras-commits at redhat.com
Mon Apr 7 05:10:47 UTC 2008
- Previous message (by thread): rpms/monitor-edid/F-8 monitor-edid-makesource.sh, NONE, 1.1 monitor-edid-system-lrmi.patch, NONE, 1.1 monitor-edid.spec, NONE, 1.1 sources, 1.1, 1.2
- Next message (by thread): rpms/monitor-edid/F-7 monitor-edid-makesource.sh, NONE, 1.1 monitor-edid-system-lrmi.patch, NONE, 1.1 monitor-edid.spec, NONE, 1.1 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: cebbert
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25062
Modified Files:
kernel.spec
Added Files:
linux-2.6-smp-boot-delay.patch
Log Message:
* Mon Apr 07 2008 Chuck Ebbert <cebbert at redhat.com>
- Increase SMP boot delay, hopefully solving bug #431882.
linux-2.6-smp-boot-delay.patch:
--- NEW FILE linux-2.6-smp-boot-delay.patch ---
Subject: smp: boot delay
From: Ingo Molnar <mingo at elte.hu>
Date: Fri Mar 28 08:53:27 CET 2008
Signed-off-by: Ingo Molnar <mingo at elte.hu>
[2.6.25 backport: cebbert at redhat.com]
---
arch/x86/kernel/smpboot_32.c | 10 +++++-----
arch/x86/kernel/smpboot_64.c | 8 ++++----
2 files changed, 9 insertions(+), 9 deletions(-)
--- linux-2.6.24.noarch.orig/arch/x86/kernel/smpboot_32.c
+++ linux-2.6.24.noarch/arch/x86/kernel/smpboot_32.c
@@ -531,7 +531,7 @@ static inline void __inquire_remote_apic
timeout = 0;
do {
- udelay(100);
+ udelay(1000);
status = apic_read(APIC_ICR) & APIC_ICR_RR_MASK;
} while (status == APIC_ICR_RR_INPROG && timeout++ < 1000);
@@ -571,7 +571,7 @@ wakeup_secondary_cpu(int logical_apicid,
/*
* Give the other CPU some time to accept the IPI.
*/
- udelay(200);
+ udelay(2000);
/*
* Due to the Pentium erratum 3AP.
*/
@@ -686,7 +686,7 @@ wakeup_secondary_cpu(int phys_apicid, un
/*
* Give the other CPU some time to accept the IPI.
*/
- udelay(300);
+ udelay(3000);
Dprintk("Startup point 1.\n");
@@ -696,7 +696,7 @@ wakeup_secondary_cpu(int phys_apicid, un
/*
* Give the other CPU some time to accept the IPI.
*/
- udelay(200);
+ udelay(2000);
/*
* Due to the Pentium erratum 3AP.
*/
@@ -833,7 +833,7 @@ static int __cpuinit do_boot_cpu(int api
for (timeout = 0; timeout < 50000; timeout++) {
if (cpu_isset(cpu, cpu_callin_map))
break; /* It has booted */
- udelay(100);
+ udelay(1000);
}
if (cpu_isset(cpu, cpu_callin_map)) {
--- linux-2.6.24.noarch.orig/arch/x86/kernel/smpboot_64.c
+++ linux-2.6.24.noarch/arch/x86/kernel/smpboot_64.c
@@ -413,7 +413,7 @@ static void inquire_remote_apic(int apic
timeout = 0;
do {
- udelay(100);
+ udelay(1000);
status = apic_read(APIC_ICR) & APIC_ICR_RR_MASK;
} while (status == APIC_ICR_RR_INPROG && timeout++ < 1000);
@@ -498,7 +498,7 @@ static int __cpuinit wakeup_secondary_vi
/*
* Give the other CPU some time to accept the IPI.
*/
- udelay(300);
+ udelay(3000);
Dprintk("Startup point 1.\n");
@@ -508,7 +508,7 @@ static int __cpuinit wakeup_secondary_vi
/*
* Give the other CPU some time to accept the IPI.
*/
- udelay(200);
+ udelay(2000);
/*
* Due to the Pentium erratum 3AP.
*/
@@ -679,7 +679,7 @@ do_rest:
for (timeout = 0; timeout < 50000; timeout++) {
if (cpu_isset(cpu, cpu_callin_map))
break; /* It has booted */
- udelay(100);
+ udelay(1000);
}
if (cpu_isset(cpu, cpu_callin_map)) {
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.586
retrieving revision 1.587
diff -u -r1.586 -r1.587
--- kernel.spec 7 Apr 2008 04:37:27 -0000 1.586
+++ kernel.spec 7 Apr 2008 05:09:43 -0000 1.587
@@ -572,6 +572,7 @@
Patch41: linux-2.6-sysrq-c.patch
Patch42: linux-2.6-x86-tune-generic.patch
Patch75: linux-2.6-x86-debug-boot.patch
+Patch80: linux-2.6-smp-boot-delay.patch
Patch123: linux-2.6-ppc-rtc.patch
Patch140: linux-2.6-ps3-ehci-iso.patch
@@ -1005,6 +1006,8 @@
# x86(-64)
# Compile 686 kernels tuned for Pentium4.
ApplyPatch linux-2.6-x86-tune-generic.patch
+# Delay longer during boot on x86 while waiting for secondary processors
+ApplyPatch linux-2.6-smp-boot-delay.patch
#
# PowerPC
@@ -1759,6 +1762,9 @@
%changelog
* Mon Apr 07 2008 Chuck Ebbert <cebbert at redhat.com>
+- Increase SMP boot delay, hopefully solving bug #431882.
+
+* Mon Apr 07 2008 Chuck Ebbert <cebbert at redhat.com>
- Enable the 1-wire drivers (except for the Matrox driver which conflicts
with the Matrox framebuffer driver.)
- Previous message (by thread): rpms/monitor-edid/F-8 monitor-edid-makesource.sh, NONE, 1.1 monitor-edid-system-lrmi.patch, NONE, 1.1 monitor-edid.spec, NONE, 1.1 sources, 1.1, 1.2
- Next message (by thread): rpms/monitor-edid/F-7 monitor-edid-makesource.sh, NONE, 1.1 monitor-edid-system-lrmi.patch, NONE, 1.1 monitor-edid.spec, NONE, 1.1 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list