From 313cc321afc479b9cfa2f646e350a930f7100eb3 Mon Sep 17 00:00:00 2001
From: Jesper Juhl <jj@chaosbits.net>
Date: Sun, 22 Jul 2012 11:37:20 +0000
Subject: [PATCH] --- yaml --- r: 315807 b: refs/heads/master c:
 818810472b129004c16fc51bf0a570b60776bfb7 h: refs/heads/master i:   315805:
 7ad2cb674f0669604814bc40245b739bb686a56c   315803:
 006eb37c3187008ea94d29462237a0b235958734   315799:
 e69d822db0ee8bdbdf18e859bf5489db922ed6e8   315791:
 9c0cbaa85e3d9c14328b5fec3d71a89f66d83ab6   315775:
 c209776d604d9555fe32aee6fee64df673f328bc v: v3

---
 [refs]             | 2 +-
 trunk/net/compat.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 1b5818688deb..f4d230bd12d8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5e9965c15ba88319500284e590733f4a4629a288
+refs/heads/master: 818810472b129004c16fc51bf0a570b60776bfb7
diff --git a/trunk/net/compat.c b/trunk/net/compat.c
index 1b96281892de..74ed1d7a84a2 100644
--- a/trunk/net/compat.c
+++ b/trunk/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;