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

diff --combined Makefile
index 6b23f1b15fc473b0226bf8525b48a8a3a17c8b28,8da668512f5d4958fb7037aa8a20c063a2afec1e..519db43052a047f175501cca984d8058cf382b1c
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -204,6 -204,9 +204,9 @@@ ifeq ($(ARCH),x86_64
  endif
  
  # Additional ARCH settings for sparc
+ ifeq ($(ARCH),sparc32)
+        SRCARCH := sparc
+ endif
  ifeq ($(ARCH),sparc64)
         SRCARCH := sparc
  endif
@@@ -1137,13 -1140,21 +1140,13 @@@ MRPROPER_FILES += .config .config.old .
  #
  clean: rm-dirs  := $(CLEAN_DIRS)
  clean: rm-files := $(CLEAN_FILES)
 -clean-dirs      := $(addprefix _clean_,$(srctree) $(vmlinux-alldirs) Documentation)
 +clean-dirs      := $(addprefix _clean_, . $(vmlinux-alldirs) Documentation)
  
  PHONY += $(clean-dirs) clean archclean
  $(clean-dirs):
        $(Q)$(MAKE) $(clean)=$(patsubst _clean_%,%,$@)
  
 -clean: archclean $(clean-dirs)
 -      $(call cmd,rmdirs)
 -      $(call cmd,rmfiles)
 -      @find . $(RCS_FIND_IGNORE) \
 -              \( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \
 -              -o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \
 -              -o -name '*.symtypes' -o -name 'modules.order' \
 -              -o -name modules.builtin -o -name '.tmp_*.o.*' \
 -              -o -name '*.gcno' \) -type f -print | xargs rm -f
 +clean: archclean
  
  # mrproper - Delete all generated files, including .config
  #
@@@ -1344,7 -1355,16 +1347,7 @@@ $(clean-dirs)
        $(Q)$(MAKE) $(clean)=$(patsubst _clean_%,%,$@)
  
  clean:        rm-dirs := $(MODVERDIR)
 -clean: rm-files := $(KBUILD_EXTMOD)/Module.symvers \
 -                   $(KBUILD_EXTMOD)/modules.order \
 -                   $(KBUILD_EXTMOD)/modules.builtin
 -clean: $(clean-dirs)
 -      $(call cmd,rmdirs)
 -      $(call cmd,rmfiles)
 -      @find $(KBUILD_EXTMOD) $(RCS_FIND_IGNORE) \
 -              \( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \
 -              -o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \
 -              -o -name '*.gcno' \) -type f -print | xargs rm -f
 +clean: rm-files := $(KBUILD_EXTMOD)/Module.symvers
  
  help:
        @echo  '  Building external modules.'
@@@ -1361,16 -1381,6 +1364,16 @@@ prepare: 
  scripts: ;
  endif # KBUILD_EXTMOD
  
 +clean: $(clean-dirs)
 +      $(call cmd,rmdirs)
 +      $(call cmd,rmfiles)
 +      @find $(or $(KBUILD_EXTMOD), .) $(RCS_FIND_IGNORE) \
 +              \( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \
 +              -o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \
 +              -o -name '*.symtypes' -o -name 'modules.order' \
 +              -o -name modules.builtin -o -name '.tmp_*.o.*' \
 +              -o -name '*.gcno' \) -type f -print | xargs rm -f
 +
  # Generate tags for editors
  # ---------------------------------------------------------------------------
  quiet_cmd_tags = GEN     $@

diff --combined arch/sparc/Kconfig
index a9aaed3c3d97b92be15c9fb024bba293a8970428,058dbdb128b8a0f3206ea5c1f9376335292c7dec..45d9c87d083ad89343b7c7862c5b62a911f86c2f
--- 1/arch/sparc/Kconfig
--- 2/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@@ -1,3 -1,9 +1,3 @@@
 -# For a description of the syntax of this configuration file,
 -# see Documentation/kbuild/kconfig-language.txt.
 -#
 -
 -mainmenu "Linux/SPARC Kernel Configuration"
 -
  config 64BIT
        bool "64-bit kernel" if ARCH = "sparc"
        default ARCH = "sparc64"
@@@ -22,8 -28,6 +22,6 @@@ config SPAR
        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 -54,6 +48,6 @@@ config SPARC6
        select RTC_DRV_BQ4802
        select RTC_DRV_SUN4V
        select RTC_DRV_STARFIRE
-       select HAVE_IRQ_WORK
        select HAVE_PERF_EVENTS
        select PERF_USE_VMALLOC