diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-02 21:42:56 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-02 21:42:59 +0200 |
| commit | f76bd108e5031202bb40849306f98c4afebe4ef6 (patch) | |
| tree | 455e14a23642a82513eebd4e4f7d3b76842869cd /include/linux/gen_stats.h | |
| parent | cd6feeeafddbef6abfe4d90fb26e42fd844d34ed (diff) | |
| parent | eced1dfcfcf6b0a35e925d73916a9d8e36ab5457 (diff) | |
Merge branch 'perfcounters/urgent' into perfcounters/core
Merge reason: We are going to modify a place modified by
perfcounters/urgent.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/gen_stats.h')
| -rw-r--r-- | include/linux/gen_stats.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/gen_stats.h b/include/linux/gen_stats.h index 0ffa41df0ee..710e901085d 100644 --- a/include/linux/gen_stats.h +++ b/include/linux/gen_stats.h @@ -22,6 +22,11 @@ struct gnet_stats_basic { __u64 bytes; __u32 packets; +}; +struct gnet_stats_basic_packed +{ + __u64 bytes; + __u32 packets; } __attribute__ ((packed)); /** |