Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e6973e9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block 

* 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block:
  [BLOCK] s390 xpram typo
  [BLOCK] Only include the compat ioctl code if CONFIG_BLOCK is set
  [BLOCK] Better fix for do_blk_trace_setup() for !CONFIG_BLOCK
  [BLOCK] Move sector_div() from blkdev.h to kernel.h
parents 000233e4 b018fc09

block/Kconfig

+4 −0
Original line number Original line Diff line number Diff line
@@ -62,6 +62,10 @@ config BLK_DEV_BSG 
	protocols (e.g. Task Management Functions and SMP in Serial

	protocols (e.g. Task Management Functions and SMP in Serial

	Attached SCSI).

	Attached SCSI).





config BLOCK_COMPAT

	bool

	default y



endif # BLOCK

endif # BLOCK





source block/Kconfig.iosched
 
source block/Kconfig.iosched

block/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -11,4 +11,4 @@ obj-$(CONFIG_IOSCHED_DEADLINE) += deadline-iosched.o 
obj-$(CONFIG_IOSCHED_CFQ)	+= cfq-iosched.o

obj-$(CONFIG_IOSCHED_CFQ)	+= cfq-iosched.o





obj-$(CONFIG_BLK_DEV_IO_TRACE)	+= blktrace.o

obj-$(CONFIG_BLK_DEV_IO_TRACE)	+= blktrace.o

obj-$(CONFIG_COMPAT)		+= compat_ioctl.o
 
obj-$(CONFIG_BLOCK_COMPAT)	+= compat_ioctl.o

include/linux/blkdev.h

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

include/linux/blktrace_api.h

+1 −6
Original line number Original line Diff line number Diff line
@@ -290,12 +290,7 @@ static inline void blk_add_trace_remap(struct request_queue *q, struct bio *bio, 
#define blk_add_trace_generic(q, rq, rw, what)	do { } while (0)

#define blk_add_trace_generic(q, rq, rw, what)	do { } while (0)

#define blk_add_trace_pdu_int(q, what, bio, pdu)	do { } while (0)

#define blk_add_trace_pdu_int(q, what, bio, pdu)	do { } while (0)

#define blk_add_trace_remap(q, bio, dev, f, t)	do {} while (0)

#define blk_add_trace_remap(q, bio, dev, f, t)	do {} while (0)

static inline int do_blk_trace_setup(struct request_queue *q,

#define do_blk_trace_setup(q, bdev, buts)	(-ENOTTY)

				     struct block_device *bdev,

				     struct blk_user_trace_setup *buts)

{

	return 0;

}

#endif /* CONFIG_BLK_DEV_IO_TRACE */

#endif /* CONFIG_BLK_DEV_IO_TRACE */

#endif /* __KERNEL__ */

#endif /* __KERNEL__ */

#endif
 
#endif

include/linux/kernel.h

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