The patch titled
delayacct: fix iotop on x86_64
has been removed from the -mm tree. Its filename was
delayacct-fix-iotop-on-x86_64.patch
This patch was dropped because an updated version will be merged
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: delayacct: fix iotop on x86_64
From: Dan Carpenter <error27@xxxxxxxxx>
We changed how the taskstats was exported to user space in: 85893120699
("delayacct: align to 8 byte boundary on 64-bit systems"). This was
important because it fixes a run time warning on IA64. In theory it
shouldn't have broken anything, if you just assume that user space
programmers don't smoke crack all day long.
But actually it breaks iotop on x86_64.
Reported-by: Brian Rogers <brian@xxxxxxxx>
Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
Cc: Jeff Mahoney <jeffm@xxxxxxxx>
Cc: Guillaume Chazarain <guichaz@xxxxxxxxx>
Cc: Balbir Singh <balbir@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/taskstats.c | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff -puN kernel/taskstats.c~delayacct-fix-iotop-on-x86_64 kernel/taskstats.c
--- a/kernel/taskstats.c~delayacct-fix-iotop-on-x86_64
+++ a/kernel/taskstats.c
@@ -357,7 +357,19 @@ static struct taskstats *mk_reply(struct
* This causes lots of runtime warnings on systems requiring 8 byte
* alignment */
u32 pids[2] = { pid, 0 };
- int pid_size = ALIGN(sizeof(pid), sizeof(long));
+ int pid_size;
+
+ /*
+ * IA64 can't be aligned on a 4 byte boundary. But iotop on x86_64
+ * depends on the current struct layout. The next version of iotop
+ * will fix this so maybe we can move everything to the new code in
+ * a couple years (ie: 2012).
+ */
+#if defined(CONFIG_IA64)
+ pid_size = ALIGN(sizeof(pid), sizeof(long));
+#else
+ pid_size = sizeof(u32);
+#endif
aggr = (type == TASKSTATS_TYPE_PID)
? TASKSTATS_TYPE_AGGR_PID
_
Patches currently in -mm which might be from error27@xxxxxxxxx are
origin.patch
linux-next.patch
dca-remove-unneeded-null-check.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
