diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-25 08:41:09 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-25 08:41:09 -0800 |
| commit | 1e8c573933fd7975679766850252ad08667e5ca4 (patch) | |
| tree | 9600d0c7ee5ea8925f3c4dc30680c819e0363805 /block | |
| parent | d71eecf3b8e893757cc3dec560c96a32ac090890 (diff) | |
| parent | 232443e2c90cc2930624dec89df327615b002c55 (diff) | |
| download | op-kernel-dev-1e8c573933fd7975679766850252ad08667e5ca4.zip op-kernel-dev-1e8c573933fd7975679766850252ad08667e5ca4.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (21 commits)
BUG_ON() Conversion in drivers/video/
BUG_ON() Conversion in drivers/parisc/
BUG_ON() Conversion in drivers/block/
BUG_ON() Conversion in sound/sparc/cs4231.c
BUG_ON() Conversion in drivers/s390/block/dasd.c
BUG_ON() Conversion in lib/swiotlb.c
BUG_ON() Conversion in kernel/cpu.c
BUG_ON() Conversion in ipc/msg.c
BUG_ON() Conversion in block/elevator.c
BUG_ON() Conversion in fs/coda/
BUG_ON() Conversion in fs/binfmt_elf_fdpic.c
BUG_ON() Conversion in input/serio/hil_mlc.c
BUG_ON() Conversion in md/dm-hw-handler.c
BUG_ON() Conversion in md/bitmap.c
The comment describing how MS_ASYNC works in msync.c is confusing
rcu: undeclared variable used in documentation
fix typos "wich" -> "which"
typo patch for fs/ufs/super.c
Fix simple typos
tabify drivers/char/Makefile
...
Diffstat (limited to 'block')
| -rw-r--r-- | block/elevator.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/block/elevator.c b/block/elevator.c index 5e558c4..56c2ed0 100644 --- a/block/elevator.c +++ b/block/elevator.c @@ -728,8 +728,7 @@ void elv_unregister_queue(struct request_queue *q) int elv_register(struct elevator_type *e) { spin_lock_irq(&elv_list_lock); - if (elevator_find(e->elevator_name)) - BUG(); + BUG_ON(elevator_find(e->elevator_name)); list_add_tail(&e->list, &elv_list); spin_unlock_irq(&elv_list_lock); |
