diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-12 18:48:14 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-12 18:48:14 (GMT) |
| commit | 1a9c3d68d65f4b5ce32f7d67ccc730396e04cdd2 (patch) | |
| tree | f5d3bb8afb0efa43b7880cd89d96b3330a38ddb3 /kernel/utsname.c | |
| parent | 6673de0ebf715cb34441e26cbf77a0e28a1973e4 (diff) | |
| parent | cb2f9938d0a57625644750e66373d3bf4d3a1601 (diff) | |
| download | linux-1a9c3d68d65f4b5ce32f7d67ccc730396e04cdd2.tar.xz | |
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Pull MIPS fixes from Ralf Baechle:
"Resurrect Alchemy platforms by invoking the WAIT instructions with
interrupts enabled. This still leaves the race condition between
testing TIF_NEED_RESCHED and the WAIT instruction for Alchemy
platforms which need a different fix than other MIPS platforms. But
at least it gets MIPS platforms flying again.
There are also fixes for two build errors (CONFIG_FTRACE=y with
CONFIG_DYNAMIC_FTRACE=n) and CONFIG_VIRTUALIZATION without CONFIG_KVM"
* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
MIPS: ftrace: Add missing CONFIG_DYNAMIC_FTRACE
MIPS: include: mmu_context.h: Replace VIRTUALIZATION with KVM
MIPS: Alchemy: fix wait function
Diffstat (limited to 'kernel/utsname.c')
0 files changed, 0 insertions, 0 deletions