diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-06-06 15:42:07 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-06-06 15:42:07 -0700 |
| commit | 26abd53d8e9e51bbeea0b4772e8dffece3eeff38 (patch) | |
| tree | d9dc6f45c9142e6a8f58f1aa8fc75e66f9edd0e9 /arch/s390/appldata/appldata_os.c | |
| parent | ff89bf3bc0534aa03b5375aa906544d96911bad4 (diff) | |
| parent | 8f5bb0438b86d1a5393176ceeec2836fd469edf8 (diff) | |
auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'arch/s390/appldata/appldata_os.c')
| -rw-r--r-- | arch/s390/appldata/appldata_os.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/appldata/appldata_os.c b/arch/s390/appldata/appldata_os.c index b83f0748455..e0a476bf4fd 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; |