Merge with Linux 2.4.0-test10.

17 files changed, 42 insertions, 51 deletions

diff --git a/arch/alpha/kernel/core_cia.c b/arch/alpha/kernel/core_cia.c
index c686fd29d..1b1f46867 100644
--- a/arch/alpha/kernel/core_cia.c
+++ b/arch/alpha/kernel/core_cia.c
@@ -399,7 +399,7 @@ verify_tb_operation(void)
 {
 	static int page[PAGE_SIZE/4]
 		__attribute__((aligned(PAGE_SIZE)))
-		__initlocaldata = { 0 };
+		__initdata = { 0 };
 
 	struct pci_iommu_arena *arena = pci_isa_hose->sg_isa;
 	int ctrl, addr0, tag0, pte0, data0;
diff --git a/arch/alpha/kernel/setup.c b/arch/alpha/kernel/setup.c
index 4aded0d6a..8a5c12e08 100644
--- a/arch/alpha/kernel/setup.c
+++ b/arch/alpha/kernel/setup.c
@@ -449,17 +449,13 @@ static int __init srm_console_setup(struct console *co, char *options)
 }
 
 static struct console srmcons = {
-        "srm0",
-        srm_console_write,
-        NULL,
-        srm_console_device,
-        srm_console_wait_key,
-        NULL,
-	srm_console_setup,
-        CON_PRINTBUFFER | CON_ENABLED, /* fake it out */
-        -1,
-        0,
-        NULL
+	name:		"srm0",
+	write:		srm_console_write,
+	device:		srm_console_device,
+	wait_key:	srm_console_wait_key,
+	setup:		srm_console_setup,
+	flags:		CON_PRINTBUFFER | CON_ENABLED, /* fake it out */
+	index:		-1,
 };
 
 #else
