summaryrefslogtreecommitdiffstats
path: root/include/linux/mroute6.h
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2011-12-13 15:07:49 +0000
committerDavid Howells <dhowells@redhat.com>2011-12-13 15:07:49 +0000
commit1632b9e2a14ce9f4e08faf6c4380431d63319bd3 (patch)
tree572e45a2de74d233af5d98242bafbd193e074f43 /include/linux/mroute6.h
parentfdc29805bd7cae133303045fc0249d76f3827613 (diff)
downloadlinux-1632b9e2a14ce9f4e08faf6c4380431d63319bd3.tar.gz
linux-1632b9e2a14ce9f4e08faf6c4380431d63319bd3.tar.bz2
linux-1632b9e2a14ce9f4e08faf6c4380431d63319bd3.zip
UAPI: Split trivial #if defined(__KERNEL__) && X conditionals
Split trivial #if defined(__KERNEL__) && X conditionals to make automated disintegration easier. Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'include/linux/mroute6.h')
-rw-r--r--include/linux/mroute6.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/mroute6.h b/include/linux/mroute6.h
index a3759cb0ac10..6d8c7251eb8d 100644
--- a/include/linux/mroute6.h
+++ b/include/linux/mroute6.h
@@ -43,9 +43,11 @@ typedef unsigned short mifi_t;
typedef __u32 if_mask;
#define NIFBITS (sizeof(if_mask) * 8) /* bits per mask */
-#if !defined(__KERNEL__) && !defined(DIV_ROUND_UP)
+#if !defined(__KERNEL__)
+#if !defined(DIV_ROUND_UP)
#define DIV_ROUND_UP(x,y) (((x) + ((y) - 1)) / (y))
#endif
+#endif
typedef struct if_set {
if_mask ifs_bits[DIV_ROUND_UP(IF_SETSIZE, NIFBITS)];