[PATCH] kernel.h: unconditionally include asm/div64.h for do_div()

From: Jani Nikula
Date: Fri Dec 28 2018 - 10:34:11 EST


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.

Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>
---
include/linux/kernel.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index d6aac75b51ba..20e3a87d31d6 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -14,6 +14,7 @@
#include <linux/printk.h>
#include <linux/build_bug.h>
#include <asm/byteorder.h>
+#include <asm/div64.h>
#include <uapi/linux/kernel.h>

#define USHRT_MAX ((u16)(~0U))
@@ -204,7 +205,6 @@
#define _THIS_IP_ ({ __label__ __here; __here: (unsigned long)&&__here; })

#ifdef CONFIG_LBDAF
-# include <asm/div64.h>
# define sector_div(a, b) do_div(a, b)
#else
# define sector_div(n, b)( \
--
2.11.0