From 810ebbf4f68d8aacb957371adee4c7ec6ac67f14 Mon Sep 17 00:00:00 2001 From: David Daney Date: Thu, 28 Jan 2010 16:52:12 -0800 Subject: [PATCH] --- yaml --- r: 182091 b: refs/heads/master c: 874fd3b5acc20f2a464409045aef3b2288069787 h: refs/heads/master i: 182089: cb0334022d9ab43e3f7b8a502129584d23c02db9 182087: 3c8d6fef70a84466569de9b823e9b7fd02c71c51 v: v3 --- [refs] | 2 +- trunk/arch/mips/include/asm/elf.h | 14 +++++++------- trunk/arch/mips/kernel/cpu-probe.c | 1 + 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 3e74413824d0..f05ec918f86b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3b839070f11295735ce8d9ef580c5eb23417aabf +refs/heads/master: 874fd3b5acc20f2a464409045aef3b2288069787 diff --git a/trunk/arch/mips/include/asm/elf.h b/trunk/arch/mips/include/asm/elf.h index 7a6a35dbe529..e53d7bed5cda 100644 --- a/trunk/arch/mips/include/asm/elf.h +++ b/trunk/arch/mips/include/asm/elf.h @@ -334,14 +334,14 @@ extern int dump_task_fpu(struct task_struct *, elf_fpregset_t *); #define ELF_HWCAP (0) -/* This yields a string that ld.so will use to load implementation - specific libraries for optimization. This is more specific in - intent than poking at uname or /proc/cpuinfo. - - For the moment, we have only optimizations for the Intel generations, - but that could change... */ +/* + * This yields a string that ld.so will use to load implementation + * specific libraries for optimization. This is more specific in + * intent than poking at uname or /proc/cpuinfo. + */ -#define ELF_PLATFORM (NULL) +#define ELF_PLATFORM __elf_platform +extern const char *__elf_platform; /* * See comments in asm-alpha/elf.h, this is the same thing diff --git a/trunk/arch/mips/kernel/cpu-probe.c b/trunk/arch/mips/kernel/cpu-probe.c index 1773544e3dbb..494e8ab48d63 100644 --- a/trunk/arch/mips/kernel/cpu-probe.c +++ b/trunk/arch/mips/kernel/cpu-probe.c @@ -926,6 +926,7 @@ static inline void cpu_probe_cavium(struct cpuinfo_mips *c, unsigned int cpu) } const char *__cpu_name[NR_CPUS]; +const char *__elf_platform; __cpuinit void cpu_probe(void) {