@@ -683,7 +679,7 @@ static int tsunami_indices[] = {0,1,2,3,4,5,6,7,8};
 static struct alpha_machine_vector * __init
 get_sysvec(long type, long variation, long cpu)
 {
-	static struct alpha_machine_vector *systype_vecs[] __initlocaldata =
+	static struct alpha_machine_vector *systype_vecs[] __initdata =
 	{
 		NULL,		/* 0 */
 		NULL,		/* ADU */
@@ -726,48 +722,48 @@ get_sysvec(long type, long variation, long cpu)
 		NULL,		/* Titan */
 	};
 
-	static struct alpha_machine_vector *unofficial_vecs[] __initlocaldata =
+	static struct alpha_machine_vector *unofficial_vecs[] __initdata =
 	{
 		NULL,		/* 100 */
 		&ruffian_mv,
 	};
 
-	static struct alpha_machine_vector *api_vecs[] __initlocaldata =
+	static struct alpha_machine_vector *api_vecs[] __initdata =
 	{
 		NULL,		/* 200 */
 		&nautilus_mv,
 	};
 
-	static struct alpha_machine_vector *alcor_vecs[] __initlocaldata = 
+	static struct alpha_machine_vector *alcor_vecs[] __initdata = 
 	{
 		&alcor_mv, &xlt_mv, &xlt_mv
 	};
 
-	static struct alpha_machine_vector *eb164_vecs[] __initlocaldata =
+	static struct alpha_machine_vector *eb164_vecs[] __initdata =
 	{
 		&eb164_mv, &pc164_mv, &lx164_mv, &sx164_mv, &rx164_mv
 	};
 
-	static struct alpha_machine_vector *eb64p_vecs[] __initlocaldata =
+	static struct alpha_machine_vector *eb64p_vecs[] __initdata =
 	{
 		&eb64p_mv,
 		&cabriolet_mv,
 		&cabriolet_mv		/* AlphaPCI64 */
 	};
 
-	static struct alpha_machine_vector *eb66_vecs[] __initlocaldata =
+	static struct alpha_machine_vector *eb66_vecs[] __initdata =
 	{
 		&eb66_mv,
 		&eb66p_mv
 	};
 
-	static struct alpha_machine_vector *titan_vecs[] __initlocaldata =
+	static struct alpha_machine_vector *titan_vecs[] __initdata =
 	{
 		NULL,
 		&privateer_mv,		/* privateer */
 	};
 
-	static struct alpha_machine_vector *tsunami_vecs[]  __initlocaldata =
+	static struct alpha_machine_vector *tsunami_vecs[]  __initdata =
 	{
 		NULL,
 		&dp264_mv,		/* dp264 */
@@ -860,7 +856,7 @@ get_sysvec(long type, long variation, long cpu)
 static struct alpha_machine_vector * __init
 get_sysvec_byname(const char *name)
 {
-	static struct alpha_machine_vector *all_vecs[] __initlocaldata =
+	static struct alpha_machine_vector *all_vecs[] __initdata =
 	{
 		&alcor_mv,
 		&alphabook1_mv,
diff --git a/arch/alpha/kernel/sys_alcor.c b/arch/alpha/kernel/sys_alcor.c
index 656a0a8df..5b764298a 100644
--- a/arch/alpha/kernel/sys_alcor.c
+++ b/arch/alpha/kernel/sys_alcor.c
@@ -201,7 +201,7 @@ alcor_init_irq(void)
 static int __init
 alcor_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
 {
-	static char irq_tab[7][5] __initlocaldata = {
+	static char irq_tab[7][5] __initdata = {
 		/*INT    INTA   INTB   INTC   INTD */
 		/* note: IDSEL 17 is XLT only */
 		{16+13, 16+13, 16+13, 16+13, 16+13},	/* IdSel 17,  TULIP  */
diff --git a/arch/alpha/kernel/sys_cabriolet.c b/arch/alpha/kernel/sys_cabriolet.c
index 8f456ca54..624c6732c 100644
--- a/arch/alpha/kernel/sys_cabriolet.c
+++ b/arch/alpha/kernel/sys_cabriolet.c
@@ -173,7 +173,7 @@ pc164_device_interrupt(unsigned long v, struct pt_regs *r)
 static inline int __init
 eb66p_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
 {
-	static char irq_tab[5][5] __initlocaldata = {
+	static char irq_tab[5][5] __initdata = {
 		/*INT  INTA  INTB  INTC   INTD */
 		{16+0, 16+0, 16+5,  16+9, 16+13},  /* IdSel 6,  slot 0, J25 */
 		{16+1, 16+1, 16+6, 16+10, 16+14},  /* IdSel 7,  slot 1, J26 */
@@ -203,7 +203,7 @@ eb66p_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
 static inline int __init
 cabriolet_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
 {
-	static char irq_tab[5][5] __initlocaldata = {
+	static char irq_tab[5][5] __initdata = {
 		/*INT   INTA  INTB  INTC   INTD */
 		{ 16+2, 16+2, 16+7, 16+11, 16+15}, /* IdSel 5,  slot 2, J21 */
 		{ 16+0, 16+0, 16+5,  16+9, 16+13}, /* IdSel 6,  slot 0, J19 */
@@ -274,7 +274,7 @@ cia_cab_init_pci(void)
 static inline int __init
 alphapc164_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
 {
-	static char irq_tab[7][5] __initlocaldata = {
+	static char irq_tab[7][5] __initdata = {
 		/*INT   INTA  INTB   INTC   INTD */
 		{ 16+2, 16+2, 16+9,  16+13, 16+17}, /* IdSel  5, slot 2, J20 */
 		{ 16+0, 16+0, 16+7,  16+11, 16+15}, /* IdSel  6, slot 0, J29 */
diff --git a/arch/alpha/kernel/sys_dp264.c b/arch/alpha/kernel/sys_dp264.c
index 9f9993b6a..6197a6a14 100644
--- a/arch/alpha/kernel/sys_dp264.c
+++ b/arch/alpha/kernel/sys_dp264.c
@@ -393,7 +393,7 @@ clipper_init_irq(void)
 static int __init
 dp264_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
 {
-	static char irq_tab[6][5] __initlocaldata = {
+	static char irq_tab[6][5] __initdata = {
 		/*INT    INTA   INTB   INTC   INTD */
 		{    -1,    -1,    -1,    -1,    -1}, /* IdSel 5 ISA Bridge */
 		{ 16+ 3, 16+ 3, 16+ 2, 16+ 2, 16+ 2}, /* IdSel 6 SCSI builtin*/
@@ -427,7 +427,7 @@ dp264_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
 static int __init
 monet_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
 {
-	static char irq_tab[13][5] __initlocaldata = {
+	static char irq_tab[13][5] __initdata = {
 		/*INT    INTA   INTB   INTC   INTD */
 		{    45,    45,    45,    45,    45}, /* IdSel 3 21143 PCI1 */
 		{    -1,    -1,    -1,    -1,    -1}, /* IdSel 4 unused */
@@ -488,7 +488,7 @@ monet_swizzle(struct pci_dev *dev, u8 *pinp)
 static int __init
 webbrick_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
 {
-	static char irq_tab[13][5] __initlocaldata = {
+	static char irq_tab[13][5] __initdata = {
 		/*INT    INTA   INTB   INTC   INTD */
 		{    -1,    -1,    -1,    -1,    -1}, /* IdSel 7 ISA Bridge */
 		{    -1,    -1,    -1,    -1,    -1}, /* IdSel 8 unused */
@@ -509,7 +509,7 @@ webbrick_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
 static int __init
 clipper_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
 {
-	static char irq_tab[7][5] __initlocaldata = {
+	static char irq_tab[7][5] __initdata = {
 		/*INT    INTA   INTB   INTC   INTD */
 		{ 16+ 8, 16+ 8, 16+ 9, 16+10, 16+11}, /* IdSel 1 slot 1 */
 		{ 16+12, 16+12, 16+13, 16+14, 16+15}, /* IdSel 2 slot 2 */
diff --git a/arch/alpha/kernel/sys_eb64p.c b/arch/alpha/kernel/sys_eb64p.c
index 6acbef05c..8a98a959c 100644
--- a/arch/alpha/kernel/sys_eb64p.c
+++ b/arch/alpha/kernel/sys_eb64p.c
@@ -188,7 +188,7 @@ eb64p_init_irq(void)
 static int __init
 eb64p_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
 {
-	static char irq_tab[5][5] __initlocaldata = {
+	static char irq_tab[5][5] __initdata = {
 		/*INT  INTA  INTB  INTC   INTD */
 		{16+7, 16+7, 16+7, 16+7,  16+7},  /* IdSel 5,  slot ?, ?? */
 		{16+0, 16+0, 16+2, 16+4,  16+9},  /* IdSel 6,  slot ?, ?? */
diff --git a/arch/alpha/kernel/sys_miata.c b/arch/alpha/kernel/sys_miata.c
index f54de2c87..01ff6334e 100644
--- a/arch/alpha/kernel/sys_miata.c
+++ b/arch/alpha/kernel/sys_miata.c
@@ -151,7 +151,7 @@ miata_init_irq(void)
 static int __init
 miata_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
 {
-        static char irq_tab[18][5] __initlocaldata = {
+        static char irq_tab[18][5] __initdata = {
 		/*INT    INTA   INTB   INTC   INTD */
 		{16+ 8, 16+ 8, 16+ 8, 16+ 8, 16+ 8},  /* IdSel 14,  DC21142 */
 		{   -1,    -1,    -1,    -1,    -1},  /* IdSel 15,  EIDE    */
diff --git a/arch/alpha/kernel/sys_mikasa.c b/arch/alpha/kernel/sys_mikasa.c
index d939b2c21..298fac1b2 100644
--- a/arch/alpha/kernel/sys_mikasa.c
+++ b/arch/alpha/kernel/sys_mikasa.c
@@ -164,7 +164,7 @@ mikasa_init_irq(void)
 static int __init
 mikasa_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
 {
-	static char irq_tab[8][5] __initlocaldata = {
+	static char irq_tab[8][5] __initdata = {
 		/*INT    INTA   INTB   INTC   INTD */
 		{16+12, 16+12, 16+12, 16+12, 16+12},	/* IdSel 17,  SCSI */
 		{   -1,    -1,    -1,    -1,    -1},	/* IdSel 18,  PCEB */
diff --git a/arch/alpha/kernel/sys_noritake.c b/arch/alpha/kernel/sys_noritake.c
index 6e777c3ab..950fffcf1 100644
--- a/arch/alpha/kernel/sys_noritake.c
+++ b/arch/alpha/kernel/sys_noritake.c
@@ -205,7 +205,7 @@ noritake_init_irq(void)
 static int __init
 noritake_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
 {
-	static char irq_tab[15][5] __initlocaldata = {
+	static char irq_tab[15][5] __initdata = {
 		/*INT    INTA   INTB   INTC   INTD */
 		/* note: IDSELs 16, 17, and 25 are CORELLE only */
 		{ 16+1,  16+1,  16+1,  16+1,  16+1},  /* IdSel 16,  QLOGIC */
diff --git a/arch/alpha/kernel/sys_rawhide.c b/arch/alpha/kernel/sys_rawhide.c
index 3ccce8640..b18c148d1 100644
--- a/arch/alpha/kernel/sys_rawhide.c
+++ b/arch/alpha/kernel/sys_rawhide.c
@@ -194,7 +194,7 @@ rawhide_init_irq(void)
 static int __init
 rawhide_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
 {
-	static char irq_tab[5][5] __initlocaldata = {
+	static char irq_tab[5][5] __initdata = {
 		/*INT    INTA   INTB   INTC   INTD */
 		{ 16+16, 16+16, 16+16, 16+16, 16+16}, /* IdSel 1 SCSI PCI 1 */
 		{ 16+ 0, 16+ 0, 16+ 1, 16+ 2, 16+ 3}, /* IdSel 2 slot 2 */
diff --git a/arch/alpha/kernel/sys_ruffian.c b/arch/alpha/kernel/sys_ruffian.c
index 23069e06d..54fc93387 100644
--- a/arch/alpha/kernel/sys_ruffian.c
+++ b/arch/alpha/kernel/sys_ruffian.c
@@ -119,7 +119,7 @@ ruffian_get_bank_size(unsigned long offset)
     
 	/* Check BANK_ENABLE */
 	if (bank & 0x01) {
-		static unsigned long size[] __initlocaldata = {
+		static unsigned long size[] __initdata = {
 			0x40000000UL, /* 0x00,   1G */ 
 			0x20000000UL, /* 0x02, 512M */
 			0x10000000UL, /* 0x04, 256M */
diff --git a/arch/alpha/kernel/sys_rx164.c b/arch/alpha/kernel/sys_rx164.c
index 2d5927c84..fa237282c 100644
--- a/arch/alpha/kernel/sys_rx164.c
+++ b/arch/alpha/kernel/sys_rx164.c
@@ -164,7 +164,7 @@ static int __init
 rx164_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
 {
 #if 0
-	static char irq_tab_pass1[6][5] __initlocaldata = {
+	static char irq_tab_pass1[6][5] __initdata = {
 	  /*INT   INTA  INTB  INTC   INTD */
 	  { 16+3, 16+3, 16+8, 16+13, 16+18},      /* IdSel 5,  slot 2 */
 	  { 16+5, 16+5, 16+10, 16+15, 16+20},     /* IdSel 6,  slot 0 */
@@ -174,7 +174,7 @@ rx164_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
 	  { 16+1, 16+1, 16+6, 16+11, 16+16},      /* IdSel 10, slot 4 */
 	};
 #else
-	static char irq_tab[6][5] __initlocaldata = {
+	static char irq_tab[6][5] __initdata = {
 	  /*INT   INTA  INTB  INTC   INTD */
 	  { 16+0, 16+0, 16+6, 16+11, 16+16},      /* IdSel 5,  slot 0 */
 	  { 16+1, 16+1, 16+7, 16+12, 16+17},      /* IdSel 6,  slot 1 */
diff --git a/arch/alpha/kernel/sys_sable.c b/arch/alpha/kernel/sys_sable.c
index b27d757b2..c2513d3b8 100644
--- a/arch/alpha/kernel/sys_sable.c
+++ b/arch/alpha/kernel/sys_sable.c
@@ -255,7 +255,7 @@ sable_init_irq(void)
 static int __init
 sable_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
 {
-        static char irq_tab[9][5] __initlocaldata = {
+        static char irq_tab[9][5] __initdata = {
 		/*INT    INTA   INTB   INTC   INTD */
 		{ 32+0,  32+0,  32+0,  32+0,  32+0},  /* IdSel 0,  TULIP  */
 		{ 32+1,  32+1,  32+1,  32+1,  32+1},  /* IdSel 1,  SCSI   */
diff --git a/arch/alpha/kernel/sys_sio.c b/arch/alpha/kernel/sys_sio.c
index e378408f2..7853ad012 100644
--- a/arch/alpha/kernel/sys_sio.c
+++ b/arch/alpha/kernel/sys_sio.c
@@ -143,7 +143,7 @@ noname_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
 	 * that they use the default INTA line, if they are interrupt
 	 * driven at all).
 	 */
-	static char irq_tab[][5] __initlocaldata = {
+	static char irq_tab[][5] __initdata = {
 		/*INT A   B   C   D */
 		{ 3,  3,  3,  3,  3}, /* idsel  6 (53c810) */ 
 		{-1, -1, -1, -1, -1}, /* idsel  7 (SIO: PCI/ISA bridge) */
@@ -164,7 +164,7 @@ noname_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
 static inline int __init
 p2k_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
 {
-	static char irq_tab[][5] __initlocaldata = {
+	static char irq_tab[][5] __initdata = {
 		/*INT A   B   C   D */
 		{ 0,  0, -1, -1, -1}, /* idsel  6 (53c810) */
 		{-1, -1, -1, -1, -1}, /* idsel  7 (SIO: PCI/ISA bridge) */
diff --git a/arch/alpha/kernel/sys_sx164.c b/arch/alpha/kernel/sys_sx164.c
index 19abbb6c3..2d31435e4 100644
--- a/arch/alpha/kernel/sys_sx164.c
+++ b/arch/alpha/kernel/sys_sx164.c
@@ -96,7 +96,7 @@ sx164_init_irq(void)
 static int __init
 sx164_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
 {
-	static char irq_tab[5][5] __initlocaldata = {
+	static char irq_tab[5][5] __initdata = {
 		/*INT    INTA   INTB   INTC   INTD */
 		{ 16+ 9, 16+ 9, 16+13, 16+17, 16+21}, /* IdSel 5 slot 2 J17 */
 		{ 16+11, 16+11, 16+15, 16+19, 16+23}, /* IdSel 6 slot 0 J19 */
diff --git a/arch/alpha/kernel/sys_takara.c b/arch/alpha/kernel/sys_takara.c
index 9ebba3955..c6d858f91 100644
--- a/arch/alpha/kernel/sys_takara.c
+++ b/arch/alpha/kernel/sys_takara.c
@@ -172,7 +172,7 @@ takara_init_irq(void)
 static int __init
 takara_map_irq_srm(struct pci_dev *dev, u8 slot, u8 pin)
 {
-	static char irq_tab[15][5] __initlocaldata = {
+	static char irq_tab[15][5] __initdata = {
 		{ 16+3, 16+3, 16+3, 16+3, 16+3},   /* slot  6 == device 3 */
 		{ 16+2, 16+2, 16+2, 16+2, 16+2},   /* slot  7 == device 2 */
 		{ 16+1, 16+1, 16+1, 16+1, 16+1},   /* slot  8 == device 1 */
@@ -203,7 +203,7 @@ takara_map_irq_srm(struct pci_dev *dev, u8 slot, u8 pin)
 static int __init
 takara_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
 {
-	static char irq_tab[15][5] __initlocaldata = {
+	static char irq_tab[15][5] __initdata = {
 		{ 16+3, 16+3, 16+3, 16+3, 16+3},   /* slot  6 == device 3 */
 		{ 16+2, 16+2, 16+2, 16+2, 16+2},   /* slot  7 == device 2 */
 		{ 16+1, 16+1, 16+1, 16+1, 16+1},   /* slot  8 == device 1 */
diff --git a/arch/alpha/kernel/sys_wildfire.c b/arch/alpha/kernel/sys_wildfire.c
index 276195040..8a7ad55c4 100644
--- a/arch/alpha/kernel/sys_wildfire.c
+++ b/arch/alpha/kernel/sys_wildfire.c
@@ -302,7 +302,7 @@ wildfire_device_interrupt(unsigned long vector, struct pt_regs * regs)
 static int __init
 wildfire_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
 {
-	static char irq_tab[8][5] __initlocaldata = {
+	static char irq_tab[8][5] __initdata = {
 		/*INT    INTA   INTB   INTC   INTD */
 		{ -1,    -1,    -1,    -1,    -1}, /* IdSel 0 ISA Bridge */
 		{ 36,    36,    36+1, 36+2, 36+3}, /* IdSel 1 SCSI builtin */
@@ -326,11 +326,6 @@ wildfire_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
 	return irq;
 }
 
-static void __init
-wildfire_init_pci(void)
-{
-	common_init_pci();
-}
 
 /*
  * The System Vectors
@@ -353,7 +348,7 @@ struct alpha_machine_vector wildfire_mv __initmv = {
 	init_arch:		wildfire_init_arch,
 	init_irq:		wildfire_init_irq,
 	init_rtc:		common_init_rtc,
-	init_pci:		wildfire_init_pci,
+	init_pci:		common_init_pci,
 	kill_arch:		wildfire_kill_arch,
 	pci_map_irq:		wildfire_map_irq,
 	pci_swizzle:		common_swizzle,