diff options
| author | Ingo Molnar <mingo@elte.hu> | 2012-03-13 05:54:39 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2012-03-13 05:54:41 +0100 |
| commit | e898c6706869fdcbd68b1e7fb0ac7461d98710fe (patch) | |
| tree | 28054da88ddda324f78f27083b14328113941fbc /net/bluetooth/hci_sock.c | |
| parent | x86: Use enum instead of literals for trap values (diff) | |
| parent | x32: Add ptrace for x32 (diff) | |
| download | linux-e898c6706869fdcbd68b1e7fb0ac7461d98710fe.tar.xz linux-e898c6706869fdcbd68b1e7fb0ac7461d98710fe.zip | |
Merge branch 'x86/x32' into x86/cleanups
Merge reason: We are going to merge a dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'net/bluetooth/hci_sock.c')
| -rw-r--r-- | net/bluetooth/hci_sock.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c index 0dcc96266779..b2eb2b93580f 100644 --- a/net/bluetooth/hci_sock.c +++ b/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; |