Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f7f22d9 authored by Sam Ravnborg's avatar Sam Ravnborg Committed by David S. Miller
Browse files

[SPARC64]: Fix cpu trampoline et al. mismatch warnings. 



Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b1422401

arch/sparc64/kernel/hvtramp.S

+3 −1
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@ 
 * Copyright (C) 2007 David S. Miller <davem@davemloft.net>

 */



#include <linux/init.h>



#include <asm/thread_info.h>

#include <asm/hypervisor.h>

#include <asm/scratchpad.h>
@@ -13,7 +15,7 @@ 
#include <asm/head.h>

#include <asm/asi.h>



	.text

	__CPUINIT

	.align		8

	.globl		hv_cpu_startup, hv_cpu_startup_end

arch/sparc64/kernel/smp.c

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ extern void setup_sparc64_timer(void); 


static volatile unsigned long callin_flag = 0;



void __devinit smp_callin(void)

void __cpuinit smp_callin(void)

{

	int cpuid = hard_smp_processor_id();

arch/sparc64/kernel/trampoline.S

+3 −1
Original line number Diff line number Diff line
@@ -4,6 +4,8 @@ 
 * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu)

 */



#include <linux/init.h>



#include <asm/head.h>

#include <asm/asi.h>

#include <asm/lsu.h>
@@ -36,7 +38,7 @@ dtlb_load: 
tramp_stack:

	.skip	TRAMP_STACK_SIZE



	.text

	__CPUINIT

	.align		8

	.globl		sparc64_cpu_startup, sparc64_cpu_startup_end

sparc64_cpu_startup: