lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[S390] xpram module parameter parsing - take 2.

Browse Source 
Don't use memparse since the default size modifier is 'k'.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Heiko Carstens
2006-07-17 16:09:23 +02:00
committed by Martin Schwidefsky
parent 5a651c93d3
commit f257b06322
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/s390/block/xpram.c
View File

@@ -304,6 +304,7 @@ static int __init xpram_setup_sizes(unsigned long pages)
{ {
unsigned long mem_needed; unsigned long mem_needed;
unsigned long mem_auto; unsigned long mem_auto;
unsigned long long size;
int mem_auto_no; int mem_auto_no;
int i; int i;
@@ -321,9 +322,19 @@ static int __init xpram_setup_sizes(unsigned long pages)
mem_needed = 0; mem_needed = 0;
mem_auto_no = 0; mem_auto_no = 0;
for (i = 0; i < xpram_devs; i++) { for (i = 0; i < xpram_devs; i++) {
if (sizes[i]) if (sizes[i]) {
xpram_sizes[i] = size = simple_strtoull(sizes[i], &sizes[i], 0);
(memparse(sizes[i], &sizes[i]) + 3) & -4UL; switch (sizes[i][0]) {
case 'g':
case 'G':
size <<= 20;
break;
case 'm':
case 'M':
size <<= 10;
}
xpram_sizes[i] = (size + 3) & -4UL;
}
if (xpram_sizes[i]) if (xpram_sizes[i])
mem_needed += xpram_sizes[i]; mem_needed += xpram_sizes[i];
else else