diff options
Diffstat (limited to 'include')
| -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 95be0ac57e76..5ed888b04b29 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h | |||
| @@ -20,20 +20,6 @@ | |||
| 20 | 20 | ||
| 21 | #include <asm/scatterlist.h> | 21 | #include <asm/scatterlist.h> |
| 22 | 22 | ||
| 23 | #ifdef CONFIG_LBD | ||
| 24 | # include <asm/div64.h> | ||
| 25 | # define sector_div(a, b) do_div(a, b) | ||
| 26 | #else | ||
| 27 | # define sector_div(n, b)( \ | ||
| 28 | { \ | ||
| 29 | int _res; \ | ||
| 30 | _res = (n) % (b); \ | ||
| 31 | (n) /= (b); \ | ||
| 32 | _res; \ | ||
| 33 | } \ | ||
| 34 | ) | ||
| 35 | #endif | ||
| 36 | |||
| 37 | struct scsi_ioctl_command; | 23 | struct scsi_ioctl_command; |
| 38 | 24 | ||
| 39 | struct request_queue; | 25 | struct request_queue; |
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 47160fe378c9..d9725a28a265 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h | |||
| @@ -42,6 +42,20 @@ extern const char linux_proc_banner[]; | |||
| 42 | #define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d)) | 42 | #define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d)) |
| 43 | #define roundup(x, y) ((((x) + ((y) - 1)) / (y)) * (y)) | 43 | #define roundup(x, y) ((((x) + ((y) - 1)) / (y)) * (y)) |
| 44 | 44 | ||
| 45 | #ifdef CONFIG_LBD | ||
| 46 | # include <asm/div64.h> | ||
| 47 | # define sector_div(a, b) do_div(a, b) | ||
| 48 | #else | ||
| 49 | # define sector_div(n, b)( \ | ||
| 50 | { \ | ||
| 51 | int _res; \ | ||
| 52 | _res = (n) % (b); \ | ||
| 53 | (n) /= (b); \ | ||
| 54 | _res; \ | ||
| 55 | } \ | ||
| 56 | ) | ||
| 57 | #endif | ||
| 58 | |||
| 45 | /** | 59 | /** |
| 46 | * upper_32_bits - return bits 32-63 of a number | 60 | * upper_32_bits - return bits 32-63 of a number |
| 47 | * @n: the number we're accessing | 61 | * @n: the number we're accessing |
