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

Browse source

Pull MIPS fixes from Ralf Baechle:
 "Two platform-specific fixes plus a fix for oprofile which was calling
  smp_processor_id() in preemptible code"

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
  MIPS: BMIPS: fix hardware interrupt routing for boot CPU != 0
  MIPS: oprofile: Fix BUG due to smp_processor_id() in preemptible code.
  MIPS: PNX833x: PNX8335_PCI_ETHERNET_INT depends on CONFIG_SOC_PNX8335

...

This commit is contained in:

Linus Torvalds 2013-08-06 13:14:43 -07:00

parent 69b4a3a030 fcfa66de8a

commit 1853a65ec5

4 changed files with 13 additions and 3 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

arch/mips/include/asm/cpu-features.h

View file

10

arch/mips/kernel/smp-bmips.c

View file

2

arch/mips/oprofile/op_model_mipsxx.c

View file

2

arch/mips/pnx833x/common/platform.c

View file