3.4-stable patches

added patches:
	ahci-add-device-ids-for-intel-lynx-point-lp-pch.patch
	ahci-ahci-mode-sata-patch-for-intel-avoton-deviceids.patch
	um-add-missing-declaration-of-getrlimit-and-friends.patch

diff --git a/queue-3.4/ahci-add-device-ids-for-intel-lynx-point-lp-pch.patch b/queue-3.4/ahci-add-device-ids-for-intel-lynx-point-lp-pch.patch
new file mode 100644 (file)
index 0000000..6e0137d
--- /dev/null
+++ b/queue-3.4/ahci-add-device-ids-for-intel-lynx-point-lp-pch.patch
@@ -0,0 +1,37 @@
+From 77b12bc9cf7b10c7c1a04ca45272fbb4287902d0 Mon Sep 17 00:00:00 2001
+From: James Ralston <james.d.ralston@intel.com>
+Date: Thu, 9 Aug 2012 09:02:31 -0700
+Subject: ahci: Add Device IDs for Intel Lynx Point-LP PCH
+
+From: James Ralston <james.d.ralston@intel.com>
+
+commit 77b12bc9cf7b10c7c1a04ca45272fbb4287902d0 upstream.
+
+This patch adds the AHCI-mode SATA Device IDs for the Intel Lynx Point-LP PCH
+
+Signed-off-by: James Ralston <james.d.ralston@intel.com>
+Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
+Cc: Ong Boon Leong <boon.leong.ong@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/ata/ahci.c |    8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+--- a/drivers/ata/ahci.c
++++ b/drivers/ata/ahci.c
+@@ -268,6 +268,14 @@ static const struct pci_device_id ahci_p
+       { PCI_VDEVICE(INTEL, 0x8c07), board_ahci }, /* Lynx Point RAID */
+       { PCI_VDEVICE(INTEL, 0x8c0e), board_ahci }, /* Lynx Point RAID */
+       { PCI_VDEVICE(INTEL, 0x8c0f), board_ahci }, /* Lynx Point RAID */
++      { PCI_VDEVICE(INTEL, 0x9c02), board_ahci }, /* Lynx Point-LP AHCI */
++      { PCI_VDEVICE(INTEL, 0x9c03), board_ahci }, /* Lynx Point-LP AHCI */
++      { PCI_VDEVICE(INTEL, 0x9c04), board_ahci }, /* Lynx Point-LP RAID */
++      { PCI_VDEVICE(INTEL, 0x9c05), board_ahci }, /* Lynx Point-LP RAID */
++      { PCI_VDEVICE(INTEL, 0x9c06), board_ahci }, /* Lynx Point-LP RAID */
++      { PCI_VDEVICE(INTEL, 0x9c07), board_ahci }, /* Lynx Point-LP RAID */
++      { PCI_VDEVICE(INTEL, 0x9c0e), board_ahci }, /* Lynx Point-LP RAID */
++      { PCI_VDEVICE(INTEL, 0x9c0f), board_ahci }, /* Lynx Point-LP RAID */
+ 
+       /* JMicron 360/1/3/5/6, match class to avoid IDE function */
+       { PCI_VENDOR_ID_JMICRON, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,

diff --git a/queue-3.4/ahci-ahci-mode-sata-patch-for-intel-avoton-deviceids.patch b/queue-3.4/ahci-ahci-mode-sata-patch-for-intel-avoton-deviceids.patch
new file mode 100644 (file)
index 0000000..62fc412
--- /dev/null
+++ b/queue-3.4/ahci-ahci-mode-sata-patch-for-intel-avoton-deviceids.patch
@@ -0,0 +1,45 @@
+From 29e674dd5c8e781589f09c3ee139c80f6da274e4 Mon Sep 17 00:00:00 2001
+From: Seth Heasley <seth.heasley@intel.com>
+Date: Fri, 25 Jan 2013 12:01:05 -0800
+Subject: ahci: AHCI-mode SATA patch for Intel Avoton DeviceIDs
+
+From: Seth Heasley <seth.heasley@intel.com>
+
+commit 29e674dd5c8e781589f09c3ee139c80f6da274e4 upstream.
+
+This patch adds the AHCI and RAID-mode SATA DeviceIDs for the Intel Avoton SOC.
+
+Signed-off-by: Seth Heasley <seth.heasley@intel.com>
+Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
+Cc: Ong Boon Leong <boon.leong.ong@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/ata/ahci.c |   16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+--- a/drivers/ata/ahci.c
++++ b/drivers/ata/ahci.c
+@@ -276,6 +276,22 @@ static const struct pci_device_id ahci_p
+       { PCI_VDEVICE(INTEL, 0x9c07), board_ahci }, /* Lynx Point-LP RAID */
+       { PCI_VDEVICE(INTEL, 0x9c0e), board_ahci }, /* Lynx Point-LP RAID */
+       { PCI_VDEVICE(INTEL, 0x9c0f), board_ahci }, /* Lynx Point-LP RAID */
++      { PCI_VDEVICE(INTEL, 0x1f22), board_ahci }, /* Avoton AHCI */
++      { PCI_VDEVICE(INTEL, 0x1f23), board_ahci }, /* Avoton AHCI */
++      { PCI_VDEVICE(INTEL, 0x1f24), board_ahci }, /* Avoton RAID */
++      { PCI_VDEVICE(INTEL, 0x1f25), board_ahci }, /* Avoton RAID */
++      { PCI_VDEVICE(INTEL, 0x1f26), board_ahci }, /* Avoton RAID */
++      { PCI_VDEVICE(INTEL, 0x1f27), board_ahci }, /* Avoton RAID */
++      { PCI_VDEVICE(INTEL, 0x1f2e), board_ahci }, /* Avoton RAID */
++      { PCI_VDEVICE(INTEL, 0x1f2f), board_ahci }, /* Avoton RAID */
++      { PCI_VDEVICE(INTEL, 0x1f32), board_ahci }, /* Avoton AHCI */
++      { PCI_VDEVICE(INTEL, 0x1f33), board_ahci }, /* Avoton AHCI */
++      { PCI_VDEVICE(INTEL, 0x1f34), board_ahci }, /* Avoton RAID */
++      { PCI_VDEVICE(INTEL, 0x1f35), board_ahci }, /* Avoton RAID */
++      { PCI_VDEVICE(INTEL, 0x1f36), board_ahci }, /* Avoton RAID */
++      { PCI_VDEVICE(INTEL, 0x1f37), board_ahci }, /* Avoton RAID */
++      { PCI_VDEVICE(INTEL, 0x1f3e), board_ahci }, /* Avoton RAID */
++      { PCI_VDEVICE(INTEL, 0x1f3f), board_ahci }, /* Avoton RAID */
+ 
+       /* JMicron 360/1/3/5/6, match class to avoid IDE function */
+       { PCI_VENDOR_ID_JMICRON, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,

diff --git a/queue-3.4/series b/queue-3.4/series
index 17c5c4b7bf6139a2ee958bca1d8c472f053dc3b2..8c0313670bd9d41f7f4fc974685e6dd34096a09a 100644 (file)
--- a/queue-3.4/series
+++ b/queue-3.4/series
@@ -14,3 +14,6 @@ irq-enable-all-irqs-unconditionally-in-irq_resume.patch
 net-update-consumers-of-msg_more-to-recognize-msg_sendpage_notlast.patch
 input-allow-deselecting-serio-drivers-even-without-config_expert.patch
 input-mousedev-allow-disabling-even-without-config_expert.patch
+um-add-missing-declaration-of-getrlimit-and-friends.patch
+ahci-add-device-ids-for-intel-lynx-point-lp-pch.patch
+ahci-ahci-mode-sata-patch-for-intel-avoton-deviceids.patch

diff --git a/queue-3.4/um-add-missing-declaration-of-getrlimit-and-friends.patch b/queue-3.4/um-add-missing-declaration-of-getrlimit-and-friends.patch
new file mode 100644 (file)
index 0000000..9ca0047
--- /dev/null
+++ b/queue-3.4/um-add-missing-declaration-of-getrlimit-and-friends.patch
@@ -0,0 +1,38 @@
+From fdfa4c952844fce881df8c76de9c7180cbe913ab Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Sun, 30 Dec 2012 01:37:30 +0300
+Subject: um: add missing declaration of 'getrlimit()' and friends
+
+From: Sergei Trofimovich <slyfox@gentoo.org>
+
+commit fdfa4c952844fce881df8c76de9c7180cbe913ab upstream.
+
+arch/um/os-Linux/start_up.c: In function 'check_coredump_limit':
+arch/um/os-Linux/start_up.c:338:16: error: storage size of 'lim' isn't known
+arch/um/os-Linux/start_up.c:339:2: error: implicit declaration of function 'getrlimit' [-Werror=implicit-function-declaration]
+
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+CC: Jeff Dike <jdike@addtoit.com>
+CC: Richard Weinberger <richard@nod.at>
+CC: Al Viro <viro@zeniv.linux.org.uk>
+CC: user-mode-linux-devel@lists.sourceforge.net
+CC: user-mode-linux-user@lists.sourceforge.net
+CC: linux-kernel@vger.kernel.org
+Signed-off-by: Richard Weinberger <richard@nod.at>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/um/os-Linux/start_up.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/arch/um/os-Linux/start_up.c
++++ b/arch/um/os-Linux/start_up.c
+@@ -15,6 +15,8 @@
+ #include <sys/mman.h>
+ #include <sys/stat.h>
+ #include <sys/wait.h>
++#include <sys/time.h>
++#include <sys/resource.h>
+ #include <asm/unistd.h>
+ #include "init.h"
+ #include "os.h"