summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJani Nikula <jani.nikula@intel.com>2019-03-07 19:26:32 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2019-03-07 21:31:59 -0500
commitc461aed3a423dda442aad38047c3f2bb0f9e2012 (patch)
tree49d08280572a05a01d1cd5e317d5a90f8dc3cbb6 /include
parentf90d64483ebd394958841f67f8794ab203b319a7 (diff)
kernel.h: unconditionally include asm/div64.h for do_div()
Include asm/div64.h for do_div() usage in DIV_ROUND_DOWN_ULL() and DIV_ROUND_CLOSEST_ULL(). Remove the old CONFIG_LBDAF=y conditional include. Link: http://lkml.kernel.org/r/20181228153430.23763-1-jani.nikula@intel.com Signed-off-by: Jani Nikula <jani.nikula@intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/kernel.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index a8868a32098c..3b9d2bade8ad 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -14,6 +14,7 @@
14#include <linux/printk.h> 14#include <linux/printk.h>
15#include <linux/build_bug.h> 15#include <linux/build_bug.h>
16#include <asm/byteorder.h> 16#include <asm/byteorder.h>
17#include <asm/div64.h>
17#include <uapi/linux/kernel.h> 18#include <uapi/linux/kernel.h>
18 19
19#define USHRT_MAX ((u16)(~0U)) 20#define USHRT_MAX ((u16)(~0U))
@@ -204,7 +205,6 @@
204#define _THIS_IP_ ({ __label__ __here; __here: (unsigned long)&&__here; }) 205#define _THIS_IP_ ({ __label__ __here; __here: (unsigned long)&&__here; })
205 206
206#ifdef CONFIG_LBDAF 207#ifdef CONFIG_LBDAF
207# include <asm/div64.h>
208# define sector_div(a, b) do_div(a, b) 208# define sector_div(a, b) do_div(a, b)
209#else 209#else
210# define sector_div(n, b)( \ 210# define sector_div(n, b)( \