Skip to content
  • Linus Torvalds's avatar
    Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · a5ef3f7d
    Linus Torvalds authored
    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
      ...
    a5ef3f7d