ARM: fix rd_size declaration (287f3ca5) · Commits · 戴 / test

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>

arch/arm/kernel/atags_parse.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@
		*/

		#include <linux/init.h>
		#include <linux/initrd.h>
		#include <linux/kernel.h>
		#include <linux/fs.h>
		#include <linux/root_dev.h>
		@@ -91,8 +92,6 @@ __tagtable(ATAG_VIDEOTEXT, parse_tag_videotext);
		#ifdef CONFIG_BLK_DEV_RAM
		static int __init parse_tag_ramdisk(const struct tag *tag)
		{
		extern int rd_size, rd_image_start, rd_prompt, rd_doload;

		rd_image_start = tag->u.ramdisk.start;
		rd_doload = (tag->u.ramdisk.flags & 1) == 0;
		rd_prompt = (tag->u.ramdisk.flags & 2) == 0;

drivers/block/brd.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -9,6 +9,7 @@
		*/

		#include <linux/init.h>
		#include <linux/initrd.h>
		#include <linux/module.h>
		#include <linux/moduleparam.h>
		#include <linux/major.h>

include/linux/initrd.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -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;

Admin message