3 files changed, 7 insertions, 5 deletions

diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c
index def007ec1d6f..686ddd62f71a 100644
--- a/net/ipv4/inet_diag.c
+++ b/net/ipv4/inet_diag.c
@@ -11,6 +11,7 @@
  *      2 of the License, or (at your option) any later version.
  */
 
+#include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/fcntl.h>
@@ -112,7 +113,7 @@ static int inet_csk_diag_fill(struct sock *sk,
         }
 #endif
 
-#define EXPIRES_IN_MS(tmo)  ((tmo - jiffies) * 1000 + HZ - 1) / HZ
+#define EXPIRES_IN_MS(tmo)  DIV_ROUND_UP((tmo - jiffies) * 1000, HZ)
 
         if (icsk->icsk_pending == ICSK_TIME_RETRANS) {
                 r->idiag_timer = 1;
@@ -190,7 +191,7 @@ static int inet_twsk_diag_fill(struct inet_timewait_sock *tw,
         r->id.idiag_dst[0]    = tw->tw_daddr;
         r->idiag_state        = tw->tw_substate;
         r->idiag_timer        = 3;
-        r->idiag_expires      = (tmo * 1000 + HZ - 1) / HZ;
+        r->idiag_expires      = DIV_ROUND_UP(tmo * 1000, HZ);
         r->idiag_rqueue       = 0;
         r->idiag_wqueue       = 0;
         r->idiag_uid          = 0;
diff --git a/net/ipv4/inet_timewait_sock.c b/net/ipv4/inet_timewait_sock.c
index 2586df09b9b6..4e189e28f306 100644
--- a/net/ipv4/inet_timewait_sock.c
+++ b/net/ipv4/inet_timewait_sock.c
@@ -8,7 +8,7 @@
  *              From code orinally in TCP
  */
 
-
+#include <linux/kernel.h>
 #include <net/inet_hashtables.h>
 #include <net/inet_timewait_sock.h>
 #include <net/ip.h>
@@ -292,7 +292,7 @@ void inet_twsk_schedule(struct inet_timewait_sock *tw,
                 if (timeo >= timewait_len) {
                         slot = INET_TWDR_TWKILL_SLOTS - 1;
                 } else {
-                        slot = (timeo + twdr->period - 1) / twdr->period;
+                        slot = DIV_ROUND_UP(timeo, twdr->period);
                         if (slot >= INET_TWDR_TWKILL_SLOTS)
                                 slot = INET_TWDR_TWKILL_SLOTS - 1;
                 }
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index aff31427f525..18c64c74f6d5 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -247,6 +247,7 @@
  *      TCP_CLOSE               socket is finished
  */
 
+#include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/fcntl.h>
@@ -2210,7 +2211,7 @@ struct sk_buff *tcp_tso_segment(struct sk_buff *skb, int features)
                         goto out;
 
                 mss = skb_shinfo(skb)->gso_size;
-                skb_shinfo(skb)->gso_segs = (skb->len + mss - 1) / mss;
+                skb_shinfo(skb)->gso_segs = DIV_ROUND_UP(skb->len, mss);
 
                 segs = NULL;
                 goto out;