diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:24:17 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:24:17 -0400 |
| commit | 9583f3d9c00974911daf227cbaa12d6c1caaabad (patch) | |
| tree | f37466204ecbfea37c7d567fd06c9bece0cc663d /block/elevator.c | |
| parent | 962cf36c5bf6d2840b8d66ee9a606fae2f540bbd (diff) | |
| parent | 066519068ad2fbe98c7f45552b1f592903a9c8c8 (diff) | |
Merge branch 'linus' into core/softirq
Diffstat (limited to 'block/elevator.c')
| -rw-r--r-- | block/elevator.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/block/elevator.c b/block/elevator.c index 980f8ae147b4..902dd1344d56 100644 --- a/block/elevator.c +++ b/block/elevator.c | |||
| @@ -1110,6 +1110,8 @@ static int elevator_switch(struct request_queue *q, struct elevator_type *new_e) | |||
| 1110 | queue_flag_clear(QUEUE_FLAG_ELVSWITCH, q); | 1110 | queue_flag_clear(QUEUE_FLAG_ELVSWITCH, q); |
| 1111 | spin_unlock_irq(q->queue_lock); | 1111 | spin_unlock_irq(q->queue_lock); |
| 1112 | 1112 | ||
| 1113 | blk_add_trace_msg(q, "elv switch: %s", e->elevator_type->elevator_name); | ||
| 1114 | |||
| 1113 | return 1; | 1115 | return 1; |
| 1114 | 1116 | ||
| 1115 | fail_register: | 1117 | fail_register: |