From: Greg Kroah-Hartman Date: Mon, 9 Dec 2013 18:49:56 +0000 (-0800) Subject: 3.4-stable patches X-Git-Tag: v3.4.74~13 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1839953cf2193284a2fda8a9fd238f84afd4ba0a;p=thirdparty%2Fkernel%2Fstable-queue.git 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 index 00000000000..6e0137da91a --- /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 +Date: Thu, 9 Aug 2012 09:02:31 -0700 +Subject: ahci: Add Device IDs for Intel Lynx Point-LP PCH + +From: James Ralston + +commit 77b12bc9cf7b10c7c1a04ca45272fbb4287902d0 upstream. + +This patch adds the AHCI-mode SATA Device IDs for the Intel Lynx Point-LP PCH + +Signed-off-by: James Ralston +Signed-off-by: Jeff Garzik +Cc: Ong Boon Leong +Signed-off-by: Greg Kroah-Hartman + +--- + 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 index 00000000000..62fc41217b6 --- /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 +Date: Fri, 25 Jan 2013 12:01:05 -0800 +Subject: ahci: AHCI-mode SATA patch for Intel Avoton DeviceIDs + +From: Seth Heasley + +commit 29e674dd5c8e781589f09c3ee139c80f6da274e4 upstream. + +This patch adds the AHCI and RAID-mode SATA DeviceIDs for the Intel Avoton SOC. + +Signed-off-by: Seth Heasley +Signed-off-by: Jeff Garzik +Cc: Ong Boon Leong +Signed-off-by: Greg Kroah-Hartman + +--- + 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 17c5c4b7bf6..8c0313670bd 100644 --- 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 index 00000000000..9ca0047be84 --- /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 +Date: Sun, 30 Dec 2012 01:37:30 +0300 +Subject: um: add missing declaration of 'getrlimit()' and friends + +From: Sergei Trofimovich + +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 +CC: Jeff Dike +CC: Richard Weinberger +CC: Al Viro +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 +Signed-off-by: Greg Kroah-Hartman + +--- + 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 + #include + #include ++#include ++#include + #include + #include "init.h" + #include "os.h"