diff options
| author | Bart Van Assche <bart.vanassche@wdc.com> | 2017-07-10 15:51:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-10 16:32:34 -0700 |
| commit | 287f3ca563d8ba0ede4ac0cec84218a1ea5e848f (patch) | |
| tree | a7d7292c24bc3902eaee800bd39559ecc25d81a9 /include/linux/initrd.h | |
| parent | bc6245e5efd70c41eaf9334b1b5e646745cb0fb3 (diff) | |
| download | linux-stable-287f3ca563d8ba0ede4ac0cec84218a1ea5e848f.tar.gz linux-stable-287f3ca563d8ba0ede4ac0cec84218a1ea5e848f.tar.bz2 linux-stable-287f3ca563d8ba0ede4ac0cec84218a1ea5e848f.zip | |
ARM: fix rd_size declaration
The global variable 'rd_size' is declared as 'int' in source file
arch/arm/kernel/atags_parse.c and as 'unsigned long' in
drivers/block/brd.c. Fix this inconsistency.
Additionally, remove the declarations of rd_image_start, rd_prompt and
rd_doload from parse_tag_ramdisk() since these duplicate existing
declarations in <linux/initrd.h>.
Link: http://lkml.kernel.org/r/20170627065024.12347-1-bart.vanassche@wdc.com
Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
Acked-by: Russell King <rmk+kernel@armlinux.org.uk>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Jan Kara <jack@suse.cz>
Cc: Jason Yan <yanaijie@huawei.com>
Cc: Zhaohongjiang <zhaohongjiang@huawei.com>
Cc: Miao Xie <miaoxie@huawei.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/initrd.h')
| -rw-r--r-- | include/linux/initrd.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/initrd.h b/include/linux/initrd.h index 55289d261b4f..bc67b767f9ce 100644 --- a/include/linux/initrd.h +++ b/include/linux/initrd.h @@ -10,6 +10,9 @@ extern int rd_prompt; /* starting block # of image */ extern int rd_image_start; +/* size of a single RAM disk */ +extern unsigned long rd_size; + /* 1 if it is not an error if initrd_start < memory_start */ extern int initrd_below_start_ok; |