diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-29 08:30:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-29 08:30:47 -0700 |
| commit | df45eddc60e1ab4c81b61e240271eabb4fb176e8 (patch) | |
| tree | 7cbaf1a7a191f7b6274afbc071bbc1453f73d668 /arch/m32r/kernel/entry.S | |
| parent | 929675d58c5b4883050804f2b48de2293803862d (diff) | |
| parent | 81e4807303c416a0defdce8b23a6204416d33280 (diff) | |
| download | talos-obmc-linux-df45eddc60e1ab4c81b61e240271eabb4fb176e8.tar.gz talos-obmc-linux-df45eddc60e1ab4c81b61e240271eabb4fb176e8.zip | |
Merge branch 'linux-m32r' of git://www.linux-m32r.org/git/takata/linux-2.6_dev
* 'linux-m32r' of git://www.linux-m32r.org/git/takata/linux-2.6_dev:
m32r/kernel/: cleanups
m32r: export __ndelay
m32r: export empty_zero_page
m32r: don't offer CONFIG_ISA
m32r: remove the unused NOHIGHMEM option
Diffstat (limited to 'arch/m32r/kernel/entry.S')
| -rw-r--r-- | arch/m32r/kernel/entry.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m32r/kernel/entry.S b/arch/m32r/kernel/entry.S index d4eaa2fd1818..612d35b082a6 100644 --- a/arch/m32r/kernel/entry.S +++ b/arch/m32r/kernel/entry.S @@ -143,7 +143,7 @@ ret_from_intr: and3 r4, r4, #0x8000 ; check BSM bit #endif beqz r4, resume_kernel -ENTRY(resume_userspace) +resume_userspace: DISABLE_INTERRUPTS(r4) ; make sure we don't miss an interrupt ; setting need_resched or sigpending ; between sampling and the iret |
