diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-01 09:12:56 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-01 09:12:56 -0400 |
| commit | b262e60309e1b0eb25d300c7e739427d5316abb1 (patch) | |
| tree | bf319d78c79bb5cb617ff0c8340c73aa349bba15 /arch/m32r/kernel/entry.S | |
| parent | 93c8b90f01f0dc73891da4e84b26524b61d29d66 (diff) | |
| parent | 0523820482dcb42784572ffd2296c2f08c275a2b (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/ath9k/core.c
drivers/net/wireless/ath9k/main.c
net/core/dev.c
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: | |||
| 143 | and3 r4, r4, #0x8000 ; check BSM bit | 143 | and3 r4, r4, #0x8000 ; check BSM bit |
| 144 | #endif | 144 | #endif |
| 145 | beqz r4, resume_kernel | 145 | beqz r4, resume_kernel |
| 146 | ENTRY(resume_userspace) | 146 | resume_userspace: |
| 147 | DISABLE_INTERRUPTS(r4) ; make sure we don't miss an interrupt | 147 | DISABLE_INTERRUPTS(r4) ; make sure we don't miss an interrupt |
| 148 | ; setting need_resched or sigpending | 148 | ; setting need_resched or sigpending |
| 149 | ; between sampling and the iret | 149 | ; between sampling and the iret |