diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-04 23:20:32 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-04 23:20:32 -0500 |
| commit | 665c1ef8369138dad7773da6407fe77ccff87deb (patch) | |
| tree | 35ea30dcd0e1bbdfc0a9ceab99322eaad28e02e4 /arch/sparc/kernel/process.c | |
| parent | 71ca44dac4cbf89ce88e460a293cc25c5b18fa50 (diff) | |
| parent | f0e98c387e61de00646be31fab4c2fa0224e1efb (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC]: Fix link errors with gcc-4.3
sparc64: replace remaining __FUNCTION__ occurances
sparc: replace remaining __FUNCTION__ occurances
[SPARC]: Add reboot_command[] extern decl to asm/system.h
[SPARC]: Mark linux_sparc_{fpu,chips} static.
Diffstat (limited to 'arch/sparc/kernel/process.c')
| -rw-r--r-- | arch/sparc/kernel/process.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/sparc/kernel/process.c b/arch/sparc/kernel/process.c index 0bd69d0b5cd7..70c0dd22491d 100644 --- a/arch/sparc/kernel/process.c +++ b/arch/sparc/kernel/process.c | |||
| @@ -139,8 +139,6 @@ void cpu_idle(void) | |||
| 139 | 139 | ||
| 140 | #endif | 140 | #endif |
| 141 | 141 | ||
| 142 | extern char reboot_command []; | ||
| 143 | |||
| 144 | /* XXX cli/sti -> local_irq_xxx here, check this works once SMP is fixed. */ | 142 | /* XXX cli/sti -> local_irq_xxx here, check this works once SMP is fixed. */ |
| 145 | void machine_halt(void) | 143 | void machine_halt(void) |
| 146 | { | 144 | { |