Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

Pull MIPS update from Ralf Baechle:
 "Cleanups and fixes for breakage that occured earlier during this merge
  phase.  Also a few patches that didn't make the first pull request.
  Of those is the Alchemy work that merges code for many of the SOCs and
  evaluation boards thus among other code shrinkage, reduces the number
  of MIPS defconfigs by 5."

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (22 commits)
  MIPS: SNI: Switch RM400 serial to SCCNXP driver
  MIPS: Remove unused empty_bad_pmd_table[] declaration.
  MIPS: MT: Remove kspd.
  MIPS: Malta: Fix section mismatch.
  MIPS: asm-offset.c: Delete unused irq_cpustat_t struct offsets.
  MIPS: Alchemy: Merge PB1100/1500 support into DB1000 code.
  MIPS: Alchemy: merge PB1550 support into DB1550 code
  MIPS: Alchemy: Single kernel for DB1200/1300/1550
  MIPS: Optimize TLB refill for RI/XI configurations.
  MIPS: proc: Cleanup printing of ASEs.
  MIPS: Hardwire detection of DSP ASE Rev 2 for systems, as required.
  MIPS: Add detection of DSP ASE Revision 2.
  MIPS: Optimize pgd_init and pmd_init
  MIPS: perf: Add perf functionality for BMIPS5000
  MIPS: perf: Split the Kconfig option CONFIG_MIPS_MT_SMP
  MIPS: perf: Remove unnecessary #ifdef
  MIPS: perf: Add cpu feature bit for PCI (performance counter interrupt)
  MIPS: perf: Change the "mips_perf_event" table unsupported indicator.
  MIPS: Align swapper_pg_dir to 64K for better TLB Refill code.
  vmlinux.lds.h: Allow architectures to add sections to the front of .bss
  ...

diff --combined arch/mips/Kconfig
index aae16cdfe30642ed41eb0c97ff993878b7859848,3803696e635ddd2f7e160762783c3f69b9a54f21..dba9390d37cf2c0d1672ca6dfb2b1453fb4294cf
--- 1/arch/mips/Kconfig
--- 2/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@@ -37,9 -37,6 +37,9 @@@ config MIP
        select BUILDTIME_EXTABLE_SORT
        select GENERIC_CLOCKEVENTS
        select GENERIC_CMOS_UPDATE
 +      select HAVE_MOD_ARCH_SPECIFIC
 +      select MODULES_USE_ELF_REL
 +      select MODULES_USE_ELF_RELA if 64BIT
  
  menu "Machine selection"
  
@@@ -1931,6 -1928,7 +1931,7 @@@ config MIPS_MT_SM
        select SYS_SUPPORTS_SCHED_SMT if SMP
        select SYS_SUPPORTS_SMP
        select SMP_UP
+       select MIPS_PERF_SHARED_TC_COUNTERS
        help
          This is a kernel model which is known a VSMP but lately has been
          marketesed into SMVP.
@@@ -2041,16 -2039,6 +2042,6 @@@ config MIPS_VPE_APSP_AP
        depends on MIPS_VPE_LOADER
        help
  
- config MIPS_APSP_KSPD
-       bool "Enable KSPD"
-       depends on MIPS_VPE_APSP_API
-       default y
-       help
-         KSPD is a kernel daemon that accepts syscall requests from the SP
-         side, actions them and returns the results. It also handles the
-         "exit" syscall notifying other kernel modules the SP program is
-         exiting.  You probably want to say yes here.
- 
  config MIPS_CMP
        bool "MIPS CMP framework support"
        depends on SYS_SUPPORTS_MIPS_CMP
@@@ -2280,6 -2268,9 +2271,9 @@@ config NR_CPU
          performance should round up your number of processors to the next
          power of two.
  
+ config MIPS_PERF_SHARED_TC_COUNTERS
+       bool
+ 
  #
  # Timer Interrupt Frequency Configuration
  #

diff --combined arch/mips/kernel/Makefile
index 414c26920df8d54b625099773a3b009b988c66ef,e49c4469f73c2175a8dd86ed817df905b64b5330..8b28bc4e14ea81f409a03c0b33197f20e0924b09
--- 1/arch/mips/kernel/Makefile
--- 2/arch/mips/kernel/Makefile
+++ b/arch/mips/kernel/Makefile
@@@ -31,7 -31,6 +31,7 @@@ obj-$(CONFIG_SYNC_R4K)                += sync-r4k.
  
  obj-$(CONFIG_STACKTRACE)      += stacktrace.o
  obj-$(CONFIG_MODULES)         += mips_ksyms.o module.o
 +obj-$(CONFIG_MODULES_USE_ELF_RELA) += module-rela.o
  
  obj-$(CONFIG_FUNCTION_TRACER) += mcount.o ftrace.o
  
@@@ -54,7 -53,6 +54,6 @@@ obj-$(CONFIG_CPU_MIPSR2)      += spram.
  
  obj-$(CONFIG_MIPS_VPE_LOADER) += vpe.o
  obj-$(CONFIG_MIPS_VPE_APSP_API)       += rtlx.o
- obj-$(CONFIG_MIPS_APSP_KSPD)  += kspd.o
  
  obj-$(CONFIG_I8259)           += i8259.o
  obj-$(CONFIG_IRQ_CPU)         += irq_cpu.o