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.
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -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.
|
||||
|
||||
Reference in New Issue
Block a user