diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-14 21:57:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-14 21:57:23 -0700 |
| commit | 5694ca9f46202c50df525472abb6d8c1dee4f8eb (patch) | |
| tree | c16a4ff264b024ea2017a88a29d8f03695bd2656 /arch/sparc64/kernel/time.c | |
| parent | 76aba64a6608fcaa02c715e93c572192f3621195 (diff) | |
| parent | ee7022dcfbf660727d6b8553cb0dbc0d4eae8f44 (diff) | |
| download | linux-5694ca9f46202c50df525472abb6d8c1dee4f8eb.tar.bz2 | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64] Fix PSYCHO PCI controler init.
[SPARC64] psycho: Fix pbm->name handling in pbm_register_toplevel_resources()
[SERIAL] sunsab: Fix significant typo in sab_probe()
[SERIAL] sunsu: Report keyboard and mouse ports in kernel log.
[SPARC64]: Make sure IRQs are disabled properly during early boot.
Diffstat (limited to 'arch/sparc64/kernel/time.c')
| -rw-r--r-- | arch/sparc64/kernel/time.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/sparc64/kernel/time.c b/arch/sparc64/kernel/time.c index b43de647ba73..094d3e35be18 100644 --- a/arch/sparc64/kernel/time.c +++ b/arch/sparc64/kernel/time.c @@ -928,8 +928,6 @@ static void sparc64_start_timers(void) __asm__ __volatile__("wrpr %0, 0x0, %%pstate" : /* no outputs */ : "r" (pstate)); - - local_irq_enable(); } struct freq_table { |