diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-04 20:20:32 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-04 20:20:32 -0800 |
commit | 665c1ef8369138dad7773da6407fe77ccff87deb (patch) | |
tree | 35ea30dcd0e1bbdfc0a9ceab99322eaad28e02e4 /include | |
parent | 71ca44dac4cbf89ce88e460a293cc25c5b18fa50 (diff) | |
parent | f0e98c387e61de00646be31fab4c2fa0224e1efb (diff) | |
download | kernel_samsung_smdk4412-665c1ef8369138dad7773da6407fe77ccff87deb.zip kernel_samsung_smdk4412-665c1ef8369138dad7773da6407fe77ccff87deb.tar.gz kernel_samsung_smdk4412-665c1ef8369138dad7773da6407fe77ccff87deb.tar.bz2 |
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 'include')
-rw-r--r-- | include/asm-sparc/system.h | 2 | ||||
-rw-r--r-- | include/asm-sparc64/system.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/asm-sparc/system.h b/include/asm-sparc/system.h index 45e47c1..4e08210c 100644 --- a/include/asm-sparc/system.h +++ b/include/asm-sparc/system.h @@ -44,6 +44,8 @@ extern enum sparc_cpu sparc_cpu_model; #define SUN4M_NCPUS 4 /* Architectural limit of sun4m. */ +extern char reboot_command[]; + extern struct thread_info *current_set[NR_CPUS]; extern unsigned long empty_bad_page; diff --git a/include/asm-sparc64/system.h b/include/asm-sparc64/system.h index ed91a5d..53eae09 100644 --- a/include/asm-sparc64/system.h +++ b/include/asm-sparc64/system.h @@ -30,6 +30,8 @@ enum sparc_cpu { #define ARCH_SUN4C_SUN4 0 #define ARCH_SUN4 0 +extern char reboot_command[]; + /* These are here in an effort to more fully work around Spitfire Errata * #51. Essentially, if a memory barrier occurs soon after a mispredicted * branch, the chip can stop executing instructions until a trap occurs. |