diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-13 10:46:18 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-13 10:46:18 +0900 |
| commit | 54f7fc25e5736c39050454fe6b5a2bed027fbfab (patch) | |
| tree | 89b1d6395360c17d03a5c3900cb274932d12791e /arch/tile/kernel | |
| parent | 0c4a479bdf7c0cf3fa1610b25e0c4ddd5b58713e (diff) | |
| parent | c19c6c954b9b264abdc21e0c855118e3daf019b0 (diff) | |
| download | linux-stable-54f7fc25e5736c39050454fe6b5a2bed027fbfab.tar.gz linux-stable-54f7fc25e5736c39050454fe6b5a2bed027fbfab.tar.bz2 linux-stable-54f7fc25e5736c39050454fe6b5a2bed027fbfab.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
Pull tile arch update from Chris Metcalf:
"The bulk of this change is the tile uapi disintegration. There is
also a one-line change in here to enable interrupts in
do_work_pending() to avoid a WARN_ON in _local_bh_enable_ip()."
* git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
arch/tile: enable interrupts in do_work_pending()
UAPI: (Scripted) Disintegrate arch/tile/include/asm
UAPI: (Scripted) Disintegrate arch/tile/include/arch
Diffstat (limited to 'arch/tile/kernel')
| -rw-r--r-- | arch/tile/kernel/process.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/tile/kernel/process.c b/arch/tile/kernel/process.c index 622560030a58..307d010696c9 100644 --- a/arch/tile/kernel/process.c +++ b/arch/tile/kernel/process.c @@ -548,6 +548,9 @@ int do_work_pending(struct pt_regs *regs, u32 thread_info_flags) if (!user_mode(regs)) return 0; + /* Enable interrupts; they are disabled again on return to caller. */ + local_irq_enable(); + if (thread_info_flags & _TIF_NEED_RESCHED) { schedule(); return 1; |