From 93e188e9457186904fe745563ca662f978248b99 Mon Sep 17 00:00:00 2001
From: Lin Ming <ming.m.lin@intel.com>
Date: Mon, 16 Jan 2012 13:23:23 +0800
Subject: [PATCH] --- yaml --- r: 286087 b: refs/heads/master c:
 966f1212e1ac5fe3ddf04479d21488ddb36a2608 h: refs/heads/master i:   286085:
 057742ce27d9fa4d9d322d1a10b478c98fd1458e   286083:
 56abb874e024338bf781d9e93fb5329a2a6bcbc9   286079:
 66f650379fed8058873d7564c28393bdaaa6d828 v: v3

---
 [refs]                               | 2 +-
 trunk/arch/x86/kernel/vm86_32.c      | 2 --
 trunk/drivers/ata/libata-transport.c | 1 +
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 571ffa3b793a..7e714b1de759 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6015ff103133c7e50a753c198c69bcabc3a5e3b0
+refs/heads/master: 966f1212e1ac5fe3ddf04479d21488ddb36a2608
diff --git a/trunk/arch/x86/kernel/vm86_32.c b/trunk/arch/x86/kernel/vm86_32.c
index b466cab5ba15..af17e1c966dc 100644
--- a/trunk/arch/x86/kernel/vm86_32.c
+++ b/trunk/arch/x86/kernel/vm86_32.c
@@ -336,10 +336,8 @@ static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk
 		mark_screen_rdonly(tsk->mm);
 
 	/*call __audit_syscall_exit since we do not exit via the normal paths */
-#ifdef CONFIG_AUDITSYSCALL
 	if (unlikely(current->audit_context))
 		__audit_syscall_exit(1, 0);
-#endif
 
 	__asm__ __volatile__(
 		"movl %0,%%esp\n\t"
diff --git a/trunk/drivers/ata/libata-transport.c b/trunk/drivers/ata/libata-transport.c
index 9a7f0ea565df..74aaee30e264 100644
--- a/trunk/drivers/ata/libata-transport.c
+++ b/trunk/drivers/ata/libata-transport.c
@@ -291,6 +291,7 @@ int ata_tport_add(struct device *parent,
 		goto tport_err;
 	}
 
+	device_enable_async_suspend(dev);
 	pm_runtime_set_active(dev);
 	pm_runtime_enable(dev);