* [patch] 2.4.23-pre8: link error with both megaraid drivers
@ 2003-10-23 15:27 Xose Vazquez Perez
2003-10-23 19:52 ` Adrian Bunk
0 siblings, 1 reply; 6+ messages in thread
From: Xose Vazquez Perez @ 2003-10-23 15:27 UTC (permalink / raw)
To: Marcelo Tosatti, linux-kernel, linux-scsi
[-- Attachment #1: Type: text/plain, Size: 324 bytes --]
Adrian Bunk wrote:
> The patch below fixes this issue by disalllowing the static inclusion of
> both drivers at the same time.
IMO this patch makes a better job. It only allows one in kernel,
and it allows two modules at same time.
xconfig and menuconfig work ok.
-thanks-
--
HTML mails are going to trash automatically
[-- Attachment #2: config-megaraid.diff --]
[-- Type: text/plain, Size: 906 bytes --]
--- linux/drivers/scsi/Config.in 2003-10-23 16:56:13.000000000 +0200
+++ new/drivers/scsi/Config.in 2003-10-23 17:00:51.000000000 +0200
@@ -66,8 +66,14 @@
dep_tristate 'AdvanSys SCSI support' CONFIG_SCSI_ADVANSYS $CONFIG_SCSI
dep_tristate 'Always IN2000 SCSI support' CONFIG_SCSI_IN2000 $CONFIG_SCSI
dep_tristate 'AM53/79C974 PCI SCSI support' CONFIG_SCSI_AM53C974 $CONFIG_SCSI $CONFIG_PCI
-dep_tristate 'AMI MegaRAID support' CONFIG_SCSI_MEGARAID $CONFIG_SCSI
-dep_tristate 'AMI MegaRAID2 support' CONFIG_SCSI_MEGARAID2 $CONFIG_SCSI
+
+if [ "$CONFIG_SCSI_MEGARAID2" != "y" ]; then
+ dep_tristate 'AMI MegaRAID support' CONFIG_SCSI_MEGARAID $CONFIG_SCSI
+fi
+
+if [ "$CONFIG_SCSI_MEGARAID" != "y" ]; then
+ dep_tristate 'AMI MegaRAID2 support' CONFIG_SCSI_MEGARAID2 $CONFIG_SCSI
+fi
dep_tristate 'BusLogic SCSI support' CONFIG_SCSI_BUSLOGIC $CONFIG_SCSI
if [ "$CONFIG_SCSI_BUSLOGIC" != "n" ]; then
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [patch] 2.4.23-pre8: link error with both megaraid drivers
2003-10-23 15:27 [patch] 2.4.23-pre8: link error with both megaraid drivers Xose Vazquez Perez
@ 2003-10-23 19:52 ` Adrian Bunk
2003-10-24 3:27 ` Xose Vazquez Perez
0 siblings, 1 reply; 6+ messages in thread
From: Adrian Bunk @ 2003-10-23 19:52 UTC (permalink / raw)
To: Xose Vazquez Perez; +Cc: Marcelo Tosatti, linux-kernel, linux-scsi
On Thu, Oct 23, 2003 at 05:27:25PM +0200, Xose Vazquez Perez wrote:
> Adrian Bunk wrote:
>
> > The patch below fixes this issue by disalllowing the static inclusion of
> > both drivers at the same time.
>
> IMO this patch makes a better job. It only allows one in kernel,
> and it allows two modules at same time.
>...
My patch allows this, too, or what did I miss?
> -thanks-
>
> --- linux/drivers/scsi/Config.in 2003-10-23 16:56:13.000000000 +0200
> +++ new/drivers/scsi/Config.in 2003-10-23 17:00:51.000000000 +0200
> @@ -66,8 +66,14 @@
> dep_tristate 'AdvanSys SCSI support' CONFIG_SCSI_ADVANSYS $CONFIG_SCSI
> dep_tristate 'Always IN2000 SCSI support' CONFIG_SCSI_IN2000 $CONFIG_SCSI
> dep_tristate 'AM53/79C974 PCI SCSI support' CONFIG_SCSI_AM53C974 $CONFIG_SCSI $CONFIG_PCI
> -dep_tristate 'AMI MegaRAID support' CONFIG_SCSI_MEGARAID $CONFIG_SCSI
> -dep_tristate 'AMI MegaRAID2 support' CONFIG_SCSI_MEGARAID2 $CONFIG_SCSI
> +
> +if [ "$CONFIG_SCSI_MEGARAID2" != "y" ]; then
> + dep_tristate 'AMI MegaRAID support' CONFIG_SCSI_MEGARAID $CONFIG_SCSI
> +fi
> +
> +if [ "$CONFIG_SCSI_MEGARAID" != "y" ]; then
> + dep_tristate 'AMI MegaRAID2 support' CONFIG_SCSI_MEGARAID2 $CONFIG_SCSI
> +fi
>
> dep_tristate 'BusLogic SCSI support' CONFIG_SCSI_BUSLOGIC $CONFIG_SCSI
> if [ "$CONFIG_SCSI_BUSLOGIC" != "n" ]; then
The difference between your and my patch is that your patch doesn't
allow one in kernel plus the other one modular.
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
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [patch] 2.4.23-pre8: link error with both megaraid drivers
2003-10-23 19:52 ` Adrian Bunk
@ 2003-10-24 3:27 ` Xose Vazquez Perez
0 siblings, 0 replies; 6+ messages in thread
From: Xose Vazquez Perez @ 2003-10-24 3:27 UTC (permalink / raw)
To: Adrian Bunk; +Cc: Marcelo Tosatti, linux-kernel, linux-scsi
Adrian Bunk wrote:
> On Thu, Oct 23, 2003 at 05:27:25PM +0200, Xose Vazquez Perez wrote:
>> IMO this patch makes a better job. It only allows one in kernel,
>> and it allows two modules at same time.
> My patch allows this, too, or what did I miss?
Nothing. But your patch adds too much complex code to do a single thing ;-)
> The difference between your and my patch is that your patch doesn't
> allow one in kernel plus the other one modular.
Yes. And IMO there is not need to build a module when you get
the other statically inside the kernel. I can not imagine what will happen
if one is statically inside the kernel and someone try to load a module :-)
--
HTML mails are going to trash automatically
^ permalink raw reply [flat|nested] 6+ messages in thread
* Linux 2.4.23-pre8
@ 2003-10-22 23:24 Marcelo Tosatti
2003-10-23 14:07 ` [patch] 2.4.23-pre8: link error with both megaraid drivers Adrian Bunk
0 siblings, 1 reply; 6+ messages in thread
From: Marcelo Tosatti @ 2003-10-22 23:24 UTC (permalink / raw)
To: linux-kernel
Hi,
Here goes -pre8... It contains a quite big amount of ACPI fixes,
networking changes, network driver changes, few IDE fixes, SPARC merge, SH
merge, tmpfs fixes, NFS fixes, important VM typo fix, amongst others.
People seeing boot IDE related crashes on Alpha with previous kernels
please try this.
Have fun
Summary of changes from v2.4.23-pre7 to v2.4.23-pre8
============================================
<daniel:deadlock.et.tudelft.nl>:
o atyfb ibook fix
<gorgo:thunderchild.debian.net>:
o [NET]: Fix get_random_bytes() call in sunhme.c:get_hme_mac_nonsparc()
<ja:ssi.bg>:
o [IPV4]: ip_fragment must copy the nfcache field
<len.brown:intel.com>:
o [ACPI] Summary of changes for ACPICA version 20031002
o [ACPI] fix acpi_asus module build (Stephen Hemminger)
o [ACPI] delete descriptions for stale ACPI build options
o [ACPI] speed up reads from /proc/acpi/ (Shaohua David Li) http://bugme.osdl.org/show_bug.cgi?id=726
o [ACPI] fix object reference count bug for battery status (Shaohua David Li) http://bugme.osdl.org/show_bug.cgi?id=1038
o [ACPI] acpi_ec_gpe_query(ec) fix for T40 crash (Shaohua David Li) http://bugme.osdl.org/show_bug.cgi?id=1171
o [ACPI] correct parameter to acpi_ev_gpe_dispatch() (Shaohua David Li)
o [ACPI] correct parameter to acpi_ev_gpe_dispatch() take II (Bob Moore)
o [ACPI] fix !CONFIG_PCI build use X86 ACPI specific version of eisa_set_level_irq() http://bugzilla.kernel.org/show_bug.cgi?id=1390
o [ACPI] fix use_acpi_pci !CONFIG_PCI build error per 2.6 http://bugzilla.kernel.org/show_bug.cgi?id=1392
o [ACPI] Broken fan detection prevents booting (Shaohua David Li) http://bugme.osdl.org/show_bug.cgi?id=1185
<lethal:unusual.internal.linux-sh.org>:
o sh: signal trampoline workaround for SH-4 core bug
o sh: irq_intc2 updates
o sh: Add BPS_230400 definition to sh-sci
o sh64: Add pcibios_scan_all_fns() definition
<marcelo:logos.cnet>:
o Al Viro: Clear all flags in exec_usermodehelper
o x86: Clear IRQ_INPROGRESS in setup_irq()
o MIPS/MIPS64: Clear IRQ_INPROGRESS in setup_irq()
o Remove parcelfarce email from CREDITS
o Shantanu Goel: Fix merge mistake in refill_inactive()
o Changed EXTRAVERSION to -pre8
o ide-disk.c: Limit disk size to 137GB if LBA48 is not available
o Jan Niehusmann: Make LBA48 work in pdc202xx_old.c
<mroos:linux.ee>:
o [SPARC]: Use NR_CPUS for linux_cpus[]
<pp:ee.oulu.fi>:
o b44 enable interrupts after tx timeout (2.4.23-pre6)
<sheilds:msrl.com>:
o [SPARC64]: Fix typo in bbc_envctrl.c
<wensong:linux-vs.org>:
o [IPVS] Fix to set the statistics of dest zero when bound to a new service
o [IPVS]: Fix ip_vs_ftp to use cp->vaddr because iph->daddr is already mangled
<xose:wanadoo.es>:
o change sym53c8xx.o to sym53c8xx_2.o in Configure.help
Alexander Viro:
o Alpha: clear IRQ_INPROGRESS in setup_irq()
o fix for do_tty_hangup() access of kfreed memory
Bartlomiej Zolnierkiewicz:
o fix ServerWorks PIO auto-tuning
Chas Williams:
o [ATM]: rewrite recvmsg to use skb_copy_datagram_iovec
o [ATM]: remove listenq and backlog_quota from struct atm_vcc
o [ATM]: cleanup connect
o [ATM]: eliminate SOCKOPS_WRAPPED
o [ATM]: move vcc's to global sk-based linked list
o [ATM]: setsockopt/getsockopt cleanup
David S. Miller:
o [SPARC64]: Always use sethi+jmpl to reach VISenter{,half}
o [SPARC64]: Implement force_successful_syscall_return()
o [NET]: linux/in.h needs linux/socket.h
o [VLAN]: kfree(skb) --> kfree_skb(skb)
o [SPARC64]: Update defconfig
o [SPARC]: Audit inline asm
Eric Brower:
o [SPARC64]: Fix kernel_thread() return value check in envctrl.c
Hugh Dickins:
o tmpfs 1/5 LTP ENAMETOOLONG
o tmpfs 2/5 LTP S_ISGID dir
o tmpfs 3/5 swapoff/truncate race
o tmpfs 4/5 getpage/truncate race
o tmpfs 5/5 writepage/truncate race
Jeff Garzik:
o [netdrvr xircom_cb] backport 2.6 changes
o [netdrvr 8139too] add pci id
o [netdrvr 8139too] another new PCI ID
o [netdrvr tulip] add pci id
Manfred Spraul:
o [netdrvr natsemi] fix ring clean
Martin Josefsson:
o [NETFILTER]: Remove unused destroy callback in ip6t_ipv6header.c, from Maciej Soltysiak
Matt Domsch:
o Fix megaraid2 compilation problems
Michael Shields:
o [SPARC64]: Fix watchdog on CP1500/Netra-t1
Mikael Pettersson:
o APICBASE fix backport from 2.6
Mirko Lindner:
o sk98lin-2.4: Driver update to version 6.18
Neil Brown:
o Remove un-necessary locking in lockd
Olaf Hering:
o [IRDA]: Fix build with gcc-3.4
o Fix NinjaSCSI compilation
Patrick McHardy:
o [NETFILTER]: Add size check to ip_nat_mangle_udp_packet
Scott Feldman:
o ethtool_ops eeprom stuff
o hang on ZEROCOPY/TSO when hitting no-Tx-resources
Trond Myklebust:
o Fix a deadlock in the NFS asynchronous write code
o A request cannot be used as part of the RTO estimation if it gets
resent since you don't know whether the server is replying to the
first or the second transmission. However we're currently setting the
cutoff point to be the timeout of the first transmission.
o UDP round trip timer fix. Modify Karn's algorithm so that we inherit timeouts from previous requests.
o Increase the minimum RTO timer value to 1/10 second. This is more in line with what is done for TCP.
o Fix a stack overflow problem that was noticed by Jeff Garzik by removing some unused readdirplus cruft.
o Make the client act correctly if the RPC server's asserts that it does not support a given program, version or procedure call.
^ permalink raw reply [flat|nested] 6+ messages in thread* [patch] 2.4.23-pre8: link error with both megaraid drivers
2003-10-22 23:24 Linux 2.4.23-pre8 Marcelo Tosatti
@ 2003-10-23 14:07 ` Adrian Bunk
2003-10-23 14:18 ` Matthew Wilcox
0 siblings, 1 reply; 6+ messages in thread
From: Adrian Bunk @ 2003-10-23 14:07 UTC (permalink / raw)
To: Marcelo Tosatti, Matt Domsch, linux-scsi; +Cc: linux-kernel
On Wed, Oct 22, 2003 at 09:24:17PM -0200, Marcelo Tosatti wrote:
>...
> Summary of changes from v2.4.23-pre7 to v2.4.23-pre8
> ============================================
>...
> Matt Domsch:
> o Fix megaraid2 compilation problems
>...
Trying to compile both megaraid drivers statically into the kernel still
fails with the following link error:
<-- snip -->
...
ld -m elf_i386 -r -o scsidrv.o scsi_mod.o sim710.o advansys.o pci2000.o
pci2220i.o psi240i.o BusLogic.o dpt_i2o.o u14-34f.o ultrastor.o aha152x.o
aha1542.o aha1740.o aacraid/aacraid.o aic7xxx/aic7xxx.o aic7xxx/aic79xx.o ips.o
fd_mcs.o fdomain.o in2000.o g_NCR5380.o NCR53c406a.o NCR_D700.o 53c700.o sym53c416.o
qlogicfas.o qlogicisp.o qlogicfc.o qla1280.o pas16.o seagate.o t128.o dmx3191d.o
dtc.o 53c7,8xx.o sym53c8xx_2/sym53c8xx_2.o eata_dma.o eata_pio.o wd7000.o
NCR53C9x.o mca_53c9x.o ibmmca.o eata.o tmscsim.o AM53C974.o megaraid.o megaraid2.o
atp870u.o gdth.o initio.o a100u2w.o ide-scsi.o 3w-xxxx.o ppa.o imm.o scsi_debug.o
cpqfc.o nsp32.o st.o osst.o sd_mod.o sr_mod.o sg.o
megaraid2.o(.text+0x1ff0): In function `megaraid_info':
: multiple definition of `megaraid_info'
megaraid.o(.text+0x29f8): first defined here
ld: Warning: size of symbol `megaraid_info' changed from 67 in
megaraid.o to 57 in megaraid2.o
make[3]: *** [scsidrv.o] Error 1
make[3]: Leaving directory `/home/bunk/linux/kernel-2.4/linux/kernel-2.4/linux-2.4.23-pre8-full/drivers/scsi'
<-- snip -->
The patch below fixes this issue by disalllowing the static inclusion of
both drivers at the same time.
cu
Adrian
--- linux-2.4.23-pre7-full/drivers/scsi/Config.in.old 2003-10-11 17:00:47.000000000 +0200
+++ linux-2.4.23-pre7-full/drivers/scsi/Config.in 2003-10-11 17:24:00.000000000 +0200
@@ -67,7 +67,12 @@
dep_tristate 'Always IN2000 SCSI support' CONFIG_SCSI_IN2000 $CONFIG_SCSI
dep_tristate 'AM53/79C974 PCI SCSI support' CONFIG_SCSI_AM53C974 $CONFIG_SCSI $CONFIG_PCI
dep_tristate 'AMI MegaRAID support' CONFIG_SCSI_MEGARAID $CONFIG_SCSI
-dep_tristate 'AMI MegaRAID2 support' CONFIG_SCSI_MEGARAID2 $CONFIG_SCSI
+if [ "$CONFIG_SCSI_MEGARAID" != "y" ]; then
+ define_tristate CONFIG_SCSI_MEGARAID2_DEP $CONFIG_SCSI
+else
+ define_tristate CONFIG_SCSI_MEGARAID2_DEP m $CONFIG_SCSI
+fi
+dep_tristate 'AMI MegaRAID2 support' CONFIG_SCSI_MEGARAID2 $CONFIG_SCSI_MEGARAID2_DEP
dep_tristate 'BusLogic SCSI support' CONFIG_SCSI_BUSLOGIC $CONFIG_SCSI
if [ "$CONFIG_SCSI_BUSLOGIC" != "n" ]; then
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [patch] 2.4.23-pre8: link error with both megaraid drivers
2003-10-23 14:07 ` [patch] 2.4.23-pre8: link error with both megaraid drivers Adrian Bunk
@ 2003-10-23 14:18 ` Matthew Wilcox
2003-10-23 19:42 ` Adrian Bunk
0 siblings, 1 reply; 6+ messages in thread
From: Matthew Wilcox @ 2003-10-23 14:18 UTC (permalink / raw)
To: Adrian Bunk; +Cc: Marcelo Tosatti, Matt Domsch, linux-scsi, linux-kernel
On Thu, Oct 23, 2003 at 04:07:43PM +0200, Adrian Bunk wrote:
> --- linux-2.4.23-pre7-full/drivers/scsi/Config.in.old 2003-10-11 17:00:47.000000000 +0200
> +++ linux-2.4.23-pre7-full/drivers/scsi/Config.in 2003-10-11 17:24:00.000000000 +0200
> -dep_tristate 'AMI MegaRAID2 support' CONFIG_SCSI_MEGARAID2 $CONFIG_SCSI
> +if [ "$CONFIG_SCSI_MEGARAID" != "y" ]; then
> + define_tristate CONFIG_SCSI_MEGARAID2_DEP $CONFIG_SCSI
> +else
> + define_tristate CONFIG_SCSI_MEGARAID2_DEP m $CONFIG_SCSI
> +fi
> +dep_tristate 'AMI MegaRAID2 support' CONFIG_SCSI_MEGARAID2 $CONFIG_SCSI_MEGARAID2_DEP
define_tristate?! Did you actually try this?
--
"It's not Hollywood. War is real, war is primarily not about defeat or
victory, it is about death. I've seen thousands and thousands of dead bodies.
Do you think I want to have an academic debate on this subject?" -- Robert Fisk
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [patch] 2.4.23-pre8: link error with both megaraid drivers
2003-10-23 14:18 ` Matthew Wilcox
@ 2003-10-23 19:42 ` Adrian Bunk
0 siblings, 0 replies; 6+ messages in thread
From: Adrian Bunk @ 2003-10-23 19:42 UTC (permalink / raw)
To: Matthew Wilcox; +Cc: Marcelo Tosatti, Matt Domsch, linux-scsi, linux-kernel
On Thu, Oct 23, 2003 at 03:18:12PM +0100, Matthew Wilcox wrote:
> On Thu, Oct 23, 2003 at 04:07:43PM +0200, Adrian Bunk wrote:
> > --- linux-2.4.23-pre7-full/drivers/scsi/Config.in.old 2003-10-11 17:00:47.000000000 +0200
> > +++ linux-2.4.23-pre7-full/drivers/scsi/Config.in 2003-10-11 17:24:00.000000000 +0200
> > -dep_tristate 'AMI MegaRAID2 support' CONFIG_SCSI_MEGARAID2 $CONFIG_SCSI
> > +if [ "$CONFIG_SCSI_MEGARAID" != "y" ]; then
> > + define_tristate CONFIG_SCSI_MEGARAID2_DEP $CONFIG_SCSI
> > +else
> > + define_tristate CONFIG_SCSI_MEGARAID2_DEP m $CONFIG_SCSI
> > +fi
> > +dep_tristate 'AMI MegaRAID2 support' CONFIG_SCSI_MEGARAID2 $CONFIG_SCSI_MEGARAID2_DEP
>
> define_tristate?! Did you actually try this?
Yes, I tried it.
What exactly isn't working for you?
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
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2003-10-24 3:27 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2003-10-23 15:27 [patch] 2.4.23-pre8: link error with both megaraid drivers Xose Vazquez Perez
2003-10-23 19:52 ` Adrian Bunk
2003-10-24 3:27 ` Xose Vazquez Perez
-- strict thread matches above, loose matches on Subject: below --
2003-10-22 23:24 Linux 2.4.23-pre8 Marcelo Tosatti
2003-10-23 14:07 ` [patch] 2.4.23-pre8: link error with both megaraid drivers Adrian Bunk
2003-10-23 14:18 ` Matthew Wilcox
2003-10-23 19:42 ` Adrian Bunk
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.