]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Merge branches 'core-urgent-for-linus', 'perf-urgent-for-linus', 'sched-urgent-for...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 2 Feb 2012 19:11:13 +0000 (11:11 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 2 Feb 2012 19:11:13 +0000 (11:11 -0800)
* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  bugs, x86: Fix printk levels for panic, softlockups and stack dumps

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf top: Fix number of samples displayed
  perf tools: Fix strlen() bug in perf_event__synthesize_event_type()
  perf tools: Fix broken build by defining _GNU_SOURCE in Makefile
  x86/dumpstack: Remove unneeded check in dump_trace()
  perf: Fix broken interrupt rate throttling

* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched/rt: Fix task stack corruption under __ARCH_WANT_INTERRUPTS_ON_CTXSW
  sched: Fix ancient race in do_exit()
  sched/nohz: Fix nohz cpu idle load balancing state with cpu hotplug
  sched/s390: Fix compile error in sched/core.c
  sched: Fix rq->nr_uninterruptible update race

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/reboot: Remove VersaLogic Menlow reboot quirk
  x86/reboot: Skip DMI checks if reboot set by user
  x86: Properly parenthesize cmpxchg() macro arguments

1  2  3  4  5 
arch/x86/kernel/dumpstack_64.c

index 6d728d9284bd0e3b94213206bd93af5afbfb7912,42b2bca0b72ca6aa14e01891cc3903d4d1a27cba,af7785ff5aa03b56d205cffead7788fd1f51bef3,6d728d9284bd0e3b94213206bd93af5afbfb7912,6d728d9284bd0e3b94213206bd93af5afbfb7912..17107bd6e1f0af06b5e59b1c48d452305a8b3214
@@@@@@ -129,7 -129,7 -129,7 -129,7 -129,7 +129,7 @@@@@@ void dump_trace(struct task_struct *tas
        if (!stack) {
                if (regs)
                        stack = (unsigned long *)regs->sp;
-- --           else if (task && task != current)
++ ++           else if (task != current)
                        stack = (unsigned long *)task->thread.sp;
                else
                        stack = &dummy;
@@@@@@ -269,11 -269,11 -269,11 -269,11 -269,11 +269,11 @@@@@@ void show_registers(struct pt_regs *reg
                unsigned char c;
                u8 *ip;
     
- ---           printk(KERN_EMERG "Stack:\n");
+ +++           printk(KERN_DEFAULT "Stack:\n");
                show_stack_log_lvl(NULL, regs, (unsigned long *)sp,
- ---                              0, KERN_EMERG);
+ +++                              0, KERN_DEFAULT);
     
- ---           printk(KERN_EMERG "Code: ");
+ +++           printk(KERN_DEFAULT "Code: ");
     
                ip = (u8 *)regs->ip - code_prologue;
                if (ip < (u8 *)PAGE_OFFSET || probe_kernel_address(ip, c)) {