[PATCH] [ALSA] Fix struct alignment on PPC64

Fixed the struct size mismatch (due to alignment) of
snd_ctl_elem_value_t for PPC64 and SPARC64.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/sound/core/ioctl32/ioctl32.c b/sound/core/ioctl32/ioctl32.c
index 0c7639e05febbb686346de6ec905c9a7b780fe39..bf48c51080a5969edda07e4016164147af570063 100644 (file)
--- a/sound/core/ioctl32/ioctl32.c
+++ b/sound/core/ioctl32/ioctl32.c
@@ -220,6 +220,9 @@ struct sndrv_ctl_elem_value32 {
        unsigned int indirect;  /* bit-field causes misalignment */
         union {
                s32 integer[128];       /* integer and boolean need conversion */
+#ifndef CONFIG_X86_64
+               s64 integer64[64];      /* for alignment */
+#endif
                unsigned char data[512];        /* others should be compatible */
         } value;
         unsigned char reserved[128];   /* not used */