diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2007-10-12 12:40:38 +0200 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2007-10-12 12:40:38 +0200 |
| commit | 2da96acde0318f121ed3f5993ae9324c856ecfd4 (patch) | |
| tree | 020f58a39c5ceb9bd3bca1a63ad22e3a2da98e57 | |
| parent | 782e3b3b3804c38d5130c7f21d7ec7bf6709023f (diff) | |
| download | linux-0-day-2da96acde0318f121ed3f5993ae9324c856ecfd4.tar.gz linux-0-day-2da96acde0318f121ed3f5993ae9324c856ecfd4.tar.xz | |
[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>
| -rw-r--r-- | include/linux/blkdev.h | 14 | ||||
| -rw-r--r-- | include/linux/kernel.h | 14 |
2 files changed, 14 insertions, 14 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 95be0ac57e76b..5ed888b04b29b 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -20,20 +20,6 @@ #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 request_queue; diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 47160fe378c98..d9725a28a2655 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -42,6 +42,20 @@ extern const char linux_proc_banner[]; #define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d)) #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 * @n: the number we're accessing |