]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
3.0 patches
authorGreg Kroah-Hartman <gregkh@suse.de>
Fri, 2 Dec 2011 23:27:30 +0000 (15:27 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 2 Dec 2011 23:27:30 +0000 (15:27 -0800)
added patches:
hugetlb-release-pages-in-the-error-path-of-hugetlb_cow.patch
hwmon-coretemp-fix-oops-on-driver-load.patch
revert-mfd-fix-twl4030-dependencies-for-audio-codec.patch
scsi-silencing-killing-requests-for-dead-queue.patch

queue-3.0/hugetlb-release-pages-in-the-error-path-of-hugetlb_cow.patch [new file with mode: 0644]
queue-3.0/hwmon-coretemp-fix-oops-on-driver-load.patch [new file with mode: 0644]
queue-3.0/revert-mfd-fix-twl4030-dependencies-for-audio-codec.patch [new file with mode: 0644]
queue-3.0/scsi-silencing-killing-requests-for-dead-queue.patch [new file with mode: 0644]
queue-3.0/series

diff --git a/queue-3.0/hugetlb-release-pages-in-the-error-path-of-hugetlb_cow.patch b/queue-3.0/hugetlb-release-pages-in-the-error-path-of-hugetlb_cow.patch
new file mode 100644 (file)
index 0000000..bf47c58
--- /dev/null
@@ -0,0 +1,36 @@
+From ea4039a34c4c206d015d34a49d0b00868e37db1d Mon Sep 17 00:00:00 2001
+From: Hillf Danton <dhillf@gmail.com>
+Date: Tue, 15 Nov 2011 14:36:12 -0800
+Subject: hugetlb: release pages in the error path of hugetlb_cow()
+
+From: Hillf Danton <dhillf@gmail.com>
+
+commit ea4039a34c4c206d015d34a49d0b00868e37db1d upstream.
+
+If we fail to prepare an anon_vma, the {new, old}_page should be released,
+or they will leak.
+
+Signed-off-by: Hillf Danton <dhillf@gmail.com>
+Reviewed-by: Andrea Arcangeli <aarcange@redhat.com>
+Cc: Hugh Dickins <hughd@google.com>
+Cc: Johannes Weiner <jweiner@redhat.com>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Cc: Michal Hocko <mhocko@suse.cz>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ mm/hugetlb.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/mm/hugetlb.c
++++ b/mm/hugetlb.c
+@@ -2415,6 +2415,8 @@ retry_avoidcopy:
+        * anon_vma prepared.
+        */
+       if (unlikely(anon_vma_prepare(vma))) {
++              page_cache_release(new_page);
++              page_cache_release(old_page);
+               /* Caller expects lock to be held */
+               spin_lock(&mm->page_table_lock);
+               return VM_FAULT_OOM;
diff --git a/queue-3.0/hwmon-coretemp-fix-oops-on-driver-load.patch b/queue-3.0/hwmon-coretemp-fix-oops-on-driver-load.patch
new file mode 100644 (file)
index 0000000..67a6e1a
--- /dev/null
@@ -0,0 +1,38 @@
+From khali@linux-fr.org  Fri Dec  2 15:12:55 2011
+From: Jean Delvare <khali@linux-fr.org>
+Date: Thu, 1 Dec 2011 17:21:28 +0100
+Subject: hwmon: (coretemp) Fix oops on driver load
+To: stable@kernel.org
+Cc: Guenter Roeck <guenter.roeck@ericsson.com>, Greg KH <greg@kroah.com>
+Message-ID: <20111201172128.5840e883@endymion.delvare>
+
+From: Jean Delvare <khali@linux-fr.org>
+
+This is for stable kernel branch 3.0 only. Previous and later versions
+have different code paths and are not affected by this bug.
+
+If the CPU microcode is too old, the coretemp driver won't work. But
+instead of failing gracefully, it currently oops. Check for NULL
+platform device data to avoid this.
+
+Signed-off-by: Jean Delvare <khali@linux-fr.org>
+Acked-by: Durgadoss R <durgadoss.r@intel.com>
+Acked-by: Guenter Roeck <guenter.roeck@ericsson.com>
+Cc: Fenghua Yu <fenghua.yu@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/hwmon/coretemp.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/hwmon/coretemp.c
++++ b/drivers/hwmon/coretemp.c
+@@ -539,6 +539,8 @@ static void coretemp_add_core(unsigned i
+               return;
+       pdata = platform_get_drvdata(pdev);
++      if (!pdata)
++              return;
+       err = create_core_data(pdata, pdev, cpu, pkg_flag);
+       if (err)
diff --git a/queue-3.0/revert-mfd-fix-twl4030-dependencies-for-audio-codec.patch b/queue-3.0/revert-mfd-fix-twl4030-dependencies-for-audio-codec.patch
new file mode 100644 (file)
index 0000000..8555ba3
--- /dev/null
@@ -0,0 +1,32 @@
+From foo@baz Fri Dec  2 15:14:57 PST 2011
+Date: Fri, 02 Dec 2011 15:14:57 -0800
+To: Greg KH <greg@kroah.com>
+From: Greg Kroah-Hartman <gregkh@suse.de>
+Subject: revert "mfd: Fix twl4030 dependencies for audio codec"
+
+This reverts commit 11b8fc6ae54bf18a48c94e181c37ca135b858b42, which was commit f09ee0451a44a4e913a7c3cec3805508f7de6c54 upstream.
+
+Koen Kooi <koen@dominion.thruhere.net> reports that this shouldn't have been applied to the 3.0 kernel as it isn't relevant there, only 3.1.
+
+Reported-by: Koen Kooi <koen@dominion.thruhere.net>
+Cc: Thomas Weber <weber@corscience.de>
+Cc: Peter Ujfalusi <peter.ujfalusi@ti.com>
+Cc: Samuel Ortiz <sameo@linux.intel.com>
+Cc: Jarkko Nikula <jarkko.nikula@bitmer.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/mfd/twl-core.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/mfd/twl-core.c
++++ b/drivers/mfd/twl-core.c
+@@ -109,7 +109,7 @@
+ #define twl_has_watchdog()        false
+ #endif
+-#if defined(CONFIG_MFD_TWL4030_AUDIO) || defined(CONFIG_MFD_TWL4030_AUDIO_MODULE) ||\
++#if defined(CONFIG_TWL4030_CODEC) || defined(CONFIG_TWL4030_CODEC_MODULE) ||\
+       defined(CONFIG_SND_SOC_TWL6040) || defined(CONFIG_SND_SOC_TWL6040_MODULE)
+ #define twl_has_codec()       true
+ #else
diff --git a/queue-3.0/scsi-silencing-killing-requests-for-dead-queue.patch b/queue-3.0/scsi-silencing-killing-requests-for-dead-queue.patch
new file mode 100644 (file)
index 0000000..ab55f31
--- /dev/null
@@ -0,0 +1,45 @@
+From 745718132c3c7cac98a622b610e239dcd5217f71 Mon Sep 17 00:00:00 2001
+From: Hannes Reinecke <hare@suse.de>
+Date: Wed, 9 Nov 2011 08:39:24 +0100
+Subject: SCSI: Silencing 'killing requests for dead queue'
+
+From: Hannes Reinecke <hare@suse.de>
+
+commit 745718132c3c7cac98a622b610e239dcd5217f71 upstream.
+
+When we tear down a device we try to flush all outstanding
+commands in scsi_free_queue(). However the check in
+scsi_request_fn() is imperfect as it only signals that
+we _might start_ aborting commands, not that we've actually
+aborted some.
+So move the printk inside the scsi_kill_request function,
+this will also give us a hint about which commands are aborted.
+
+Signed-off-by: Hannes Reinecke <hare@suse.de>
+Signed-off-by: James Bottomley <JBottomley@Parallels.com>
+Cc: Christoph Biedl <linux-kernel.bfrz@manchmal.in-ulm.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/scsi/scsi_lib.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/drivers/scsi/scsi_lib.c
++++ b/drivers/scsi/scsi_lib.c
+@@ -1407,6 +1407,8 @@ static void scsi_kill_request(struct req
+       blk_start_request(req);
++      scmd_printk(KERN_INFO, cmd, "killing request\n");
++
+       sdev = cmd->device;
+       starget = scsi_target(sdev);
+       shost = sdev->host;
+@@ -1488,7 +1490,6 @@ static void scsi_request_fn(struct reque
+       struct request *req;
+       if (!sdev) {
+-              printk("scsi: killing requests for dead queue\n");
+               while ((req = blk_peek_request(q)) != NULL)
+                       scsi_kill_request(req, q);
+               return;
index 9c551e962b4dff095764ee3bb25c7eea2a578ccb..f846f0fa59e183a28c34d51369da4dc6d3717d20 100644 (file)
@@ -35,3 +35,7 @@ nl80211-fix-mac-address-validation.patch
 cfg80211-fix-regulatory-null-dereference.patch
 mac80211-don-t-stop-a-single-aggregation-session-twice.patch
 mac80211-fix-race-between-the-agg-sm-and-the-tx-data-path.patch
+hwmon-coretemp-fix-oops-on-driver-load.patch
+revert-mfd-fix-twl4030-dependencies-for-audio-codec.patch
+scsi-silencing-killing-requests-for-dead-queue.patch
+hugetlb-release-pages-in-the-error-path-of-hugetlb_cow.patch