[PATCH] MIPS: Fix build breakage in cpu-probe.c

[PATCH] MIPS: Fix build breakage in cpu-probe.c

[David Daney]

Move set_elf_platform() above all its uses.

Signed-off-by: David Daney <ddaney@caviumnetworks.com>
---

linux-queue is currently broken, this fixes it.

 arch/mips/kernel/cpu-probe.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
index 054a640..bb133d1 100644
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -291,6 +291,12 @@ static inline int cpu_has_confreg(void)
 #endif
 }
 
+static inline void set_elf_platform(int cpu, const char *plat)
+{
+	if (cpu == 0)
+		__elf_platform = plat;
+}
+
 /*
  * Get the FPU Implementation/Revision.
  */
@@ -781,12 +787,6 @@ static void __cpuinit decode_configs(struct cpuinfo_mips *c)
 		c->core = read_c0_ebase() & 0x3ff;
 }
 
-static inline void set_elf_platform(int cpu, const char *plat)
-{
-	if (cpu == 0)
-		__elf_platform = plat;
-}
-
 static inline void cpu_probe_mips(struct cpuinfo_mips *c, unsigned int cpu)
 {
 	decode_configs(c);
-- 
1.7.2.3

Re: [PATCH] MIPS: Fix build breakage in cpu-probe.c

[Kevin Cernekee]

On Thu, May 12, 2011 at 5:24 PM, David Daney <ddaney@caviumnetworks.com> wrote:
> Move set_elf_platform() above all its uses.

Whoops, should have retested the Loongson patch v1 with the
set_elf_platform patch v2.  Thanks for fixing this.

Acked-by: Kevin Cernekee <cernekee@gmail.com>

BTW: the commit messages got a little messed up on the two patches
that had a secondary "From:" header to override the author field.  Is
there something I should be doing differently here?

Re: [PATCH] MIPS: Fix build breakage in cpu-probe.c

[Ralf Baechle]

On Thu, May 12, 2011 at 06:26:09PM -0700, Kevin Cernekee wrote:

> BTW: the commit messages got a little messed up on the two patches
> that had a secondary "From:" header to override the author field.  Is
> there something I should be doing differently here?

You did exactly the right thing.  I messed up when manually converting the
patch files into the pseudo quilt format I'm using for linux-queue.

  Ralf

Re: [PATCH] MIPS: Fix build breakage in cpu-probe.c

[Ralf Baechle]

Folded into the original patch.  Thanks!

  Ralf