7 files changed, 12 insertions, 12 deletions

diff --git a/drivers/isdn/mISDN/socket.c b/drivers/isdn/mISDN/socket.c
index 15d3ca37669a..4ab8b1b6608f 100644
--- a/drivers/isdn/mISDN/socket.c
+++ b/drivers/isdn/mISDN/socket.c
@@ -103,7 +103,7 @@ mISDN_ctrl(struct mISDNchannel *ch, u_int cmd, void *arg)
 static inline void
 mISDN_sock_cmsg(struct sock *sk, struct msghdr *msg, struct sk_buff *skb)
 {
-        struct timeval  tv;
+        struct __kernel_old_timeval     tv;
 
         if (_pms(sk)->cmask & MISDN_TIME_STAMP) {
                 skb_get_timestamp(skb, &tv);
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index c34595374e93..4001611a4c9f 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -3486,16 +3486,16 @@ static inline ktime_t skb_get_ktime(const struct sk_buff *skb)
 /**
  *      skb_get_timestamp - get timestamp from a skb
  *      @skb: skb to get stamp from
- *      @stamp: pointer to struct timeval to store stamp in
+ *      @stamp: pointer to struct __kernel_old_timeval to store stamp in
  *
  *      Timestamps are stored in the skb as offsets to a base timestamp.
  *      This function converts the offset back to a struct timeval and stores
  *      it in stamp.
  */
 static inline void skb_get_timestamp(const struct sk_buff *skb,
-                                     struct timeval *stamp)
+                                     struct __kernel_old_timeval *stamp)
 {
-        *stamp = ktime_to_timeval(skb->tstamp);
+        *stamp = ns_to_kernel_old_timeval(skb->tstamp);
 }
 
 static inline void skb_get_timestampns(const struct sk_buff *skb,
diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
index 1506e1632394..65228bfa4487 100644
--- a/net/bluetooth/hci_sock.c
+++ b/net/bluetooth/hci_sock.c
@@ -1383,9 +1383,9 @@ static void hci_sock_cmsg(struct sock *sk, struct msghdr *msg,
 
         if (mask & HCI_CMSG_TSTAMP) {
 #ifdef CONFIG_COMPAT
-                struct compat_timeval ctv;
+                struct old_timeval32 ctv;
 #endif
-                struct timeval tv;
+                struct __kernel_old_timeval tv;
                 void *data;
                 int len;
 
diff --git a/net/compat.c b/net/compat.c
index ccf93cd0e49b..9629f053d4fa 100644
--- a/net/compat.c
+++ b/net/compat.c
@@ -209,8 +209,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];
+        struct old_timeval32 ctv;
+        struct old_timespec32 cts[3];
         int cmlen;
 
         if (cm == NULL || kmsg->msg_controllen < sizeof(*cm)) {
@@ -220,7 +220,7 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat
 
         if (!COMPAT_USE_64BIT_TIME) {
                 if (level == SOL_SOCKET && type == SO_TIMESTAMP_OLD) {
-                        struct timeval *tv = (struct timeval *)data;
+                        struct __kernel_old_timeval *tv = (struct __kernel_old_timeval *)data;
                         ctv.tv_sec = tv->tv_sec;
                         ctv.tv_usec = tv->tv_usec;
                         data = &ctv;
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index e29aec59cad1..3ce41b04c0f0 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -1861,7 +1861,7 @@ static void tcp_update_recv_tstamps(struct sk_buff *skb,
 static void tcp_recv_timestamp(struct msghdr *msg, const struct sock *sk,
                                struct scm_timestamping *tss)
 {
-        struct timeval tv;
+        struct __kernel_old_timeval tv;
         bool has_timestamping = false;
 
         if (tss->ts[0].tv_sec || tss->ts[0].tv_nsec) {
diff --git a/net/rds/recv.c b/net/rds/recv.c
index 04e30d63a159..435bf2320cd3 100644
--- a/net/rds/recv.c
+++ b/net/rds/recv.c
@@ -549,7 +549,7 @@ static int rds_cmsg_recv(struct rds_incoming *inc, struct msghdr *msg,
 
         if ((inc->i_rx_tstamp != 0) &&
             sock_flag(rds_rs_to_sk(rs), SOCK_RCVTSTAMP)) {
-                struct timeval tv = ktime_to_timeval(inc->i_rx_tstamp);
+                struct __kernel_old_timeval tv = ns_to_kernel_old_timeval(inc->i_rx_tstamp);
                 ret = put_cmsg(msg, SOL_SOCKET, SO_TIMESTAMP_OLD,
                                sizeof(tv), &tv);
                 if (ret)
diff --git a/net/socket.c b/net/socket.c
index 5087f9e40f3a..9cc281cdb9d9 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -719,7 +719,7 @@ void __sock_recv_timestamp(struct msghdr *msg, struct sock *sk,
 
         if (need_software_tstamp) {
                 if (!sock_flag(sk, SOCK_RCVTSTAMPNS)) {
-                        struct timeval tv;
+                        struct __kernel_old_timeval tv;
                         skb_get_timestamp(skb, &tv);
                         put_cmsg(msg, SOL_SOCKET, SO_TIMESTAMP_OLD,
                                  sizeof(tv), &tv);