diff options
| author | Ingo Molnar | 2011-01-04 08:08:51 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2011-01-04 08:08:54 +0100 |
| commit | cc2221969906a166a638aecdbae84a3d0462719e (patch) | |
| tree | 2483f726e226c309207e1d0250660eea6e1787b8 /include/linux/unaligned/packed_struct.h | |
| parent | Merge branch 'core' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/opr... (diff) | |
| parent | Linux 2.6.37-rc8 (diff) | |
| download | kernel-qcow2-linux-cc2221969906a166a638aecdbae84a3d0462719e.tar.gz kernel-qcow2-linux-cc2221969906a166a638aecdbae84a3d0462719e.tar.xz kernel-qcow2-linux-cc2221969906a166a638aecdbae84a3d0462719e.zip | |
Merge commit 'v2.6.37-rc8' into perf/core
Merge reason: pick up latest -rc.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/unaligned/packed_struct.h')
| -rw-r--r-- | include/linux/unaligned/packed_struct.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/unaligned/packed_struct.h b/include/linux/unaligned/packed_struct.h index 2498bb9fe002..c9a6abd972a1 100644 --- a/include/linux/unaligned/packed_struct.h +++ b/include/linux/unaligned/packed_struct.h @@ -3,9 +3,9 @@ #include <linux/kernel.h> -struct __una_u16 { u16 x __attribute__((packed)); }; -struct __una_u32 { u32 x __attribute__((packed)); }; -struct __una_u64 { u64 x __attribute__((packed)); }; +struct __una_u16 { u16 x; } __attribute__((packed)); +struct __una_u32 { u32 x; } __attribute__((packed)); +struct __una_u64 { u64 x; } __attribute__((packed)); static inline u16 __get_unaligned_cpu16(const void *p) { |