[PATCH] drive_info removal outside of arch/i386
drive_info is used only by hd.c and that happens under #ifdef __i386__. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Родитель
164006da31
Коммит
4fb7d9827e
|
@ -24,7 +24,6 @@
|
|||
/*
|
||||
* Setup options
|
||||
*/
|
||||
struct drive_info_struct { char dummy[32]; } drive_info;
|
||||
struct screen_info screen_info;
|
||||
|
||||
extern int root_mountflags;
|
||||
|
|
|
@ -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)
|
||||
{
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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[];
|
||||
|
||||
/*
|
||||
|
|
|
@ -82,8 +82,6 @@
|
|||
|
||||
#undef SHOW_GATWICK_IRQS
|
||||
|
||||
unsigned char drive_info;
|
||||
|
||||
int ppc_override_l2cr = 0;
|
||||
int ppc_override_l2cr_value;
|
||||
int has_l2cache = 0;
|
||||
|
|
|
@ -31,14 +31,6 @@
|
|||
|
||||
extern int dump_fpu(struct pt_regs *, elf_fpregset_t *);
|
||||
|
||||
#if 0
|
||||
/* Not yet - there's no declaration of drive_info anywhere. */
|
||||
#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
|
||||
#endif
|
||||
|
||||
/* platform dependent support */
|
||||
EXPORT_SYMBOL(dump_fpu);
|
||||
EXPORT_SYMBOL(iounmap);
|
||||
|
|
|
@ -94,7 +94,6 @@ unsigned long saved_video_mode;
|
|||
/*
|
||||
* Setup options
|
||||
*/
|
||||
struct drive_info_struct { char dummy[32]; } drive_info;
|
||||
struct screen_info screen_info;
|
||||
struct sys_desc_table_struct {
|
||||
unsigned short length;
|
||||
|
@ -572,7 +571,6 @@ void __init setup_arch(char **cmdline_p)
|
|||
unsigned long kernel_end;
|
||||
|
||||
ROOT_DEV = old_decode_dev(ORIG_ROOT_DEV);
|
||||
drive_info = DRIVE_INFO;
|
||||
screen_info = SCREEN_INFO;
|
||||
edid_info = EDID_INFO;
|
||||
saved_video_mode = SAVED_VIDEO_MODE;
|
||||
|
|
|
@ -39,11 +39,6 @@ extern void __write_lock_failed(rwlock_t *rw);
|
|||
extern void __read_lock_failed(rwlock_t *rw);
|
||||
#endif
|
||||
|
||||
#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);
|
||||
|
|
Загрузка…
Ссылка в новой задаче