summaryrefslogtreecommitdiff
path: root/tools/power/x86/turbostat
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-11-15 01:45:23 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-11-15 01:45:23 +0400
commitf0c391131a6483004791458f181d2a6f6ffb1c11 (patch)
tree0d7c47a9e4f35aa5db821ab88ca7512a090e6d91 /tools/power/x86/turbostat
parent1e096209da0c2c8ca8462842a7a2e5928d3e82c3 (diff)
parent225ae5fd9a320e22841410049c3bdb6cf14a5841 (diff)
downloadlinux-f0c391131a6483004791458f181d2a6f6ffb1c11.tar.xz
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Pull MIPS update from Ralf Baechle: "To avoid unnecessary risk and work the preemption fixes are combined with some preparatory work that isn't strictly required. So it's really just 3 fixes: - Get is_compat_task() to do the right thing while simplifying it. The unnecessary complexity hid a rarely striking bug which could be triggered by ext3/ext4 under certain circumstances. - Resolve a preemption issue in the irqflags.h functions for kernels built to support pre-MIPS32 / pre-MIPS64 Release 2 processors. - Fix the interrupt number of the MIPS Malta's CBUS UART." * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: MIPS: Malta: Fix interupt number of CBUS UART. MIPS: Make irqflags.h functions preempt-safe for non-mipsr2 cpus MIPS: Remove irqflags.h dependency from bitops.h MIPS: bitops.h: Change use of 'unsigned short' to 'int' MIPS: compat: Delete now unused TIF_32BIT. MIPS: compat: Implement is_compat_task() by testing for 32-bit address space. MIPS: compat: Fix use of TIF_32BIT_ADDR vs _TIF_32BIT_ADDR
Diffstat (limited to 'tools/power/x86/turbostat')
0 files changed, 0 insertions, 0 deletions