rpms/kernel/F-11 linux-2.6-xen-x86-dont-probe-if-apics-are-disabled.patch, NONE, 1.1 kernel.spec, 1.1724, 1.1725
Chuck Ebbert
cebbert at fedoraproject.org
Wed Sep 2 03:52:53 UTC 2009
- Previous message (by thread): rpms/ltsp/devel .cvsignore, 1.25, 1.26 ltsp.spec, 1.34, 1.35 sources, 1.29, 1.30
- Next message (by thread): rpms/perl-DBIx-Class-EncodedColumn/devel .cvsignore, 1.2, 1.3 perl-DBIx-Class-EncodedColumn.spec, 1.3, 1.4 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: cebbert
Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14229
Modified Files:
kernel.spec
Added Files:
linux-2.6-xen-x86-dont-probe-if-apics-are-disabled.patch
Log Message:
Fix yet another Xen boot crash (#520517)
linux-2.6-xen-x86-dont-probe-if-apics-are-disabled.patch:
amd.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE linux-2.6-xen-x86-dont-probe-if-apics-are-disabled.patch ---
From: Jeremy Fitzhardinge <jeremy at goop.org>
Date: Wed, 22 Jul 2009 16:59:35 +0000 (-0700)
Subject: x86, amd: Don't probe for extended APIC ID if APICs are disabled
X-Git-Tag: v2.6.31-rc5~87^2~1
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=2cb078603abb612e3bcd428fb8122c3d39e08832
x86, amd: Don't probe for extended APIC ID if APICs are disabled
If we've logically disabled apics, don't probe the PCI space for the
AMD extended APIC ID.
[ Impact: prevent boot crash under Xen. ]
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Reported-by: Bastian Blank <bastian at waldi.eu.org>
Signed-off-by: H. Peter Anvin <hpa at zytor.com>
---
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index 28e5f59..e2485b0 100644
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -356,7 +356,7 @@ static void __cpuinit early_init_amd(struct cpuinfo_x86 *c)
#endif
#if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_PCI)
/* check CPU config space for extended APIC ID */
- if (c->x86 >= 0xf) {
+ if (cpu_has_apic && c->x86 >= 0xf) {
unsigned int val;
val = read_pci_config(0, 24, 0, 0x68);
if ((val & ((1 << 17) | (1 << 18))) == ((1 << 17) | (1 << 18)))
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1724
retrieving revision 1.1725
diff -u -p -r1.1724 -r1.1725
--- kernel.spec 1 Sep 2009 04:18:44 -0000 1.1724
+++ kernel.spec 2 Sep 2009 03:52:52 -0000 1.1725
@@ -746,6 +746,9 @@ Patch14070: linux-2.6-kthreads-fix-kthre
Patch14080: linux-2.6-x86-load-percpu-segment-no-stackprotector.patch
Patch14090: linux-2.6-xen-rearrange-to-fix-stackprotector.patch
+# fix amd crash in xen caused by -stable patch
+Patch14100: linux-2.6-xen-x86-dont-probe-if-apics-are-disabled.patch
+
%endif
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1386,6 +1389,9 @@ ApplyPatch linux-2.6-kthreads-fix-kthrea
ApplyPatch linux-2.6-x86-load-percpu-segment-no-stackprotector.patch
ApplyPatch linux-2.6-xen-rearrange-to-fix-stackprotector.patch
+# another fun xen bug (#520517)
+ApplyPatch linux-2.6-xen-x86-dont-probe-if-apics-are-disabled.patch
+
# END OF PATCH APPLICATIONS
%endif
@@ -1971,6 +1977,9 @@ fi
# and build.
%changelog
+* Tue Sep 01 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.5-46
+- Fix yet another Xen boot crash (#520517)
+
* Tue Sep 01 2009 Jarod Wilson <jarod at redhat.com> 2.5.30.5-45
- Refresh lirc patches, add new lirc_ene0100 driver
- Fix up hdpvr driver for use with modular i2c so that
- Previous message (by thread): rpms/ltsp/devel .cvsignore, 1.25, 1.26 ltsp.spec, 1.34, 1.35 sources, 1.29, 1.30
- Next message (by thread): rpms/perl-DBIx-Class-EncodedColumn/devel .cvsignore, 1.2, 1.3 perl-DBIx-Class-EncodedColumn.spec, 1.3, 1.4 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list