--- /dev/null
+From b25bfda38236f349cde0d1b28952f4eea2148d3f Mon Sep 17 00:00:00 2001
+From: Mohammed Shafi Shajakhan <mohammed@qca.qualcomm.com>
+Date: Mon, 26 Dec 2011 10:42:15 +0530
+Subject: ath9k: Fix kernel panic in AR2427 in AP mode
+
+From: Mohammed Shafi Shajakhan <mohammed@qca.qualcomm.com>
+
+commit b25bfda38236f349cde0d1b28952f4eea2148d3f upstream.
+
+don't do aggregation related stuff for 'AP mode client power save
+handling' if aggregation is not enabled in the driver, otherwise it
+will lead to panic because those data structures won't be never
+intialized in 'ath_tx_node_init' if aggregation is disabled
+
+ EIP is at ath_tx_aggr_wakeup+0x37/0x80 [ath9k]
+ EAX: e8c09a20 EBX: f2a304e8 ECX: 00000001 EDX: 00000000
+ ESI: e8c085e0 EDI: f2a304ac EBP: f40e1ca4 ESP: f40e1c8c
+ DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068
+ Process swapper/1 (pid: 0, ti=f40e0000 task=f408e860
+ task.ti=f40dc000)
+ Stack:
+ 0001e966 e8c09a20 00000000 f2a304ac e8c085e0 f2a304ac
+ f40e1cb0 f8186741
+ f8186700 f40e1d2c f922988d f2a304ac 00000202 00000001
+ c0b4ba43 00000000
+ 0000000f e8eb75c0 e8c085e0 205b0001 34383220 f2a304ac
+ f2a30000 00010020
+ Call Trace:
+ [<f8186741>] ath9k_sta_notify+0x41/0x50 [ath9k]
+ [<f8186700>] ? ath9k_get_survey+0x110/0x110 [ath9k]
+ [<f922988d>] ieee80211_sta_ps_deliver_wakeup+0x9d/0x350
+ [mac80211]
+ [<c018dc75>] ? __module_address+0x95/0xb0
+ [<f92465b3>] ap_sta_ps_end+0x63/0xa0 [mac80211]
+ [<f9246746>] ieee80211_rx_h_sta_process+0x156/0x2b0
+ [mac80211]
+ [<f9247d1e>] ieee80211_rx_handlers+0xce/0x510 [mac80211]
+ [<c018440b>] ? trace_hardirqs_on+0xb/0x10
+ [<c056936e>] ? skb_queue_tail+0x3e/0x50
+ [<f9248271>] ieee80211_prepare_and_rx_handle+0x111/0x750
+ [mac80211]
+ [<f9248bf9>] ieee80211_rx+0x349/0xb20 [mac80211]
+ [<f9248949>] ? ieee80211_rx+0x99/0xb20 [mac80211]
+ [<f818b0b8>] ath_rx_tasklet+0x818/0x1d00 [ath9k]
+ [<f8187a75>] ? ath9k_tasklet+0x35/0x1c0 [ath9k]
+ [<f8187a75>] ? ath9k_tasklet+0x35/0x1c0 [ath9k]
+ [<f8187b33>] ath9k_tasklet+0xf3/0x1c0 [ath9k]
+ [<c0151b7e>] tasklet_action+0xbe/0x180
+
+Cc: Senthil Balasubramanian <senthilb@qca.qualcomm.com>
+Cc: Rajkumar Manoharan <rmanohar@qca.qualcomm.com>
+Reported-by: Ashwin Mendonca <ashwinloyal@gmail.com>
+Tested-by: Ashwin Mendonca <ashwinloyal@gmail.com>
+Signed-off-by: Mohammed Shafi Shajakhan <mohammed@qca.qualcomm.com>
+Signed-off-by: John W. Linville <linville@tuxdriver.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/net/wireless/ath/ath9k/main.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/drivers/net/wireless/ath/ath9k/main.c
++++ b/drivers/net/wireless/ath/ath9k/main.c
+@@ -1828,6 +1828,9 @@ static void ath9k_sta_notify(struct ieee
+ struct ath_softc *sc = hw->priv;
+ struct ath_node *an = (struct ath_node *) sta->drv_priv;
+
++ if (!(sc->sc_flags & SC_OP_TXAGGR))
++ return;
++
+ switch (cmd) {
+ case STA_NOTIFY_SLEEP:
+ an->sleeping = true;
--- /dev/null
+From 4376eee92e5a8332b470040e672ea99cd44c826a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Alexander=20M=C3=BCller?= <serveralex@gmail.com>
+Date: Fri, 30 Dec 2011 12:55:48 -0500
+Subject: drm/radeon/kms/atom: fix possible segfault in pm setup
+
+From: =?UTF-8?q?Alexander=20M=C3=BCller?= <serveralex@gmail.com>
+
+commit 4376eee92e5a8332b470040e672ea99cd44c826a upstream.
+
+If we end up with no power states, don't look up
+current vddc.
+
+fixes:
+https://bugs.freedesktop.org/show_bug.cgi?id=44130
+
+agd5f: fix patch formatting
+
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Dave Airlie <airlied@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/gpu/drm/radeon/radeon_atombios.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/radeon/radeon_atombios.c
++++ b/drivers/gpu/drm/radeon/radeon_atombios.c
+@@ -2568,7 +2568,11 @@ void radeon_atombios_get_power_modes(str
+
+ rdev->pm.current_power_state_index = rdev->pm.default_power_state_index;
+ rdev->pm.current_clock_mode_index = 0;
+- rdev->pm.current_vddc = rdev->pm.power_state[rdev->pm.default_power_state_index].clock_info[0].voltage.voltage;
++ if (rdev->pm.default_power_state_index >= 0)
++ rdev->pm.current_vddc =
++ rdev->pm.power_state[rdev->pm.default_power_state_index].clock_info[0].voltage.voltage;
++ else
++ rdev->pm.current_vddc = 0;
+ }
+
+ void radeon_atom_set_clock_gating(struct radeon_device *rdev, int enable)
--- /dev/null
+From f9fab10bbd768b0e5254e53a4a8477a94bfc4b96 Mon Sep 17 00:00:00 2001
+From: Mandeep Singh Baines <msb@chromium.org>
+Date: Tue, 3 Jan 2012 14:41:13 -0800
+Subject: hung_task: fix false positive during vfork
+
+From: Mandeep Singh Baines <msb@chromium.org>
+
+commit f9fab10bbd768b0e5254e53a4a8477a94bfc4b96 upstream.
+
+vfork parent uninterruptibly and unkillably waits for its child to
+exec/exit. This wait is of unbounded length. Ignore such waits
+in the hung_task detector.
+
+Signed-off-by: Mandeep Singh Baines <msb@chromium.org>
+Reported-by: Sasha Levin <levinsasha928@gmail.com>
+LKML-Reference: <1325344394.28904.43.camel@lappy>
+Cc: Linus Torvalds <torvalds@linux-foundation.org>
+Cc: Ingo Molnar <mingo@elte.hu>
+Cc: Peter Zijlstra <peterz@infradead.org>
+Cc: Andrew Morton <akpm@linux-foundation.org>
+Cc: John Kacur <jkacur@redhat.com>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ kernel/hung_task.c | 14 ++++++++++----
+ 1 file changed, 10 insertions(+), 4 deletions(-)
+
+--- a/kernel/hung_task.c
++++ b/kernel/hung_task.c
+@@ -74,11 +74,17 @@ static void check_hung_task(struct task_
+
+ /*
+ * Ensure the task is not frozen.
+- * Also, when a freshly created task is scheduled once, changes
+- * its state to TASK_UNINTERRUPTIBLE without having ever been
+- * switched out once, it musn't be checked.
++ * Also, skip vfork and any other user process that freezer should skip.
+ */
+- if (unlikely(t->flags & PF_FROZEN || !switch_count))
++ if (unlikely(t->flags & (PF_FROZEN | PF_FREEZER_SKIP)))
++ return;
++
++ /*
++ * When a freshly created task is scheduled once, changes its state to
++ * TASK_UNINTERRUPTIBLE without having ever been switched out once, it
++ * musn't be checked.
++ */
++ if (unlikely(!switch_count))
+ return;
+
+ if (switch_count != t->last_switch_count) {
+++ /dev/null
-From davem@davemloft.net Tue Jan 3 12:06:53 2012
-From: David Miller <davem@davemloft.net>
-Date: Mon, 26 Dec 2011 14:59:20 -0500 (EST)
-Subject: mpt2sas crashes on shutdown
-To: stable@vger.kernel.org
-Cc: linux-scsi@vger.kernel.org, nagalakshmi.nandigama@lsi.com
-Message-ID: <20111226.145920.1088076837634135764.davem@davemloft.net>
-
-From: David Miller <davem@davemloft.net>
-
-[Fixed differently in 3.2]
-
-The mpt2sas driver accesses I/O space as virtual addresses when
-saving and restoring the MSIX table, this only works by luck on x86.
-
-One needs to use the appropriate {read,write}{b,w,l}() APIs.
-
-This is fixed in v3.2.x because all of this code got rewritten for
-NUMA I/O support.
-
-But both 3.0.x and 3.1.x still have this bug, and my Niagara sparc
-machines crash on shutdown every single time due to this bug making my
--stable work more difficult than it needs to be.
-
-
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Cc: Eric Moore <Eric.Moore@lsi.com>
-Cc: Nagalakshmi Nandigama <nagalakshmi.nandigama@lsi.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/scsi/mpt2sas/mpt2sas_base.c | 6 +++---
- drivers/scsi/mpt2sas/mpt2sas_base.h | 2 +-
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
---- a/drivers/scsi/mpt2sas/mpt2sas_base.c
-+++ b/drivers/scsi/mpt2sas/mpt2sas_base.c
-@@ -1096,7 +1096,7 @@ _base_save_msix_table(struct MPT2SAS_ADA
- return;
-
- for (i = 0; i < ioc->msix_vector_count; i++)
-- ioc->msix_table_backup[i] = ioc->msix_table[i];
-+ ioc->msix_table_backup[i] = readl(&ioc->msix_table[i]);
- }
-
- /**
-@@ -1113,7 +1113,7 @@ _base_restore_msix_table(struct MPT2SAS_
- return;
-
- for (i = 0; i < ioc->msix_vector_count; i++)
-- ioc->msix_table[i] = ioc->msix_table_backup[i];
-+ writel(ioc->msix_table_backup[i], &ioc->msix_table[i]);
- }
-
- /**
-@@ -1144,7 +1144,7 @@ _base_check_enable_msix(struct MPT2SAS_A
- /* get msix table */
- pci_read_config_dword(ioc->pdev, base + 4, &msix_table_offset);
- msix_table_offset &= 0xFFFFFFF8;
-- ioc->msix_table = (u32 *)((void *)ioc->chip + msix_table_offset);
-+ ioc->msix_table = ((void __iomem *)ioc->chip + msix_table_offset);
-
- dinitprintk(ioc, printk(MPT2SAS_INFO_FMT "msix is supported, "
- "vector_count(%d), table_offset(0x%08x), table(%p)\n", ioc->name,
---- a/drivers/scsi/mpt2sas/mpt2sas_base.h
-+++ b/drivers/scsi/mpt2sas/mpt2sas_base.h
-@@ -768,7 +768,7 @@ struct MPT2SAS_ADAPTER {
-
- u8 msix_enable;
- u16 msix_vector_count;
-- u32 *msix_table;
-+ u32 __iomem *msix_table;
- u32 *msix_table_backup;
- u32 ioc_reset_count;
-
--- /dev/null
+From James.Bottomley@HansenPartnership.com Thu Jan 5 10:58:15 2012
+From: James Bottomley <James.Bottomley@HansenPartnership.com>
+Date: Wed, 04 Jan 2012 09:25:13 -0600
+Subject: mpt2sas: fix non-x86 crash on shutdown
+To: "Nandigama, Nagalakshmi" <Nagalakshmi.Nandigama@lsi.com>, "stable@vger.kernel.org" <stable@vger.kernel.org>
+Cc: Greg KH <gregkh@suse.de>, "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>, "torvalds@linux-foundation.org" <torvalds@linux-foundation.org>, "akpm@linux-foundation.org" <akpm@linux-foundation.org>, "alan@lxorguk.ukuu.org.uk" <alan@lxorguk.ukuu.org.uk>, "linux-scsi@vger.kernel.org" <linux-scsi@vger.kernel.org>, "David S. Miller" <davem@davemloft.net>, "Moore, Eric" <Eric.Moore@lsi.com>
+Message-ID: <1325690713.2758.13.camel@dabdike.int.hansenpartnership.com>
+
+
+From: Nagalakshmi Nandigama <nagalakshmi.nandigama@lsi.com>
+
+Upstrem commit: 911ae9434f83e7355d343f6c2be3ef5b00ea7aed
+
+There's a bug in the MSIX backup and restore routines that cause a crash on
+non-x86 (direct access to PCI space not via read/write). These routines are
+unnecessary and were removed by the above commit, so also remove them from
+stable to fix the crash.
+
+Signed-off-by: Nagalakshmi Nandigama <nagalakshmi.nandigama@lsi.com>
+Signed-off-by: James Bottomley <JBottomley@Parallels.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/scsi/mpt2sas/mpt2sas_base.c | 59 +-----------------------------------
+ drivers/scsi/mpt2sas/mpt2sas_base.h | 4 --
+ 2 files changed, 2 insertions(+), 61 deletions(-)
+
+--- a/drivers/scsi/mpt2sas/mpt2sas_base.c
++++ b/drivers/scsi/mpt2sas/mpt2sas_base.c
+@@ -1082,41 +1082,6 @@ _base_config_dma_addressing(struct MPT2S
+ }
+
+ /**
+- * _base_save_msix_table - backup msix vector table
+- * @ioc: per adapter object
+- *
+- * This address an errata where diag reset clears out the table
+- */
+-static void
+-_base_save_msix_table(struct MPT2SAS_ADAPTER *ioc)
+-{
+- int i;
+-
+- if (!ioc->msix_enable || ioc->msix_table_backup == NULL)
+- return;
+-
+- for (i = 0; i < ioc->msix_vector_count; i++)
+- ioc->msix_table_backup[i] = ioc->msix_table[i];
+-}
+-
+-/**
+- * _base_restore_msix_table - this restores the msix vector table
+- * @ioc: per adapter object
+- *
+- */
+-static void
+-_base_restore_msix_table(struct MPT2SAS_ADAPTER *ioc)
+-{
+- int i;
+-
+- if (!ioc->msix_enable || ioc->msix_table_backup == NULL)
+- return;
+-
+- for (i = 0; i < ioc->msix_vector_count; i++)
+- ioc->msix_table[i] = ioc->msix_table_backup[i];
+-}
+-
+-/**
+ * _base_check_enable_msix - checks MSIX capabable.
+ * @ioc: per adapter object
+ *
+@@ -1128,7 +1093,7 @@ _base_check_enable_msix(struct MPT2SAS_A
+ {
+ int base;
+ u16 message_control;
+- u32 msix_table_offset;
++
+
+ base = pci_find_capability(ioc->pdev, PCI_CAP_ID_MSIX);
+ if (!base) {
+@@ -1141,14 +1106,8 @@ _base_check_enable_msix(struct MPT2SAS_A
+ pci_read_config_word(ioc->pdev, base + 2, &message_control);
+ ioc->msix_vector_count = (message_control & 0x3FF) + 1;
+
+- /* get msix table */
+- pci_read_config_dword(ioc->pdev, base + 4, &msix_table_offset);
+- msix_table_offset &= 0xFFFFFFF8;
+- ioc->msix_table = (u32 *)((void *)ioc->chip + msix_table_offset);
+-
+ dinitprintk(ioc, printk(MPT2SAS_INFO_FMT "msix is supported, "
+- "vector_count(%d), table_offset(0x%08x), table(%p)\n", ioc->name,
+- ioc->msix_vector_count, msix_table_offset, ioc->msix_table));
++ "vector_count(%d)\n", ioc->name, ioc->msix_vector_count));
+ return 0;
+ }
+
+@@ -1162,8 +1121,6 @@ _base_disable_msix(struct MPT2SAS_ADAPTE
+ {
+ if (ioc->msix_enable) {
+ pci_disable_msix(ioc->pdev);
+- kfree(ioc->msix_table_backup);
+- ioc->msix_table_backup = NULL;
+ ioc->msix_enable = 0;
+ }
+ }
+@@ -1189,14 +1146,6 @@ _base_enable_msix(struct MPT2SAS_ADAPTER
+ if (_base_check_enable_msix(ioc) != 0)
+ goto try_ioapic;
+
+- ioc->msix_table_backup = kcalloc(ioc->msix_vector_count,
+- sizeof(u32), GFP_KERNEL);
+- if (!ioc->msix_table_backup) {
+- dfailprintk(ioc, printk(MPT2SAS_INFO_FMT "allocation for "
+- "msix_table_backup failed!!!\n", ioc->name));
+- goto try_ioapic;
+- }
+-
+ memset(&entries, 0, sizeof(struct msix_entry));
+ r = pci_enable_msix(ioc->pdev, &entries, 1);
+ if (r) {
+@@ -3513,9 +3462,6 @@ _base_diag_reset(struct MPT2SAS_ADAPTER
+ u32 hcb_size;
+
+ printk(MPT2SAS_INFO_FMT "sending diag reset !!\n", ioc->name);
+-
+- _base_save_msix_table(ioc);
+-
+ drsprintk(ioc, printk(MPT2SAS_INFO_FMT "clear interrupts\n",
+ ioc->name));
+
+@@ -3611,7 +3557,6 @@ _base_diag_reset(struct MPT2SAS_ADAPTER
+ goto out;
+ }
+
+- _base_restore_msix_table(ioc);
+ printk(MPT2SAS_INFO_FMT "diag reset: SUCCESS\n", ioc->name);
+ return 0;
+
+--- a/drivers/scsi/mpt2sas/mpt2sas_base.h
++++ b/drivers/scsi/mpt2sas/mpt2sas_base.h
+@@ -626,8 +626,6 @@ struct mpt2sas_port_facts {
+ * @wait_for_port_enable_to_complete:
+ * @msix_enable: flag indicating msix is enabled
+ * @msix_vector_count: number msix vectors
+- * @msix_table: virt address to the msix table
+- * @msix_table_backup: backup msix table
+ * @scsi_io_cb_idx: shost generated commands
+ * @tm_cb_idx: task management commands
+ * @scsih_cb_idx: scsih internal commands
+@@ -768,8 +766,6 @@ struct MPT2SAS_ADAPTER {
+
+ u8 msix_enable;
+ u16 msix_vector_count;
+- u32 *msix_table;
+- u32 *msix_table_backup;
+ u32 ioc_reset_count;
+
+ /* internal commands, callback index */
--- /dev/null
+From 50b8d257486a45cba7b65ca978986ed216bbcc10 Mon Sep 17 00:00:00 2001
+From: Oleg Nesterov <oleg@redhat.com>
+Date: Wed, 4 Jan 2012 17:29:02 +0100
+Subject: ptrace: partially fix the do_wait(WEXITED) vs EXIT_DEAD->EXIT_ZOMBIE race
+
+From: Oleg Nesterov <oleg@redhat.com>
+
+commit 50b8d257486a45cba7b65ca978986ed216bbcc10 upstream.
+
+Test-case:
+
+ int main(void)
+ {
+ int pid, status;
+
+ pid = fork();
+ if (!pid) {
+ for (;;) {
+ if (!fork())
+ return 0;
+ if (waitpid(-1, &status, 0) < 0) {
+ printf("ERR!! wait: %m\n");
+ return 0;
+ }
+ }
+ }
+
+ assert(ptrace(PTRACE_ATTACH, pid, 0,0) == 0);
+ assert(waitpid(-1, NULL, 0) == pid);
+
+ assert(ptrace(PTRACE_SETOPTIONS, pid, 0,
+ PTRACE_O_TRACEFORK) == 0);
+
+ do {
+ ptrace(PTRACE_CONT, pid, 0, 0);
+ pid = waitpid(-1, NULL, 0);
+ } while (pid > 0);
+
+ return 1;
+ }
+
+It fails because ->real_parent sees its child in EXIT_DEAD state
+while the tracer is going to change the state back to EXIT_ZOMBIE
+in wait_task_zombie().
+
+The offending commit is 823b018e which moved the EXIT_DEAD check,
+but in fact we should not blame it. The original code was not
+correct as well because it didn't take ptrace_reparented() into
+account and because we can't really trust ->ptrace.
+
+This patch adds the additional check to close this particular
+race but it doesn't solve the whole problem. We simply can't
+rely on ->ptrace in this case, it can be cleared if the tracer
+is multithreaded by the exiting ->parent.
+
+I think we should kill EXIT_DEAD altogether, we should always
+remove the soon-to-be-reaped child from ->children or at least
+we should never do the DEAD->ZOMBIE transition. But this is too
+complex for 3.2.
+
+Reported-and-tested-by: Denys Vlasenko <vda.linux@googlemail.com>
+Tested-by: Lukasz Michalik <lmi@ift.uni.wroc.pl>
+Acked-by: Tejun Heo <tj@kernel.org>
+Signed-off-by: Oleg Nesterov <oleg@redhat.com>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ kernel/exit.c | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+--- a/kernel/exit.c
++++ b/kernel/exit.c
+@@ -1553,8 +1553,15 @@ static int wait_consider_task(struct wai
+ }
+
+ /* dead body doesn't have much to contribute */
+- if (p->exit_state == EXIT_DEAD)
++ if (unlikely(p->exit_state == EXIT_DEAD)) {
++ /*
++ * But do not ignore this task until the tracer does
++ * wait_task_zombie()->do_notify_parent().
++ */
++ if (likely(!ptrace) && unlikely(ptrace_reparented(p)))
++ wo->notask_error = 0;
+ return 0;
++ }
+
+ /* slay zombie? */
+ if (p->exit_state == EXIT_ZOMBIE) {
--- /dev/null
+From 157e8bf8b4823bfcdefa6c1548002374b61f61df Mon Sep 17 00:00:00 2001
+From: Linus Torvalds <torvalds@linux-foundation.org>
+Date: Tue, 3 Jan 2012 17:32:13 -0800
+Subject: Revert "rtc: Disable the alarm in the hardware"
+
+From: Linus Torvalds <torvalds@linux-foundation.org>
+
+commit 157e8bf8b4823bfcdefa6c1548002374b61f61df upstream.
+
+This reverts commit c0afabd3d553c521e003779c127143ffde55a16f.
+
+It causes failures on Toshiba laptops - instead of disabling the alarm,
+it actually seems to enable it on the affected laptops, resulting in
+(for example) the laptop powering on automatically five minutes after
+shutdown.
+
+There's a patch for it that appears to work for at least some people,
+but it's too late to play around with this, so revert for now and try
+again in the next merge window.
+
+See for example
+
+ http://bugs.debian.org/652869
+
+Reported-and-bisected-by: Andreas Friedrich <afrie@gmx.net> (Toshiba Tecra)
+Reported-by: Antonio-M. Corbi Bellot <antonio.corbi@ua.es> (Toshiba Portege R500)
+Reported-by: Marco Santos <marco.santos@waynext.com> (Toshiba Portege Z830)
+Reported-by: Christophe Vu-Brugier <cvubrugier@yahoo.fr> (Toshiba Portege R830)
+Cc: Jonathan Nieder <jrnieder@gmail.com>
+Requested-by: John Stultz <john.stultz@linaro.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/rtc/interface.c | 44 ++++++++++----------------------------------
+ 1 file changed, 10 insertions(+), 34 deletions(-)
+
+--- a/drivers/rtc/interface.c
++++ b/drivers/rtc/interface.c
+@@ -318,20 +318,6 @@ int rtc_read_alarm(struct rtc_device *rt
+ }
+ EXPORT_SYMBOL_GPL(rtc_read_alarm);
+
+-static int ___rtc_set_alarm(struct rtc_device *rtc, struct rtc_wkalrm *alarm)
+-{
+- int err;
+-
+- if (!rtc->ops)
+- err = -ENODEV;
+- else if (!rtc->ops->set_alarm)
+- err = -EINVAL;
+- else
+- err = rtc->ops->set_alarm(rtc->dev.parent, alarm);
+-
+- return err;
+-}
+-
+ static int __rtc_set_alarm(struct rtc_device *rtc, struct rtc_wkalrm *alarm)
+ {
+ struct rtc_time tm;
+@@ -355,7 +341,14 @@ static int __rtc_set_alarm(struct rtc_de
+ * over right here, before we set the alarm.
+ */
+
+- return ___rtc_set_alarm(rtc, alarm);
++ if (!rtc->ops)
++ err = -ENODEV;
++ else if (!rtc->ops->set_alarm)
++ err = -EINVAL;
++ else
++ err = rtc->ops->set_alarm(rtc->dev.parent, alarm);
++
++ return err;
+ }
+
+ int rtc_set_alarm(struct rtc_device *rtc, struct rtc_wkalrm *alarm)
+@@ -769,20 +762,6 @@ static int rtc_timer_enqueue(struct rtc_
+ return 0;
+ }
+
+-static void rtc_alarm_disable(struct rtc_device *rtc)
+-{
+- struct rtc_wkalrm alarm;
+- struct rtc_time tm;
+-
+- __rtc_read_time(rtc, &tm);
+-
+- alarm.time = rtc_ktime_to_tm(ktime_add(rtc_tm_to_ktime(tm),
+- ktime_set(300, 0)));
+- alarm.enabled = 0;
+-
+- ___rtc_set_alarm(rtc, &alarm);
+-}
+-
+ /**
+ * rtc_timer_remove - Removes a rtc_timer from the rtc_device timerqueue
+ * @rtc rtc device
+@@ -804,10 +783,8 @@ static void rtc_timer_remove(struct rtc_
+ struct rtc_wkalrm alarm;
+ int err;
+ next = timerqueue_getnext(&rtc->timerqueue);
+- if (!next) {
+- rtc_alarm_disable(rtc);
++ if (!next)
+ return;
+- }
+ alarm.time = rtc_ktime_to_tm(next->expires);
+ alarm.enabled = 1;
+ err = __rtc_set_alarm(rtc, &alarm);
+@@ -869,8 +846,7 @@ again:
+ err = __rtc_set_alarm(rtc, &alarm);
+ if (err == -ETIME)
+ goto again;
+- } else
+- rtc_alarm_disable(rtc);
++ }
+
+ mutex_unlock(&rtc->ops_lock);
+ }
watchdog-hpwdt-changes-to-handle-nx-secure-bit-in-32bit-path.patch
drm-radeon-kms-bail-on-btc-parts-if-mc-ucode-is-missing.patch
mm-hugetlb-fix-non-atomic-enqueue-of-huge-page.patch
-mpt2sas-crashes-on-shutdown.patch
+mpt2sas-fix-non-x86-crash-on-shutdown.patch
sparc64-fix-msiq-hv-call-ordering-in-pci_sun4v_msiq_build_irq.patch
sparc32-be-less-strict-in-matching-lo-part-of-relocation.patch
sparc64-patch-sun4v-code-sequences-properly-on-module-load.patch
mfd-check-for-twl4030-madc-null-pointer.patch
mfd-turn-on-the-twl4030-madc-madc-clock.patch
xen-swiotlb-use-page-alignment-for-early-buffer-allocation.patch
+xfs-fix-kupdate
+xfs-fix-sync
+drm-radeon-kms-atom-fix-possible-segfault-in-pm-setup.patch
+hung_task-fix-false-positive-during-vfork.patch
+revert-rtc-disable-the-alarm-in-the-hardware.patch
+ptrace-partially-fix-the-do_wait-wexited-vs-exit_dead-exit_zombie-race.patch
+ath9k-fix-kernel-panic-in-ar2427-in-ap-mode.patch
--- /dev/null
+From hch@infradead.org Thu Jan 5 10:59:19 2012
+From: Christoph Hellwig <hch@infradead.org>
+Date: Wed, 04 Jan 2012 09:48:35 -0500
+Subject: xfs: log the inode in ->write_inode calls for kupdate
+To: stable@vger.kernel.org, xfs@oss.sgi.com
+Cc: Ben Myers <bpm@sgi.com>
+Message-ID: <20120104144934.040072910@bombadil.infradead.org>
+Content-Disposition: inline; filename=xfs-fix-kupdate
+
+From: Christoph Hellwig <hch@infradead.org>
+
+Commit 0b8fd3033c308e4088760aa1d38ce77197b4e074 upstream.
+
+If the writeback code writes back an inode because it has expired we currently
+use the non-blockin ->write_inode path. This means any inode that is pinned
+is skipped. With delayed logging and a workload that has very little log
+traffic otherwise it is very likely that an inode that gets constantly
+written to is always pinned, and thus we keep refusing to write it. The VM
+writeback code at that point redirties it and doesn't try to write it again
+for another 30 seconds. This means under certain scenarious time based
+metadata writeback never happens.
+
+Fix this by calling into xfs_log_inode for kupdate in addition to data
+integrity syncs, and thus transfer the inode to the log ASAP.
+
+Signed-off-by: Christoph Hellwig <hch@lst.de>
+Reviewed-by: Dave Chinner <dchinner@redhat.com>
+Tested-by: Mark Tinguely <tinguely@sgi.com>
+Reviewed-by: Mark Tinguely <tinguely@sgi.com>
+Signed-off-by: Ben Myers <bpm@sgi.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ fs/xfs/linux-2.6/xfs_super.c | 30 +++++-------------------------
+ 1 file changed, 5 insertions(+), 25 deletions(-)
+
+--- a/fs/xfs/linux-2.6/xfs_super.c
++++ b/fs/xfs/linux-2.6/xfs_super.c
+@@ -871,27 +871,6 @@ xfs_fs_dirty_inode(
+ }
+
+ STATIC int
+-xfs_log_inode(
+- struct xfs_inode *ip)
+-{
+- struct xfs_mount *mp = ip->i_mount;
+- struct xfs_trans *tp;
+- int error;
+-
+- tp = xfs_trans_alloc(mp, XFS_TRANS_FSYNC_TS);
+- error = xfs_trans_reserve(tp, 0, XFS_FSYNC_TS_LOG_RES(mp), 0, 0, 0);
+- if (error) {
+- xfs_trans_cancel(tp, 0);
+- return error;
+- }
+-
+- xfs_ilock(ip, XFS_ILOCK_EXCL);
+- xfs_trans_ijoin_ref(tp, ip, XFS_ILOCK_EXCL);
+- xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);
+- return xfs_trans_commit(tp, 0);
+-}
+-
+-STATIC int
+ xfs_fs_write_inode(
+ struct inode *inode,
+ struct writeback_control *wbc)
+@@ -904,10 +883,8 @@ xfs_fs_write_inode(
+
+ if (XFS_FORCED_SHUTDOWN(mp))
+ return -XFS_ERROR(EIO);
+- if (!ip->i_update_core)
+- return 0;
+
+- if (wbc->sync_mode == WB_SYNC_ALL) {
++ if (wbc->sync_mode == WB_SYNC_ALL || wbc->for_kupdate) {
+ /*
+ * Make sure the inode has made it it into the log. Instead
+ * of forcing it all the way to stable storage using a
+@@ -916,11 +893,14 @@ xfs_fs_write_inode(
+ * of synchronous log foces dramatically.
+ */
+ xfs_ioend_wait(ip);
+- error = xfs_log_inode(ip);
++ error = xfs_log_dirty_inode(ip, NULL, 0);
+ if (error)
+ goto out;
+ return 0;
+ } else {
++ if (!ip->i_update_core)
++ return 0;
++
+ /*
+ * We make this non-blocking if the inode is contended, return
+ * EAGAIN to indicate to the caller that they did not succeed.
--- /dev/null
+From hch@infradead.org Thu Jan 5 10:59:42 2012
+From: Christoph Hellwig <hch@infradead.org>
+Date: Wed, 04 Jan 2012 09:48:36 -0500
+Subject: xfs: log all dirty inodes in xfs_fs_sync_fs
+To: stable@vger.kernel.org, xfs@oss.sgi.com
+Cc: Ben Myers <bpm@sgi.com>
+Message-ID: <20120104144934.435560100@bombadil.infradead.org>
+Content-Disposition: inline; filename=xfs-fix-sync
+
+
+From: Christoph Hellwig <hch@infradead.org>
+
+Commit be4f1ac828776bbc7868a68b465cd8eedb733cfd upstream.
+
+Since Linux 2.6.36 the writeback code has introduces various measures for
+live lock prevention during sync(). Unfortunately some of these are
+actively harmful for the XFS model, where the inode gets marked dirty for
+metadata from the data I/O handler.
+
+The older_than_this checks that are now more strictly enforced since
+
+ writeback: avoid livelocking WB_SYNC_ALL writeback
+
+by only calling into __writeback_inodes_sb and thus only sampling the
+current cut off time once. But on a slow enough devices the previous
+asynchronous sync pass might not have fully completed yet, and thus XFS
+might mark metadata dirty only after that sampling of the cut off time for
+the blocking pass already happened. I have not myself reproduced this
+myself on a real system, but by introducing artificial delay into the
+XFS I/O completion workqueues it can be reproduced easily.
+
+Fix this by iterating over all XFS inodes in ->sync_fs and log all that
+are dirty. This might log inode that only got redirtied after the
+previous pass, but given how cheap delayed logging of inodes is it
+isn't a major concern for performance.
+
+Signed-off-by: Christoph Hellwig <hch@lst.de>
+Reviewed-by: Dave Chinner <dchinner@redhat.com>
+Tested-by: Mark Tinguely <tinguely@sgi.com>
+Reviewed-by: Mark Tinguely <tinguely@sgi.com>
+Signed-off-by: Ben Myers <bpm@sgi.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ fs/xfs/linux-2.6/xfs_sync.c | 37 +++++++++++++++++++++++++++++++++++++
+ fs/xfs/linux-2.6/xfs_sync.h | 2 ++
+ 2 files changed, 39 insertions(+)
+
+--- a/fs/xfs/linux-2.6/xfs_sync.c
++++ b/fs/xfs/linux-2.6/xfs_sync.c
+@@ -336,6 +336,32 @@ xfs_sync_fsdata(
+ return xfs_bwrite(mp, bp);
+ }
+
++int
++xfs_log_dirty_inode(
++ struct xfs_inode *ip,
++ struct xfs_perag *pag,
++ int flags)
++{
++ struct xfs_mount *mp = ip->i_mount;
++ struct xfs_trans *tp;
++ int error;
++
++ if (!ip->i_update_core)
++ return 0;
++
++ tp = xfs_trans_alloc(mp, XFS_TRANS_FSYNC_TS);
++ error = xfs_trans_reserve(tp, 0, XFS_FSYNC_TS_LOG_RES(mp), 0, 0, 0);
++ if (error) {
++ xfs_trans_cancel(tp, 0);
++ return error;
++ }
++
++ xfs_ilock(ip, XFS_ILOCK_EXCL);
++ xfs_trans_ijoin_ref(tp, ip, XFS_ILOCK_EXCL);
++ xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);
++ return xfs_trans_commit(tp, 0);
++}
++
+ /*
+ * When remounting a filesystem read-only or freezing the filesystem, we have
+ * two phases to execute. This first phase is syncing the data before we
+@@ -365,6 +391,17 @@ xfs_quiesce_data(
+
+ /* push and block till complete */
+ xfs_sync_data(mp, SYNC_WAIT);
++
++ /*
++ * Log all pending size and timestamp updates. The vfs writeback
++ * code is supposed to do this, but due to its overagressive
++ * livelock detection it will skip inodes where appending writes
++ * were written out in the first non-blocking sync phase if their
++ * completion took long enough that it happened after taking the
++ * timestamp for the cut-off in the blocking phase.
++ */
++ xfs_inode_ag_iterator(mp, xfs_log_dirty_inode, 0);
++
+ xfs_qm_sync(mp, SYNC_WAIT);
+
+ /* write superblock and hoover up shutdown errors */
+--- a/fs/xfs/linux-2.6/xfs_sync.h
++++ b/fs/xfs/linux-2.6/xfs_sync.h
+@@ -42,6 +42,8 @@ void xfs_quiesce_attr(struct xfs_mount *
+
+ void xfs_flush_inodes(struct xfs_inode *ip);
+
++int xfs_log_dirty_inode(struct xfs_inode *ip, struct xfs_perag *pag, int flags);
++
+ int xfs_reclaim_inodes(struct xfs_mount *mp, int mode);
+
+ void xfs_inode_set_reclaim_tag(struct xfs_inode *ip);
projects / thirdparty / kernel / stable-queue.git / commitdiff
