irq fix

3 files changed, 21 insertions, 0 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cd92381c15e8..68de748e2c2d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -29,6 +29,7 @@ pkgbase = linux-linode
 	source = linux-linode.preset
 	source = module-symbol-waiting-3.6.patch
 	source = module-init-wait-3.6.patch
+	source = irq_cfg_pointer-3.6.6.patch
 	source = change-default-console-loglevel.patch
 	md5sums = 1a1760420eac802c541a20ab51a093d1
 	md5sums = f248294551c34753c5c019c8d513280c
@@ -37,6 +38,7 @@ pkgbase = linux-linode
 	md5sums = ee66f3cd0c5bc0ba0f65499784d19f30
 	md5sums = 670931649c60fcb3ef2e0119ed532bd4
 	md5sums = 8a71abc4224f575008f974a099b5cf6f
+	md5sums = 4909a0271af4e5f373136b382826717f
 	md5sums = 9d3c56a4b999c8bfbd4018089a62f662
 
 pkgname = linux-linode
diff --git a/PKGBUILD b/PKGBUILD
index 1f0c3bddcde7..1919747069e3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,6 +16,7 @@ source=("http://www.kernel.org/pub/linux/kernel/v3.x/${_srcname}.tar.xz"
         "${pkgname}.preset"
         "module-symbol-waiting-3.6.patch"
         "module-init-wait-3.6.patch"
+        "irq_cfg_pointer-3.6.6.patch"
         'change-default-console-loglevel.patch')
 md5sums=('1a1760420eac802c541a20ab51a093d1'
          'f248294551c34753c5c019c8d513280c'
@@ -24,6 +25,7 @@ md5sums=('1a1760420eac802c541a20ab51a093d1'
          'ee66f3cd0c5bc0ba0f65499784d19f30'
          '670931649c60fcb3ef2e0119ed532bd4'
          '8a71abc4224f575008f974a099b5cf6f'
+         '4909a0271af4e5f373136b382826717f'
          '9d3c56a4b999c8bfbd4018089a62f662')
 pkgdesc="Kernel for Arch Linux on Linode"
 depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7')
@@ -39,6 +41,7 @@ build() {
   patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch"
   patch -Np1 -i "${srcdir}/module-symbol-waiting-3.6.patch"
   patch -Np1 -i "${srcdir}/module-init-wait-3.6.patch"
+  patch -Np1 -i "${srcdir}/irq_cfg_pointer-3.6.6.patch"
   cp "${srcdir}/config.x86_64" ./.config
   sed -i '2iexit 0' scripts/depmod.sh
   sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" ./.config
diff --git a/irq_cfg_pointer-3.6.6.patch b/irq_cfg_pointer-3.6.6.patch
new file mode 100644
index 000000000000..32583c0ac383
--- /dev/null
+++ b/irq_cfg_pointer-3.6.6.patch
@@ -0,0 +1,16 @@
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux.git;a=blobdiff_plain;f=arch%2Fx86%2Fkernel%2Fapic%2Fio_apic.c;h=1817fa911024f07151d3edf91bd350722c9f79f8;hp=c265593ec2cdc3df35fda1586aaf91514fab62fa;hb=94777fc51b3ad85ff9f705ddf7cdd0eb3bbad5a6;hpb=3e8fa263a97079c74880675c451587bb6899e661
+
+diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
+index c265593..1817fa9 100644
+--- a/arch/x86/kernel/apic/io_apic.c
++++ b/arch/x86/kernel/apic/io_apic.c
+@@ -2257,6 +2257,9 @@ asmlinkage void smp_irq_move_cleanup_interrupt(void)
+ 			continue;
+ 
+ 		cfg = irq_cfg(irq);
++		if (!cfg)
++			continue;
++
+ 		raw_spin_lock(&desc->lock);
+ 
+ 		/*