Commit c07724e5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  kbuild: add ARCH=sparc32 target
  sparc32: fix build failure on CONFIG_SPARC_LEON
  sparc: Fixed random SPARC/LEON SMP CPU Stuck problem.
  sparc32: remove CONFIG_HAVE_PERF_EVENTS option
  sparc: don't #include asm/system.h in asm/jump_label.h
  sparc32: Fix unaligned stack handling on trap return.
  sparc: keep calling do_signal() as long as pending signals remain
parents 302f5bc5 e69f58c0

Makefile

+3 −0
Original line number Diff line number Diff line
@@ -204,6 +204,9 @@ ifeq ($(ARCH),x86_64) 
endif



# Additional ARCH settings for sparc

ifeq ($(ARCH),sparc32)

       SRCARCH := sparc

endif

ifeq ($(ARCH),sparc64)

       SRCARCH := sparc

endif

arch/sparc/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ config SPARC 
	select RTC_CLASS

	select RTC_DRV_M48T59

	select HAVE_IRQ_WORK

	select HAVE_PERF_EVENTS

	select PERF_USE_VMALLOC

	select HAVE_DMA_ATTRS

	select HAVE_DMA_API_DEBUG

	select HAVE_ARCH_JUMP_LABEL
@@ -50,7 +48,6 @@ config SPARC64 
	select RTC_DRV_BQ4802

	select RTC_DRV_SUN4V

	select RTC_DRV_STARFIRE

	select HAVE_IRQ_WORK

	select HAVE_PERF_EVENTS

	select PERF_USE_VMALLOC

arch/sparc/include/asm/jump_label.h

+0 −1
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 
#ifdef __KERNEL__



#include <linux/types.h>

#include <asm/system.h>



#define JUMP_LABEL_NOP_SIZE 4

arch/sparc/kernel/irq_32.c

+2 −2
Original line number Diff line number Diff line
@@ -365,7 +365,7 @@ static int request_fast_irq(unsigned int irq, 
	unsigned long flags;

	unsigned int cpu_irq;

	int ret;

#ifdef CONFIG_SMP

#if defined CONFIG_SMP && !defined CONFIG_SPARC_LEON

	struct tt_entry *trap_table;

	extern struct tt_entry trapbase_cpu1, trapbase_cpu2, trapbase_cpu3;

#endif
@@ -425,7 +425,7 @@ static int request_fast_irq(unsigned int irq, 
	table[SP_TRAP_IRQ1+(cpu_irq-1)].inst_four = SPARC_NOP;



	INSTANTIATE(sparc_ttable)

#ifdef CONFIG_SMP

#if defined CONFIG_SMP && !defined CONFIG_SPARC_LEON

	trap_table = &trapbase_cpu1; INSTANTIATE(trap_table)

	trap_table = &trapbase_cpu2; INSTANTIATE(trap_table)

	trap_table = &trapbase_cpu3; INSTANTIATE(trap_table)

arch/sparc/kernel/leon_smp.c

+2 −2
Original line number Diff line number Diff line
@@ -56,8 +56,8 @@ void __init leon_configure_cache_smp(void); 
static inline unsigned long do_swap(volatile unsigned long *ptr,

				    unsigned long val)

{

	__asm__ __volatile__("swapa [%1] %2, %0\n\t" : "=&r"(val)

			     : "r"(ptr), "i"(ASI_LEON_DCACHE_MISS)

	__asm__ __volatile__("swapa [%2] %3, %0\n\t" : "=&r"(val)

			     : "0"(val), "r"(ptr), "i"(ASI_LEON_DCACHE_MISS)

			     : "memory");

	return val;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE