From c02fcf2e8678ea40f435613077dd383460fd3c4b Mon Sep 17 00:00:00 2001 From: Russell King Date: Thu, 18 Feb 2010 23:35:24 +0000 Subject: [PATCH] --- yaml --- r: 180692 b: refs/heads/master c: 2b4f0175799a5d714ff7f83bba7eae6fca268834 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/kernel/setup.c | 1 + trunk/drivers/scsi/arm/fas216.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7375b70a8efd..66587140071b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 083c88fcf1a89986ffa160826f96509fb4b370bb +refs/heads/master: 2b4f0175799a5d714ff7f83bba7eae6fca268834 diff --git a/trunk/arch/arm/kernel/setup.c b/trunk/arch/arm/kernel/setup.c index c6c57b640b6b..621acad8ea43 100644 --- a/trunk/arch/arm/kernel/setup.c +++ b/trunk/arch/arm/kernel/setup.c @@ -102,6 +102,7 @@ struct cpu_cache_fns cpu_cache; #endif #ifdef CONFIG_OUTER_CACHE struct outer_cache_fns outer_cache; +EXPORT_SYMBOL(outer_cache); #endif struct stack { diff --git a/trunk/drivers/scsi/arm/fas216.c b/trunk/drivers/scsi/arm/fas216.c index 477542602284..9e71ac611146 100644 --- a/trunk/drivers/scsi/arm/fas216.c +++ b/trunk/drivers/scsi/arm/fas216.c @@ -2516,7 +2516,7 @@ int fas216_eh_device_reset(struct scsi_cmnd *SCpnt) if (info->scsi.phase == PHASE_IDLE) fas216_kick(info); - mod_timer(&info->eh_timer, 30 * HZ); + mod_timer(&info->eh_timer, jiffies + 30 * HZ); spin_unlock_irqrestore(&info->host_lock, flags); /*