summaryrefslogtreecommitdiffstats
path: root/include/linux/kernel.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux/kernel.h')
-rw-r--r--include/linux/kernel.h14
1 files changed, 2 insertions, 12 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index 34a5036debd3..24ef5a018a5e 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -17,6 +17,7 @@
17#include <asm/byteorder.h> 17#include <asm/byteorder.h>
18#include <asm/div64.h> 18#include <asm/div64.h>
19#include <uapi/linux/kernel.h> 19#include <uapi/linux/kernel.h>
20#include <asm/div64.h>
20 21
21#define STACK_MAGIC 0xdeadbeef 22#define STACK_MAGIC 0xdeadbeef
22 23
@@ -175,18 +176,7 @@
175#define _RET_IP_ (unsigned long)__builtin_return_address(0) 176#define _RET_IP_ (unsigned long)__builtin_return_address(0)
176#define _THIS_IP_ ({ __label__ __here; __here: (unsigned long)&&__here; }) 177#define _THIS_IP_ ({ __label__ __here; __here: (unsigned long)&&__here; })
177 178
178#ifdef CONFIG_LBDAF 179#define sector_div(a, b) do_div(a, b)
179# define sector_div(a, b) do_div(a, b)
180#else
181# define sector_div(n, b)( \
182{ \
183 int _res; \
184 _res = (n) % (b); \
185 (n) /= (b); \
186 _res; \
187} \
188)
189#endif
190 180
191/** 181/**
192 * upper_32_bits - return bits 32-63 of a number 182 * upper_32_bits - return bits 32-63 of a number