2002-07-29 10:50:15

by Meelis Roos

Subject: link errors in 2.5.29+bk

Seems to be connected to the recent migration thread changes:

init/init.o: In function `do_pre_smp_initcalls':
init/init.o(.text+0x59): undefined reference to `migration_init'

aic7xxx_old has yet to be converted to cli removal:

drivers/built-in.o: In function `aic7xxx_handle_seqint':
drivers/built-in.o(.text+0x2d2c4): undefined reference to `sti'
drivers/built-in.o: In function `aic7xxx_isr':
drivers/built-in.o(.text+0x320b4): undefined reference to `sti'


--
Meelis Roos ([email protected])

2002-07-29 12:16:30

by Stelian Pop

Subject: Re: link errors in 2.5.29+bk

On Mon, Jul 29, 2002 at 01:53:34PM +0300, Meelis Roos wrote:

> Seems to be connected to the recent migration thread changes:
>
> init/init.o: In function `do_pre_smp_initcalls':
> init/init.o(.text+0x59): undefined reference to `migration_init'

The attached patch fixes this.

===== init/main.c 1.59 vs edited =====
--- 1.59/init/main.c Mon Jul 29 08:07:28 2002
+++ edited/init/main.c Mon Jul 29 12:21:56 2002
@@ -526,10 +526,14 @@

static void do_pre_smp_initcalls(void)
{
+#if CONFIG_SMP
extern int migration_init(void);
+#endif
extern int spawn_ksoftirqd(void);

+#if CONFIG_SMP
migration_init();
+#endif
spawn_ksoftirqd();
}

Stelian.
--
Stelian Pop <[email protected]>
Alcove - http://www.alcove.com

2002-07-30 19:58:43

by Paul Larson

Subject: Re: link errors in 2.5.29+bk

On Mon, 2002-07-29 at 05:53, Meelis Roos wrote:

> aic7xxx_old has yet to be converted to cli removal:
>
> drivers/built-in.o: In function `aic7xxx_handle_seqint':
> drivers/built-in.o(.text+0x2d2c4): undefined reference to `sti'
> drivers/built-in.o: In function `aic7xxx_isr':
> drivers/built-in.o(.text+0x320b4): undefined reference to `sti'

See if this works for you.

-Paul Larson

# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet 1.525 -> 1.526
# drivers/scsi/aic7xxx_old.c 1.22 -> 1.23
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/07/30 plars@plap.(none) 1.526
#
# --------------------------------------------
#
diff -Nru a/drivers/scsi/aic7xxx_old.c b/drivers/scsi/aic7xxx_old.c
--- a/drivers/scsi/aic7xxx_old.c Tue Jul 30 14:30:14 2002
+++ b/drivers/scsi/aic7xxx_old.c Tue Jul 30 14:30:14 2002
@@ -5077,7 +5077,7 @@
}
else
{
- sti();
+ local_irq_enable();
panic("aic7xxx: AWAITING_MSG for an SCB that does "
"not have a waiting message.\n");
}
@@ -6933,7 +6933,7 @@
#endif
if (errno & (SQPARERR | ILLOPCODE | ILLSADDR))
{
- sti();
+ local_irq_enable();
panic("aic7xxx: unrecoverable BRKADRINT.\n");
}
if (errno & ILLHADDR)