From mboxrd@z Thu Jan  1 00:00:00 1970
From: Russell King <rmk@arm.linux.org.uk>
Subject: Re: cpufreq/linux/arch/arm/mach-sa1100 cpu-sa1100.c, 1.4,
	1.5 cpu-sa1110.c, 1.10, 1.11
Date: Wed, 5 Nov 2003 20:13:14 +0000
Sender: cpufreq-bounces@www.linux.org.uk
Message-ID: <20031105201314.A2986@flint.arm.linux.org.uk>
References: <E1AHSO6-0000Zc-U1@flint.arm.linux.org.uk>
Mime-Version: 1.0
Return-path: <cpufreq-bounces@www.linux.org.uk>
Content-Disposition: inline
In-Reply-To: <E1AHSO6-0000Zc-U1@flint.arm.linux.org.uk>;
	from ducrot@arm.linux.org.uk on Wed, Nov 05, 2003 at 06:28:14PM
	+0000
List-Id: <cpufreq.vger.kernel.org>
List-Unsubscribe: <http://www.linux.org.uk/mailman/listinfo/cpufreq>,
	<mailto:cpufreq-request@www.linux.org.uk?subject=unsubscribe>
List-Archive: <http://www.linux.org.uk/mailman/private/cpufreq>
List-Post: <mailto:cpufreq@www.linux.org.uk>
List-Help: <mailto:cpufreq-request@www.linux.org.uk?subject=help>
List-Subscribe: <http://www.linux.org.uk/mailman/listinfo/cpufreq>,
	<mailto:cpufreq-request@www.linux.org.uk?subject=subscribe>
Errors-To: cpufreq-bounces@www.linux.org.uk
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: Ducrot Bruno <ducrot@arm.linux.org.uk>
Cc: cpufreq@lists.arm.linux.org.uk

On Wed, Nov 05, 2003 at 06:28:14PM +0000, Ducrot Bruno wrote:
> --- cpu-sa1110.c	19 Aug 2003 13:38:32 -0000	1.10
> +++ cpu-sa1110.c	5 Nov 2003 18:27:41 -0000	1.11
> @@ -270,8 +270,12 @@
>  	 * We wait 20ms to be safe.
>  	 */
>  	sdram_set_refresh(2);
> +	if (!irqs_disabled()) {
>  	set_current_state(TASK_UNINTERRUPTIBLE);
>  	schedule_timeout(20 * HZ / 1000);
> +	} else {
> +		mdelay(20);
> +	}

Hmm, this doesn't look right.  Did you apply a patch generated by ignoring
space changes, 'cause this doesn't reflect what is actually in Linus tree,
which is:

	if (!irqs_disabled()) {
		set_current_state(TASK_UNINTERRUPTIBLE);
		schedule_timeout(20 * HZ / 1000);
	} else {
		mdelay(20);
	}


-- 
Russell King
 Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:  2.6 PCMCIA      - http://pcmcia.arm.linux.org.uk/
                 2.6 Serial core