Messages in this thread Patch in this message |  | | Date | Mon, 2 Oct 2000 22:48:26 +0200 | From | Rasmus Andersen <> | Subject | Re: 2.4.0-test9-pre8 |
| |
On Sun, Oct 01, 2000 at 09:14:49PM -0700, Linus Torvalds wrote: > > Last pre-kernel - I'll do the real test9 before I fly off to Germany on > Tuesday. > > Linus > --- > - pre8: > - initialize to zero -> put it in the .bss instead
This patch was inspired by a comment from Jeff Garzik. It should be correct (famous last words!) and consists of trivial changes to the affected files to correct __initdata and pointers to strings. Thus the crosspost to the maintainers, Linus and l-k. That being said, I sure hope it is correct :)
--- linux-240-test9-pre8-clean/drivers/acorn/net/etherh.c Mon Oct 2 22:33:40 2000 +++ linux/drivers/acorn/net/etherh.c Mon Oct 2 21:14:35 2000 @@ -67,7 +67,7 @@ MODULE_AUTHOR("Russell King"); MODULE_DESCRIPTION("i3 EtherH driver"); -static char *version __initdata = +static char version[] __initdata = "etherh [500/600/600A] ethernet driver (c) 2000 R.M.King v1.07\n"; #define ETHERH500_DATAPORT 0x200 /* MEMC */ --- linux-240-test9-pre8-clean/drivers/block/xd.c Mon Oct 2 22:29:44 2000 +++ linux/drivers/block/xd.c Mon Oct 2 22:06:20 2000 @@ -116,7 +116,7 @@ }; static struct hd_struct xd_struct[XD_MAXDRIVES << 6]; -static int xd_sizes[XD_MAXDRIVES << 6], xd_access[XD_MAXDRIVES] = { 0, 0 }; +static int xd_sizes[XD_MAXDRIVES << 6], xd_access[XD_MAXDRIVES]; static int xd_blocksizes[XD_MAXDRIVES << 6]; extern struct block_device_operations xd_fops; @@ -141,12 +141,12 @@ static DECLARE_WAIT_QUEUE_HEAD(xd_wait_int); static DECLARE_WAIT_QUEUE_HEAD(xd_wait_open); static u_char xd_valid[XD_MAXDRIVES] = { 0,0 }; -static u_char xd_drives = 0, xd_irq = 5, xd_dma = 3, xd_maxsectors; -static u_char xd_override __initdata = 0, xd_type = 0; +static u_char xd_drives, xd_irq = 5, xd_dma = 3, xd_maxsectors; +static u_char xd_override __initdata, xd_type __initdata; static u_short xd_iobase = 0x320; -static int xd_geo[XD_MAXDRIVES*3] __initdata = { 0,0,0,0,0,0 }; +static int xd_geo[XD_MAXDRIVES*3] __initdata; -static volatile int xdc_busy = 0; +static volatile int xdc_busy; static DECLARE_WAIT_QUEUE_HEAD(xdc_wait); static struct timer_list xd_timer, xd_watchdog_int; --- linux-240-test9-pre8-clean/drivers/net/acenic.c Mon Oct 2 22:33:48 2000 +++ linux/drivers/net/acenic.c Mon Oct 2 22:10:33 2000 @@ -393,22 +393,22 @@ #define DEF_TRACE 0 #define DEF_STAT (2 * TICKS_PER_SEC) -static int link[ACE_MAX_MOD_PARMS] = {0, }; -static int trace[ACE_MAX_MOD_PARMS] = {0, }; -static int tx_coal_tick[ACE_MAX_MOD_PARMS] = {0, }; -static int rx_coal_tick[ACE_MAX_MOD_PARMS] = {0, }; -static int max_tx_desc[ACE_MAX_MOD_PARMS] = {0, }; -static int max_rx_desc[ACE_MAX_MOD_PARMS] = {0, }; -static int tx_ratio[ACE_MAX_MOD_PARMS] = {0, }; +static int link[ACE_MAX_MOD_PARMS]; +static int trace[ACE_MAX_MOD_PARMS]; +static int tx_coal_tick[ACE_MAX_MOD_PARMS]; +static int rx_coal_tick[ACE_MAX_MOD_PARMS]; +static int max_tx_desc[ACE_MAX_MOD_PARMS]; +static int max_rx_desc[ACE_MAX_MOD_PARMS]; +static int tx_ratio[ACE_MAX_MOD_PARMS]; static int dis_pci_mem_inval[ACE_MAX_MOD_PARMS] = {1, 1, 1, 1, 1, 1, 1, 1}; -static const char __initdata *version = +static char version[] __initdata = "acenic.c: v0.47 09/18/2000 Jes Sorensen, linux-acenic@SunSITE.auc.dk\n" " http://home.cern.ch/~jes/gige/acenic.html\n"; -static struct net_device *root_dev = NULL; +static struct net_device *root_dev; -static int probed __initdata = 0; +static int probed __initdata; #ifdef NEW_NETINIT --- linux-240-test9-pre8-clean/drivers/net/rrunner.c Mon Oct 2 22:28:48 2000 +++ linux/drivers/net/rrunner.c Mon Oct 2 21:14:35 2000 @@ -102,7 +102,7 @@ * stack will need to know about I/O vectors or something similar. */ -static const char __initdata *version = "rrunner.c: v0.22 03/01/2000 Jes Sorensen (Jes.Sorensen@cern.ch)\n"; +static char version[] __initdata = "rrunner.c: v0.22 03/01/2000 Jes Sorensen (Jes.Sorensen@cern.ch)\n"; static struct net_device *root_dev = NULL; --- linux-240-test9-pre8-clean/drivers/net/3c505.c Mon Oct 2 22:33:48 2000 +++ linux/drivers/net/3c505.c Mon Oct 2 21:14:35 2000 @@ -130,15 +130,15 @@ #define INVALID_PCB_MSG(len) \ printk(invalid_pcb_msg, (len),filename,__FUNCTION__,__LINE__) -static char *search_msg __initdata = "%s: Looking for 3c505 adapter at address %#x..."; +static char search_msg[] __initdata = "%s: Looking for 3c505 adapter at address %#x..."; -static char *stilllooking_msg __initdata = "still looking..."; +static char stilllooking_msg[] __initdata = "still looking..."; -static char *found_msg __initdata = "found.\n"; +static char found_msg[] __initdata = "found.\n"; -static char *notfound_msg __initdata = "not found (reason = %d)\n"; +static char notfound_msg[] __initdata = "not found (reason = %d)\n"; -static char *couldnot_msg __initdata = "%s: 3c505 not found\n"; +static char couldnot_msg[] __initdata = "%s: 3c505 not found\n"; /********************************************************* *
-- Regards, Rasmus(rasmus@jaquet.dk)
That lowdown scoundrel deserves to be kicked to death by a jackass, and I'm just the one to do it. -A congressional candidate in Texas - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org Please read the FAQ at http://www.tux.org/lkml/
|  |