diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-14 07:29:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-14 07:29:29 -0700 |
| commit | 7ac992ef615c66a05ebb831915935e83c0ec8e05 (patch) | |
| tree | 0bef479fccb4e73733fab628dc525a5959bba925 /arch/microblaze/kernel/entry-nommu.S | |
| parent | 6a251b0ab67989f468f4cb65179e0cf40cf8c295 (diff) | |
| parent | a5e48b88da225580394f825ffe67e444b050074b (diff) | |
Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze
* 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze:
microblaze: Fix module loading on system with WB cache
microblaze: export assembly functions used by modules
microblaze: Remove powerpc code from Microblaze port
microblaze: Remove compilation warnings in cache macro
microblaze: export assembly functions used by modules
microblaze: fix get_user/put_user side-effects
microblaze: re-enable interrupts before calling schedule
Diffstat (limited to 'arch/microblaze/kernel/entry-nommu.S')
| -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 391d6197fc3..8cc18cd2cce 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 |