diff --git a/block/elevator.c b/block/elevator.c
index a3b64bc71d8821fcdf4fa15dbbd0704ac34b843a..cb332cb7ac6bd6bdbc758974f5e7e32d817cbafb 100644
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -182,7 +182,7 @@ static void elevator_attach(struct request_queue *q, struct elevator_queue *eq,
 	eq->elevator_data = data;
 }
 
-static char chosen_elevator[16];
+static char chosen_elevator[ELV_NAME_MAX];
 
 static int __init elevator_setup(char *str)
 {