Merge tag 'sound-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

[pandora-kernel.git] / net / compat.c

diff --git a/net/compat.c b/net/compat.c
index 1b96281..74ed1d7 100644 (file)
--- a/net/compat.c
+++ b/net/compat.c
@@ -221,6 +221,8 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat
 {
        struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
        struct compat_cmsghdr cmhdr;
+       struct compat_timeval ctv;
+       struct compat_timespec cts[3];
        int cmlen;
 
        if (cm == NULL || kmsg->msg_controllen < sizeof(*cm)) {
@@ -229,8 +231,6 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat
        }
 
        if (!COMPAT_USE_64BIT_TIME) {
-               struct compat_timeval ctv;
-               struct compat_timespec cts[3];
                if (level == SOL_SOCKET && type == SCM_TIMESTAMP) {
                        struct timeval *tv = (struct timeval *)data;
                        ctv.tv_sec = tv->tv_sec;