diff options
| author |   Steven J. Magnani <steve@digidescorp.com> | 2010-04-27 13:00:23 -0500 |
|---|---|---|
| committer |   Michal Simek <monstr@monstr.eu> | 2010-05-13 09:21:01 +0200 |
| commit | 0d5961b7f612f8f54fd6fbe1942cdfb141cddfb9 (patch) | |
| tree | 3e4e29715f7c49a0ebfbd76ccf72f675a4bb979f /arch/microblaze | |
| parent | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc (diff) | |
| download | linux-dev-0d5961b7f612f8f54fd6fbe1942cdfb141cddfb9.tar.xz linux-dev-0d5961b7f612f8f54fd6fbe1942cdfb141cddfb9.zip | |
microblaze: re-enable interrupts before calling schedule
schedule() should not be called with interrupts disabled.
Signed-off-by: Steven J. Magnani <steve@digidescorp.com>
Signed-off-by: Michal Simek <monstr@monstr.eu>
Diffstat (limited to 'arch/microblaze')
| -rw-r--r-- | arch/microblaze/kernel/entry-nommu.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/microblaze/kernel/entry-nommu.S b/arch/microblaze/kernel/entry-nommu.S index 391d6197fc3b..8cc18cd2cce6 100644 --- a/arch/microblaze/kernel/entry-nommu.S +++ b/arch/microblaze/kernel/entry-nommu.S @@ -476,6 +476,8 @@ ENTRY(ret_from_fork) nop work_pending: + enable_irq + andi r11, r19, _TIF_NEED_RESCHED beqi r11, 1f bralid r15, schedule |