summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcos Paulo de Souza <marcos.souza.org@gmail.com>2019-08-27 21:19:27 -0400
committerJens Axboe <axboe@kernel.dk>2019-09-03 10:02:53 -0400
commit85c0a037dc7a1a34d6add49d6eaa2deddbf43d7b (patch)
tree104a5e546143ac35762b9cb794ee0a09443f7c3f
parentcb8acabbe33b110157955a7425ee876fb81e6bbc (diff)
block: elevator.c: Remove now unused elevator= argument
Since the inclusion of blk-mq, elevator argument was not being considered anymore, and it's utility died long with the legacy IO path, now removed too. Reviewed-by: Hannes Reinecke <hare@suse.com> Reviewed-by: Bob Liu <bob.liu@oracle.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Marcos Paulo de Souza <marcos.souza.org@gmail.com> Fold with doc removal patch. Signed-off-by: Jens Axboe <axboe@kernel.dk>
-rw-r--r--Documentation/admin-guide/kernel-parameters.txt6
-rw-r--r--block/elevator.c14
2 files changed, 0 insertions, 20 deletions
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 7ccd158b3894..8e68e8188751 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -1197,12 +1197,6 @@
1197 See comment before function elanfreq_setup() in 1197 See comment before function elanfreq_setup() in
1198 arch/x86/kernel/cpu/cpufreq/elanfreq.c. 1198 arch/x86/kernel/cpu/cpufreq/elanfreq.c.
1199 1199
1200 elevator= [IOSCHED]
1201 Format: { "mq-deadline" | "kyber" | "bfq" }
1202 See Documentation/block/deadline-iosched.rst,
1203 Documentation/block/kyber-iosched.rst and
1204 Documentation/block/bfq-iosched.rst for details.
1205
1206 elfcorehdr=[size[KMG]@]offset[KMG] [IA64,PPC,SH,X86,S390] 1200 elfcorehdr=[size[KMG]@]offset[KMG] [IA64,PPC,SH,X86,S390]
1207 Specifies physical address of start of kernel core 1201 Specifies physical address of start of kernel core
1208 image elf header and optionally the size. Generally 1202 image elf header and optionally the size. Generally
diff --git a/block/elevator.c b/block/elevator.c
index 4781c4205a5d..86100de88883 100644
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -135,20 +135,6 @@ static struct elevator_type *elevator_get(struct request_queue *q,
135 return e; 135 return e;
136} 136}
137 137
138static char chosen_elevator[ELV_NAME_MAX];
139
140static int __init elevator_setup(char *str)
141{
142 /*
143 * Be backwards-compatible with previous kernels, so users
144 * won't get the wrong elevator.
145 */
146 strncpy(chosen_elevator, str, sizeof(chosen_elevator) - 1);
147 return 1;
148}
149
150__setup("elevator=", elevator_setup);
151
152static struct kobj_type elv_ktype; 138static struct kobj_type elv_ktype;
153 139
154struct elevator_queue *elevator_alloc(struct request_queue *q, 140struct elevator_queue *elevator_alloc(struct request_queue *q,