[BLOCK] Move sector_div() from blkdev.h to kernel.h
We need it even if CONFIG_BLOCK is disabled, so move it outside of the block layer include system. Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
This commit is contained in:
parent
782e3b3b38
commit
2da96acde0
|
@ -20,20 +20,6 @@
|
||||||
|
|
||||||
#include <asm/scatterlist.h>
|
#include <asm/scatterlist.h>
|
||||||
|
|
||||||
#ifdef CONFIG_LBD
|
|
||||||
# include <asm/div64.h>
|
|
||||||
# define sector_div(a, b) do_div(a, b)
|
|
||||||
#else
|
|
||||||
# define sector_div(n, b)( \
|
|
||||||
{ \
|
|
||||||
int _res; \
|
|
||||||
_res = (n) % (b); \
|
|
||||||
(n) /= (b); \
|
|
||||||
_res; \
|
|
||||||
} \
|
|
||||||
)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
struct scsi_ioctl_command;
|
struct scsi_ioctl_command;
|
||||||
|
|
||||||
struct request_queue;
|
struct request_queue;
|
||||||
|
|
|
@ -42,6 +42,20 @@ extern const char linux_proc_banner[];
|
||||||
#define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d))
|
#define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d))
|
||||||
#define roundup(x, y) ((((x) + ((y) - 1)) / (y)) * (y))
|
#define roundup(x, y) ((((x) + ((y) - 1)) / (y)) * (y))
|
||||||
|
|
||||||
|
#ifdef CONFIG_LBD
|
||||||
|
# include <asm/div64.h>
|
||||||
|
# define sector_div(a, b) do_div(a, b)
|
||||||
|
#else
|
||||||
|
# define sector_div(n, b)( \
|
||||||
|
{ \
|
||||||
|
int _res; \
|
||||||
|
_res = (n) % (b); \
|
||||||
|
(n) /= (b); \
|
||||||
|
_res; \
|
||||||
|
} \
|
||||||
|
)
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* upper_32_bits - return bits 32-63 of a number
|
* upper_32_bits - return bits 32-63 of a number
|
||||||
* @n: the number we're accessing
|
* @n: the number we're accessing
|
||||||
|
|
Loading…
Reference in New Issue