[kernel] r13990 - in dists/sid/linux-2.6/debian: . patches/bugfix/x86 patches/series

[Bastian Blank]

Author: waldi
Date: Wed Jul 22 14:18:11 2009
New Revision: 13990

Log:
* debian/changelog: Update.
* debian/patches/bugfix/x86/arch-kernel-cpu-amd-pci-access.diff: Add.
* debian/patches/series/4: Add new patch.

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/x86/arch-kernel-cpu-amd-pci-access.diff
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/4

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Wed Jul 22 06:48:44 2009	(r13989)
+++ dists/sid/linux-2.6/debian/changelog	Wed Jul 22 14:18:11 2009	(r13990)
@@ -1,6 +1,7 @@
 linux-2.6 (2.6.30-4) UNRELEASED; urgency=low
 
   * Add stable release 2.6.30.2.
+  * Fix pci access in x86 startup code. (closes: #537783)
 
  -- Bastian Blank <waldi at debian.org>  Tue, 21 Jul 2009 12:47:46 +0200
 

Added: dists/sid/linux-2.6/debian/patches/bugfix/x86/arch-kernel-cpu-amd-pci-access.diff
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/x86/arch-kernel-cpu-amd-pci-access.diff	Wed Jul 22 14:18:11 2009	(r13990)
@@ -0,0 +1,13 @@
+diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
+index d869b3b..61a592e 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)))

Modified: dists/sid/linux-2.6/debian/patches/series/4
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/4	Wed Jul 22 06:48:44 2009	(r13989)
+++ dists/sid/linux-2.6/debian/patches/series/4	Wed Jul 22 14:18:11 2009	(r13990)
@@ -3,3 +3,4 @@
 - bugfix/all/personality-fix-PER_CLEAR_ON_SETID.patch
 - bugfix/all/add-fno-delete-null-pointer-checks-to-cflags.patch
 + bugfix/all/stable/2.6.30.2.patch
++ bugfix/x86/arch-kernel-cpu-amd-pci-access.diff