Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-28 15:11:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Sam Ravnborg 2008-02-20 22:22:16 -08:00 committed by David S. Miller
parent b1422401f2
commit 0f7f22d9a4
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/sparc64/kernel/hvtramp.S
View File

@ -3,6 +3,8 @@
* Copyright (C) 2007 David S. Miller <davem@davemloft.net> * Copyright (C) 2007 David S. Miller <davem@davemloft.net>
*/ */
#include <linux/init.h>
#include <asm/thread_info.h> #include <asm/thread_info.h>
#include <asm/hypervisor.h> #include <asm/hypervisor.h>
#include <asm/scratchpad.h> #include <asm/scratchpad.h>
@ -13,7 +15,7 @@
#include <asm/head.h> #include <asm/head.h>
#include <asm/asi.h> #include <asm/asi.h>
.text __CPUINIT
.align 8 .align 8
.globl hv_cpu_startup, hv_cpu_startup_end .globl hv_cpu_startup, hv_cpu_startup_end

2
arch/sparc64/kernel/smp.c
View File

@ -86,7 +86,7 @@ extern void setup_sparc64_timer(void);
static volatile unsigned long callin_flag = 0; static volatile unsigned long callin_flag = 0;
void __devinit smp_callin(void) void __cpuinit smp_callin(void)
{ {
int cpuid = hard_smp_processor_id(); int cpuid = hard_smp_processor_id();

4
arch/sparc64/kernel/trampoline.S
View File

@ -4,6 +4,8 @@
* Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu) * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu)
*/ */
#include <linux/init.h>
#include <asm/head.h> #include <asm/head.h>
#include <asm/asi.h> #include <asm/asi.h>
#include <asm/lsu.h> #include <asm/lsu.h>
@ -36,7 +38,7 @@ dtlb_load:
tramp_stack: tramp_stack:
.skip TRAMP_STACK_SIZE .skip TRAMP_STACK_SIZE
.text __CPUINIT
.align 8 .align 8
.globl sparc64_cpu_startup, sparc64_cpu_startup_end .globl sparc64_cpu_startup, sparc64_cpu_startup_end
sparc64_cpu_startup: sparc64_cpu_startup: