From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 24 Jul 2008 01:34:13 +0000 (-0700)
Subject: Merge branch 'core/softlockup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v2.6.27-rc1~849
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d7b6de14a0ef8a376f9d57b867545b47302b7bfb;p=linux-2.6

Merge branch 'core/softlockup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'core/softlockup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  softlockup: fix invalid proc_handler for softlockup_panic
  softlockup: fix watchdog task wakeup frequency
  softlockup: fix watchdog task wakeup frequency
  softlockup: show irqtrace
  softlockup: print a module list on being stuck
  softlockup: fix NMI hangs due to lock race - 2.6.26-rc regression
  softlockup: fix false positives on nohz if CPU is 100% idle for more than 60 seconds
  softlockup: fix softlockup_thresh fix
  softlockup: fix softlockup_thresh unaligned access and disable detection at runtime
  softlockup: allow panic on lockup
---

d7b6de14a0ef8a376f9d57b867545b47302b7bfb
diff --cc kernel/sysctl.c
index b859e6b5a7,ab59ac008c..2a7b9d8870
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@@ -83,12 -83,9 +83,12 @@@ extern int maps_protect
  extern int sysctl_stat_interval;
  extern int latencytop_enabled;
  extern int sysctl_nr_open_min, sysctl_nr_open_max;
 +#ifdef CONFIG_RCU_TORTURE_TEST
 +extern int rcutorture_runnable;
 +#endif /* #ifdef CONFIG_RCU_TORTURE_TEST */
  
  /* Constants used for minimum and  maximum */
- #if defined(CONFIG_DETECT_SOFTLOCKUP) || defined(CONFIG_HIGHMEM)
+ #if defined(CONFIG_HIGHMEM) || defined(CONFIG_DETECT_SOFTLOCKUP)
  static int one = 1;
  #endif