Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

x86: adapt voyager's trampoline_base

Browse source 
Change voyager's trampoline base to unsigned char *
instead of u32. This way, it won't conflict with
the other architectures when including smp.h

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Glauber Costa 2008-03-03 14:13:10 -03:00 committed by Ingo Molnar
parent 4206882939
commit d507897b2f
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
arch/x86/mach-voyager/voyager_smp.c
View file

@ -210,7 +210,7 @@ static int cpucount = 0;
/* steal a page from the bottom of memory for the trampoline and
* squirrel its address away here. This will be in kernel virtual
* space */
static __u32 trampoline_base;
unsigned char *trampoline_base;
/* The per cpu profile stuff - used in smp_local_timer_interrupt */
static DEFINE_PER_CPU(int, prof_multiplier) = 1;
@ -435,9 +435,9 @@ static __u32 __init setup_trampoline(void)
extern const __u8 trampoline_end[];
extern const __u8 trampoline_data[];
memcpy((__u8 *) trampoline_base, trampoline_data,
memcpy(trampoline_base, trampoline_data,
trampoline_end - trampoline_data);
return virt_to_phys((__u8 *) trampoline_base);
return virt_to_phys(trampoline_base);
}
/* Routine initially called when a non-boot CPU is brought online */
@ -1166,7 +1166,7 @@ void flush_tlb_all(void)
* is sorted out */
void __init smp_alloc_memory(void)
{
trampoline_base = (__u32) alloc_bootmem_low_pages(PAGE_SIZE);
trampoline_base = alloc_bootmem_low_pages(PAGE_SIZE);
if (__pa(trampoline_base) >= 0x93000)
BUG();
}