From 778f7382e17682aab88acc39e8ab420650d1795b Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Mon, 19 Nov 2012 12:45:15 +0000
Subject: [PATCH] bump to latest version

---
 PKGBUILD                    | 13 +++++++++----
 irq_cfg_pointer-3.6.6.patch | 16 ++++++++++++++++
 linux.install               |  2 +-
 3 files changed, 26 insertions(+), 5 deletions(-)
 create mode 100644 irq_cfg_pointer-3.6.6.patch

diff --git a/PKGBUILD b/PKGBUILD
index d62de47..84b177e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 pkgbase=linux               # Build stock -ARCH kernel
 #pkgbase=linux-custom       # Build kernel with a different name
 _srcname=linux-3.6
-pkgver=3.6.6
+pkgver=3.6.7
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.kernel.org/"
@@ -20,15 +20,17 @@ source=("http://www.kernel.org/pub/linux/kernel/v3.x/${_srcname}.tar.xz"
         'linux.preset'
         'change-default-console-loglevel.patch'
         'module-symbol-waiting-3.6.patch'
-        'module-init-wait-3.6.patch')
+        'module-init-wait-3.6.patch'
+        'irq_cfg_pointer-3.6.6.patch')
 md5sums=('1a1760420eac802c541a20ab51a093d1'
-         '11d6d8749d4612a77f43f0531c0f2824'
+         '134936c362d8812b5cafcf3c67afdce0'
          '65f7ff39775f20f65014383564d3cb65'
          '3adbfa45451c4bcf9dd7879bed033d77'
          'eb14dcfd80c00852ef81ded6e826826a'
          '9d3c56a4b999c8bfbd4018089a62f662'
          '670931649c60fcb3ef2e0119ed532bd4'
-         '8a71abc4224f575008f974a099b5cf6f')
+         '8a71abc4224f575008f974a099b5cf6f'
+         '4909a0271af4e5f373136b382826717f')
 
 _kernelname=${pkgbase#linux}
 
@@ -51,6 +53,9 @@ build() {
   patch -Np1 -i "${srcdir}/module-symbol-waiting-3.6.patch"
   patch -Np1 -i "${srcdir}/module-init-wait-3.6.patch"
 
+  # fix FS#32615 - Check for valid irq_cfg pointer in smp_irq_move_cleanup_interrupt
+  patch -Np1 -i "${srcdir}/irq_cfg_pointer-3.6.6.patch"
+
   if [ "${CARCH}" = "x86_64" ]; then
     cat "${srcdir}/config.x86_64" > ./.config
   else
diff --git a/irq_cfg_pointer-3.6.6.patch b/irq_cfg_pointer-3.6.6.patch
new file mode 100644
index 0000000..32583c0
--- /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);
+ 
+ 		/*
diff --git a/linux.install b/linux.install
index ff71693..4ed8580 100644
--- a/linux.install
+++ b/linux.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=
-KERNEL_VERSION=3.6.6-1-ARCH
+KERNEL_VERSION=3.6.7-1-ARCH
 
 # set a sane PATH to ensure that critical utils like depmod will be found
 export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'