diff -Naru a/drivers/scsi/aic7xxx/aic79xx_osm.c b/drivers/scsi/aic7xxx/aic79xx_osm.c --- a/drivers/scsi/aic7xxx/aic79xx_osm.c 2005-11-03 00:41:16 -08:00 +++ b/drivers/scsi/aic7xxx/aic79xx_osm.c 2005-11-03 00:41:16 -08:00 @@ -513,9 +513,6 @@ struct scsi_cmnd *cmd, struct ahd_devinfo *devinfo, struct ahd_linux_target *targ); -static __inline int - ahd_linux_dv_fallback(struct ahd_softc *ahd, - struct ahd_devinfo *devinfo); static int ahd_linux_fallback(struct ahd_softc *ahd, struct ahd_devinfo *devinfo); static __inline int ahd_linux_dv_fallback(struct ahd_softc *ahd, @@ -2915,6 +2912,19 @@ ahd_unlock(ahd, &s); } +static __inline int +ahd_linux_dv_fallback(struct ahd_softc *ahd, struct ahd_devinfo *devinfo) +{ + u_long s; + int retval; + + ahd_lock(ahd, &s); + retval = ahd_linux_fallback(ahd, devinfo); + ahd_unlock(ahd, &s); + + return (retval); +} + static void ahd_linux_dv_transition(struct ahd_softc *ahd, struct scsi_cmnd *cmd, struct ahd_devinfo *devinfo, @@ -3549,19 +3559,6 @@ cmd->cmd_len = 6; cmd->cmnd[0] = START_STOP_UNIT; cmd->cmnd[4] = le | SSS_START; -} - -static __inline int -ahd_linux_dv_fallback(struct ahd_softc *ahd, struct ahd_devinfo *devinfo) -{ - u_long s; - int retval; - - ahd_lock(ahd, &s); - retval = ahd_linux_fallback(ahd, devinfo); - ahd_unlock(ahd, &s); - - return (retval); } static int # This is a BitKeeper generated diff -Nru style patch. # # ChangeSet # 2004/08/23 12:54:36-07:00 juhl-lkml@dif.dk # [PATCH] inlining errors in drivers/scsi/aic7xxx/aic79xx_osm.c # # This patch fixes the following build error (in 2.6.8-rc2-mm1) when using # gcc 3.4.0 # # drivers/scsi/aic7xxx/aic79xx_osm.c: In function `ahd_linux_dv_transition': # drivers/scsi/aic7xxx/aic79xx_osm.c:522: sorry, unimplemented: inlining failed in call to 'ahd_linux_dv_fallback': function body not available # drivers/scsi/aic7xxx/aic79xx_osm.c:3070: sorry, unimplemented: called from here # drivers/scsi/aic7xxx/aic79xx_osm.c:522: sorry, unimplemented: inlining failed in call to 'ahd_linux_dv_fallback': function body not available # drivers/scsi/aic7xxx/aic79xx_osm.c:3093: sorry, unimplemented: called from here # drivers/scsi/aic7xxx/aic79xx_osm.c:522: sorry, unimplemented: inlining failed in call to 'ahd_linux_dv_fallback': function body not available # drivers/scsi/aic7xxx/aic79xx_osm.c:3144: sorry, unimplemented: called from here # drivers/scsi/aic7xxx/aic79xx_osm.c:522: sorry, unimplemented: inlining failed in call to 'ahd_linux_dv_fallback': function body not available # drivers/scsi/aic7xxx/aic79xx_osm.c:3257: sorry, unimplemented: called from here # drivers/scsi/aic7xxx/aic79xx_osm.c:522: sorry, unimplemented: inlining failed in call to 'ahd_linux_dv_fallback': function body not available # drivers/scsi/aic7xxx/aic79xx_osm.c:3288: sorry, unimplemented: called from here # drivers/scsi/aic7xxx/aic79xx_osm.c:522: sorry, unimplemented: inlining failed in call to 'ahd_linux_dv_fallback': function body not available # drivers/scsi/aic7xxx/aic79xx_osm.c:3317: sorry, unimplemented: called from here # # It first removes a duplicate forward declaration of ahd_linux_dv_fallback # and then moves the function before its first use so inlining can succeed. # # Signed-off-by: Jesper Juhl # Signed-off-by: Andrew Morton # Signed-off-by: Linus Torvalds # # drivers/scsi/aic7xxx/aic79xx_osm.c # 2004/08/23 01:15:08-07:00 juhl-lkml@dif.dk +13 -16 # inlining errors in drivers/scsi/aic7xxx/aic79xx_osm.c #