From a1aa21e96eea06d0e2dffb55ebf2d2424da94ee1 Mon Sep 17 00:00:00 2001 From: Stuart MENEFY Date: Thu, 17 Jul 2008 13:08:40 +0100 Subject: [PATCH] --- yaml --- r: 106861 b: refs/heads/master c: 0b1689cfbbc5e81a121f550782a201962c1e0ce0 h: refs/heads/master i: 106859: 91e07b5f8d21aa362c412bf675b37dcdb3ccca05 v: v3 --- [refs] | 2 +- trunk/arch/sh/kernel/entry-common.S | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a959347ecc1b..8fc7c0750a41 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d7f1a9adc0e34ad4aa4fe246b264add4646ae064 +refs/heads/master: 0b1689cfbbc5e81a121f550782a201962c1e0ce0 diff --git a/trunk/arch/sh/kernel/entry-common.S b/trunk/arch/sh/kernel/entry-common.S index 718bd2356b34..5e0dd1933847 100644 --- a/trunk/arch/sh/kernel/entry-common.S +++ b/trunk/arch/sh/kernel/entry-common.S @@ -192,7 +192,7 @@ work_resched: .align 2 1: .long schedule 2: .long do_notify_resume -3: .long restore_all +3: .long resume_userspace #ifdef CONFIG_TRACE_IRQFLAGS 4: .long trace_hardirqs_on 5: .long trace_hardirqs_off