From 50f25e3dbd6cb499fd9e5c6067c4deb670fc901a Mon Sep 17 00:00:00 2001 From: Kyle McMartin Date: Mon, 28 Aug 2006 15:42:07 -0400 Subject: [PATCH] --- yaml --- r: 38522 b: refs/heads/master c: 9c2c54574e724589858ad656a507be29f9034943 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/parisc/kernel/entry.S | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index bcc9056b80be..6ef943a64e4b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 136ce40e9f1f24ca1dbf7714c669a7bca56440ea +refs/heads/master: 9c2c54574e724589858ad656a507be29f9034943 diff --git a/trunk/arch/parisc/kernel/entry.S b/trunk/arch/parisc/kernel/entry.S index d55b45d54f4d..340b5e8d67ba 100644 --- a/trunk/arch/parisc/kernel/entry.S +++ b/trunk/arch/parisc/kernel/entry.S @@ -1069,7 +1069,7 @@ intr_do_preempt: BL preempt_schedule_irq, %r2 nop - b intr_restore /* ssm PSW_SM_I done by intr_restore */ + b,n intr_restore /* ssm PSW_SM_I done by intr_restore */ #endif /* CONFIG_PREEMPT */ .import do_signal,code