From bf321e29d19b2b425b5f2ccdf518d336a1080e2d Mon Sep 17 00:00:00 2001
From: "H. J. Lu" <hjl.tools@gmail.com>
Date: Fri, 10 Feb 2012 14:12:15 -0800
Subject: [PATCH] --- yaml --- r: 297711 b: refs/heads/master c:
 da88cea1200b9df65a7811a3920aa5a4be7dab9f h: refs/heads/master i:   297709:
 592fd0a8de6f53db376ad497e91c090e999b0de4   297707:
 5afb025721362f76faa40ca72f0f1cf924433876   297703:
 729d7678bfd110cb6d0f0e270901e01c5807a624   297695:
 036bbfba8cb05caae17b0918a37854a1dcc4ad1d v: v3

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

diff --git a/[refs] b/[refs]
index 5b891be8c560..57be3f38280f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f930a7a0f4c87bf3ee731383421ebf3164009ee7
+refs/heads/master: da88cea1200b9df65a7811a3920aa5a4be7dab9f
diff --git a/trunk/net/bluetooth/hci_sock.c b/trunk/net/bluetooth/hci_sock.c
index 0dcc96266779..b2eb2b93580f 100644
--- a/trunk/net/bluetooth/hci_sock.c
+++ b/trunk/net/bluetooth/hci_sock.c
@@ -418,7 +418,8 @@ static inline void hci_sock_cmsg(struct sock *sk, struct msghdr *msg, struct sk_
 		data = &tv;
 		len = sizeof(tv);
 #ifdef CONFIG_COMPAT
-		if (msg->msg_flags & MSG_CMSG_COMPAT) {
+		if (!COMPAT_USE_64BIT_TIME &&
+		    (msg->msg_flags & MSG_CMSG_COMPAT)) {
 			ctv.tv_sec = tv.tv_sec;
 			ctv.tv_usec = tv.tv_usec;
 			data = &ctv;