diff options
| author | David S. Miller <davem@davemloft.net> | 2012-05-28 00:14:48 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-05-28 00:14:48 -0400 |
| commit | c2e1ff39c106ab026e3feb29c038855b7ed00393 (patch) | |
| tree | e0255b5b9aed8645edc4426f2d4972280910e065 /arch/tile/kernel/entry.S | |
| parent | 456d3d42460c1fc20ba0d27442443fcd63aaac35 (diff) | |
| parent | b48b2c3e50433ff6f7e46186daa7f986bd960215 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Pull in Linus's tree to get the commits that blew away
ARCH_USES_GETTIMEOFFSET but didn't update Sparc correctly, so
that I can apply Stephen Rothwell's fix for that mis-merge.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/tile/kernel/entry.S')
| -rw-r--r-- | arch/tile/kernel/entry.S | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/tile/kernel/entry.S b/arch/tile/kernel/entry.S index ec91568df880..133c4b56a99e 100644 --- a/arch/tile/kernel/entry.S +++ b/arch/tile/kernel/entry.S | |||
| @@ -100,8 +100,9 @@ STD_ENTRY(smp_nap) | |||
| 100 | */ | 100 | */ |
| 101 | STD_ENTRY(_cpu_idle) | 101 | STD_ENTRY(_cpu_idle) |
| 102 | movei r1, 1 | 102 | movei r1, 1 |
| 103 | IRQ_ENABLE_LOAD(r2, r3) | ||
| 103 | mtspr INTERRUPT_CRITICAL_SECTION, r1 | 104 | mtspr INTERRUPT_CRITICAL_SECTION, r1 |
| 104 | IRQ_ENABLE(r2, r3) /* unmask, but still with ICS set */ | 105 | IRQ_ENABLE_APPLY(r2, r3) /* unmask, but still with ICS set */ |
| 105 | mtspr INTERRUPT_CRITICAL_SECTION, zero | 106 | mtspr INTERRUPT_CRITICAL_SECTION, zero |
| 106 | .global _cpu_idle_nap | 107 | .global _cpu_idle_nap |
| 107 | _cpu_idle_nap: | 108 | _cpu_idle_nap: |