Re: link errors in 2.5.29+bk

[Paul Larson <plars@austin.ibm.com>]

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)