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

sparc32: fix build with leon or floppy enabled 



Add a few includes back required to build with floppy enabled
Fix declaration of trapbase_cpu* so it is now consistent

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

arch/sparc/include/asm/leon.h

+0 −3
Original line number Diff line number Diff line
@@ -375,9 +375,6 @@ void leon_enable_irq_cpu(unsigned int irq_nr, unsigned int cpu); 


extern unsigned int real_irq_entry[], smpleon_ticker[];

extern unsigned int patchme_maybe_smp_msg[];

extern unsigned long trapbase_cpu1[];

extern unsigned long trapbase_cpu2[];

extern unsigned long trapbase_cpu3[];

extern unsigned int t_nmi[], linux_trap_ipi15_leon[];

extern unsigned int linux_trap_ipi15_sun4m[];

arch/sparc/kernel/irq_32.c

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/kernel_stat.h>

#include <linux/seq_file.h>



#include <asm/cacheflush.h>

#include <asm/pcic.h>

#include <asm/leon.h>

arch/sparc/kernel/kernel.h

+5 −3
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@ 


#include <linux/interrupt.h>



#include <asm/traps.h>



/* cpu.c */

extern const char *sparc_cpu_type;

extern const char *sparc_pmu_type;
@@ -54,9 +56,9 @@ extern unsigned int t_nmi[]; 
extern unsigned int linux_trap_ipi15_sun4d[];

extern unsigned int linux_trap_ipi15_sun4m[];



extern unsigned long trapbase_cpu1[];

extern unsigned long trapbase_cpu2[];

extern unsigned long trapbase_cpu3[];

extern struct tt_entry trapbase_cpu1;

extern struct tt_entry trapbase_cpu2;

extern struct tt_entry trapbase_cpu3;



extern char cputypval[];

arch/sparc/kernel/leon_smp.c

+11 −9
Original line number Diff line number Diff line
@@ -41,6 +41,8 @@ 
#include <asm/leon.h>

#include <asm/leon_amba.h>



#include "kernel.h"



#ifdef CONFIG_SPARC_LEON



#include "irq.h"
@@ -261,23 +263,23 @@ void __init leon_smp_done(void) 


	/* Free unneeded trap tables */

	if (!cpu_isset(1, cpu_present_map)) {

		ClearPageReserved(virt_to_page(trapbase_cpu1));

		init_page_count(virt_to_page(trapbase_cpu1));

		free_page((unsigned long)trapbase_cpu1);

		ClearPageReserved(virt_to_page(&trapbase_cpu1));

		init_page_count(virt_to_page(&trapbase_cpu1));

		free_page((unsigned long)&trapbase_cpu1);

		totalram_pages++;

		num_physpages++;

	}

	if (!cpu_isset(2, cpu_present_map)) {

		ClearPageReserved(virt_to_page(trapbase_cpu2));

		init_page_count(virt_to_page(trapbase_cpu2));

		free_page((unsigned long)trapbase_cpu2);

		ClearPageReserved(virt_to_page(&trapbase_cpu2));

		init_page_count(virt_to_page(&trapbase_cpu2));

		free_page((unsigned long)&trapbase_cpu2);

		totalram_pages++;

		num_physpages++;

	}

	if (!cpu_isset(3, cpu_present_map)) {

		ClearPageReserved(virt_to_page(trapbase_cpu3));

		init_page_count(virt_to_page(trapbase_cpu3));

		free_page((unsigned long)trapbase_cpu3);

		ClearPageReserved(virt_to_page(&trapbase_cpu3));

		init_page_count(virt_to_page(&trapbase_cpu3));

		free_page((unsigned long)&trapbase_cpu3);

		totalram_pages++;

		num_physpages++;

	}