---

yaml --- r: 286087 b: refs/heads/master c: 966f121 h: refs/heads/master i: 286085: 057742c 286083: 56abb87 286079: 66f6503 v: v3
git-mirror · Jan 18, 2012 · 93e188e · 93e188e
1 parent df6e095
commit 93e188e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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);