From aa002aa0052c0d09474bae446d70321a0f47bda6 Mon Sep 17 00:00:00 2001
From: Oliver Pinter <oliver.pntr@gmail.com>
Date: Thu, 1 May 2008 17:40:09 +0200
Subject: [PATCH] add v2.6.22.22-op2-rc1 chlog & patch

Signed-off-by: Oliver Pinter <oliver.pntr@gmail.com>
---
 patch-2.6.22.y/rc/chlog-v2.6.22.22-op2-rc1         | 29 ++++++++++++++++++++
 .../rc/patch-v2.6.22.22-op1-v2.6.22.22-op2-rc1     | 31 ++++++++++++++++++++++
 2 files changed, 60 insertions(+)
 create mode 100644 patch-2.6.22.y/rc/chlog-v2.6.22.22-op2-rc1
 create mode 100644 patch-2.6.22.y/rc/patch-v2.6.22.22-op1-v2.6.22.22-op2-rc1

diff --git a/patch-2.6.22.y/rc/chlog-v2.6.22.22-op2-rc1 b/patch-2.6.22.y/rc/chlog-v2.6.22.22-op2-rc1
new file mode 100644
index 0000000..669ffbc
--- /dev/null
+++ b/patch-2.6.22.y/rc/chlog-v2.6.22.22-op2-rc1
@@ -0,0 +1,29 @@
+commit 6f1b60cbc02c8aa55fc7acc3848815cc281aed41
+Author: Oliver Pinter <oliver.pntr@gmail.com>
+Date:   Thu May 1 17:32:00 2008 +0200
+
+    v2.6.22.22-op2-rc1
+    
+    Signed-off-by: Oliver Pinter <oliver.pntr@gmail.com>
+
+commit a582a192c748e9382c524e3c55d7980373e48c1d
+Author: Jeff Moyer <jmoyer@redhat.com>
+Date:   Tue Dec 4 23:45:02 2007 -0800
+
+    aio: only account I/O wait time in read_events if there are active requests
+    
+    On 2.6.24, top started showing 100% iowait on one CPU when a UML instance was
+    running (but completely idle).  The UML code sits in io_getevents waiting for
+    an event to be submitted and completed.
+    
+    Fix this by checking ctx->reqs_active before scheduling to determine whether
+    or not we are waiting for I/O.
+    
+    Signed-off-by: Jeff Moyer <jmoyer@redhat.com>
+    Cc: Zach Brown <zach.brown@oracle.com>
+    Cc: Miklos Szeredi <miklos@szeredi.hu>
+    Cc: Jeff Dike <jdike@addtoit.com>
+    Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
+    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+    Signed-off-by: Oliver Pinter <oliver.pntr@gmail.com>
diff --git a/patch-2.6.22.y/rc/patch-v2.6.22.22-op1-v2.6.22.22-op2-rc1 b/patch-2.6.22.y/rc/patch-v2.6.22.22-op1-v2.6.22.22-op2-rc1
new file mode 100644
index 0000000..978c6d4
--- /dev/null
+++ b/patch-2.6.22.y/rc/patch-v2.6.22.22-op1-v2.6.22.22-op2-rc1
@@ -0,0 +1,31 @@
+diff --git a/Makefile b/Makefile
+index 7200160..7b7a66c 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,7 @@
+ VERSION = 2
+ PATCHLEVEL = 6
+ SUBLEVEL = 22
+-EXTRAVERSION = .22-op1
++EXTRAVERSION = .22-op2-rc1
+ NAME = Holy Dancing Manatees, Batman!
+ 
+ # *DOCUMENTATION*
+diff --git a/fs/aio.c b/fs/aio.c
+index b3419c5..e683b91 100644
+--- a/fs/aio.c
++++ b/fs/aio.c
+@@ -1171,7 +1171,12 @@ retry:
+ 			ret = 0;
+ 			if (to.timed_out)	/* Only check after read evt */
+ 				break;
+-			io_schedule();
++			/* Try to only show up in io wait if there are ops
++			 *  in flight */
++			if (ctx->reqs_active)
++				io_schedule();
++			else
++				schedule();
+ 			if (signal_pending(tsk)) {
+ 				ret = -EINTR;
+ 				break;
-- 
2.11.4.GIT