summaryrefslogtreecommitdiff
path: root/arch/s390/appldata/appldata_os.c
diff options
context:
space:
mode:
authorGerald Schaefer <geraldsc@de.ibm.com>2005-06-04 15:43:33 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-04 17:13:00 -0700
commitf26d583e41aedad8159acf9533fa287d7209dfbf (patch)
tree215ef8ae71cd2b6bb6fec824d1db4a9f39db97ca /arch/s390/appldata/appldata_os.c
parent595bf2aacae96d0f87352a1ff5476b79e52e212f (diff)
[PATCH] s390: deadlock in appldata
The system might hang when using appldata_mem with high I/O traffic and a large number of devices. The spinlocks bdev_lock and swaplock are acquired via calls to si_meminfo() and si_swapinfo() from a tasklet, i.e. interrupt context, which can lead to a deadlock. Replace tasklet with work queue. Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/s390/appldata/appldata_os.c')
-rw-r--r--arch/s390/appldata/appldata_os.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/appldata/appldata_os.c b/arch/s390/appldata/appldata_os.c
index b83f07484551..e0a476bf4fd6 100644
--- a/arch/s390/appldata/appldata_os.c
+++ b/arch/s390/appldata/appldata_os.c
@@ -49,7 +49,7 @@ struct appldata_os_per_cpu {
u32 per_cpu_softirq; /* ... spent in softirqs */
u32 per_cpu_iowait; /* ... spent while waiting for I/O */
// <-- New in 2.6
-};
+} __attribute__((packed));
struct appldata_os_data {
u64 timestamp;
@@ -75,7 +75,7 @@ struct appldata_os_data {
/* per cpu data */
struct appldata_os_per_cpu os_cpu[0];
-};
+} __attribute__((packed));
static struct appldata_os_data *appldata_os_data;