Re: Linux 2.4.21-pre4

From: Adrian Bunk (bunk@fs.tum.de)
Date: Sat Feb 01 2003 - 18:24:10 EST


I get the following compile error in 2.4.21-pre4:

<-- snip -->

...
ld -m elf_i386 -r -o idedriver-raid.o ataraid.o pdcraid.o hptraid.o
silraid.o
silraid.o(.text+0x31c): In function `partition_map_normal':
: multiple definition of `partition_map_normal'
pdcraid.o(.text+0x31c): first defined here
make[4]: *** [idedriver-raid.o] Error 1
make[4]: Leaving directory
`/home/bunk/linux/kernel-2.4/linux-2.4.20-full/drivers/ide/raid'

<-- snip -->

The following patch (stolen from -ac) fixes it:

--- linux.21pre4/drivers/ide/raid/silraid.c 2003-01-29 17:07:45.000000000 +0000
+++ linux.21pre4-ac1/drivers/ide/raid/silraid.c 2003-01-09 19:43:30.000000000 +0000
@@ -157,7 +157,7 @@
 }
 
 
-unsigned long partition_map_normal(unsigned long block, unsigned long partition_off, unsigned long partition_size, int stride)
+static unsigned long partition_map_normal(unsigned long block, unsigned long partition_off, unsigned long partition_size, int stride)
 {
         return block + partition_off;
 }

cu
Adrian

-- 

"Is there not promise of rain?" Ling Tan asked suddenly out of the darkness. There had been need of rain for many days. "Only a promise," Lao Er said. Pearl S. Buck - Dragon Seed

- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Fri Feb 07 2003 - 22:00:08 EST