[PATCH] drive_info removal outside of arch/i386 (4fb7d982) · Commits · 戴 / test

arch/cris/kernel/setup.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -24,7 +24,6 @@
		/*
		* Setup options
		*/
		struct drive_info_struct { char dummy[32]; } drive_info;
		struct screen_info screen_info;

		extern int root_mountflags;

+0 −10

Original line number	Diff line number	Diff line
		@@ -25,16 +25,6 @@
		#include <asm/machvec.h>
		#include <asm/system.h>

		/*
		* This is here so we can use the CMOS detection in ide-probe.c to
		* determine what drives are present. In theory, we don't need this
		* as the auto-detection could be done via ide-probe.c:do_probe() but
		* in practice that would be much slower, which is painful when
		* running in the simulator. Note that passing zeroes in DRIVE_INFO
		* is sufficient (the IDE driver will autodetect the drive geometry).
		*/
		char drive_info[4*16];

		void __init
		dig_setup (char **cmdline_p)
		{

+0 −14

Original line number	Diff line number	Diff line
		@@ -124,20 +124,6 @@ struct screen_info sn_screen_info = {
		.orig_video_points = 16
		};

		/*
		* This is here so we can use the CMOS detection in ide-probe.c to
		* determine what drives are present. In theory, we don't need this
		* as the auto-detection could be done via ide-probe.c:do_probe() but
		* in practice that would be much slower, which is painful when
		* running in the simulator. Note that passing zeroes in DRIVE_INFO
		* is sufficient (the IDE driver will autodetect the drive geometry).
		*/
		#ifdef CONFIG_IA64_GENERIC
		extern char drive_info[4 * 16];
		#else
		char drive_info[4 * 16];
		#endif

		/*
		* This routine can only be used during init, since
		* smp_boot_data is an init data structure.

+0 −5

Original line number	Diff line number	Diff line
		@@ -18,11 +18,6 @@
		#include <asm/irq.h>
		#include <asm/tlbflush.h>

		#if defined(CONFIG_BLK_DEV_IDE) \|\| defined(CONFIG_BLK_DEV_HD) \|\| defined(CONFIG_BLK_DEV_IDE_MODULE) \|\| defined(CONFIG_BLK_DEV_HD_MODULE)
		extern struct drive_info_struct drive_info;
		EXPORT_SYMBOL(drive_info);
		#endif

		/* platform dependent support */
		EXPORT_SYMBOL(boot_cpu_data);
		EXPORT_SYMBOL(dump_fpu);

+0 −6

Original line number	Diff line number	Diff line
		@@ -37,12 +37,6 @@
		extern void init_mmu(void);
		#endif

		#if defined(CONFIG_BLK_DEV_IDE) \|\| defined(CONFIG_BLK_DEV_HD) \
		\|\| defined(CONFIG_BLK_DEV_IDE_MODULE) \
		\|\| defined(CONFIG_BLK_DEV_HD_MODULE)
		struct drive_info_struct { char dummy[32]; } drive_info;
		#endif

		extern char _end[];

		/*