Commit 2da96acd authored by Jens Axboe's avatar Jens Axboe
Browse files

[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: default avatarJens Axboe <jens.axboe@oracle.com>
parent 782e3b3b

include/linux/blkdev.h

+0 −14
Original line number Diff line number Diff line
@@ -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;

include/linux/kernel.h

+14 −0
Original line number Diff line number Diff line
@@ -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