diff options
Diffstat (limited to 'lib/cmdline.c')
-rw-r--r-- | lib/cmdline.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/lib/cmdline.c b/lib/cmdline.c index d4932f745e92..76a712e6e20e 100644 --- a/lib/cmdline.c +++ b/lib/cmdline.c | |||
@@ -121,11 +121,7 @@ EXPORT_SYMBOL(get_options); | |||
121 | * @retptr: (output) Optional pointer to next char after parse completes | 121 | * @retptr: (output) Optional pointer to next char after parse completes |
122 | * | 122 | * |
123 | * Parses a string into a number. The number stored at @ptr is | 123 | * Parses a string into a number. The number stored at @ptr is |
124 | * potentially suffixed with %K (for kilobytes, or 1024 bytes), | 124 | * potentially suffixed with K, M, G, T, P, E. |
125 | * %M (for megabytes, or 1048576 bytes), or %G (for gigabytes, or | ||
126 | * 1073741824). If the number is suffixed with K, M, or G, then | ||
127 | * the return value is the number multiplied by one kilobyte, one | ||
128 | * megabyte, or one gigabyte, respectively. | ||
129 | */ | 125 | */ |
130 | 126 | ||
131 | unsigned long long memparse(const char *ptr, char **retptr) | 127 | unsigned long long memparse(const char *ptr, char **retptr) |
@@ -135,6 +131,15 @@ unsigned long long memparse(const char *ptr, char **retptr) | |||
135 | unsigned long long ret = simple_strtoull(ptr, &endptr, 0); | 131 | unsigned long long ret = simple_strtoull(ptr, &endptr, 0); |
136 | 132 | ||
137 | switch (*endptr) { | 133 | switch (*endptr) { |
134 | case 'E': | ||
135 | case 'e': | ||
136 | ret <<= 10; | ||
137 | case 'P': | ||
138 | case 'p': | ||
139 | ret <<= 10; | ||
140 | case 'T': | ||
141 | case 't': | ||
142 | ret <<= 10; | ||
138 | case 'G': | 143 | case 'G': |
139 | case 'g': | 144 | case 'g': |
140 | ret <<= 10; | 145 | ret <<= 10; |