Merge branch 'linus' into core/debug

Conflicts:
	lib/vsprintf.c

Manual merge:

	include/linux/kernel.h

Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --combined include/linux/kernel.h
index 4e1366b552ae9356bd234cc355105321a57d46b8,2651f805ba6d771b9ec1f26078609aebdb198853..3f30557be2a3f2e209a2abd60c21ddef9086fc96
--- 1/include/linux/kernel.h
--- 2/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@@ -187,9 -187,6 +187,8 @@@ extern unsigned long long memparse(cha
  extern int core_kernel_text(unsigned long addr);
  extern int __kernel_text_address(unsigned long addr);
  extern int kernel_text_address(unsigned long addr);
- extern void *dereference_function_descriptor(void *ptr);
 +extern int func_ptr_is_kernel_text(void *ptr);
 +
  struct pid;
  extern struct pid *session_of_pgrp(struct pid *pgrp);
  

diff --combined kernel/softlockup.c
index 17a0580653316b6642713444b5c4c293708f31b1,cb838ee93a82000bc5b313271487836e9fb5804e..b9a528f22736adcfa78d9cd99209ba286d585a54
--- 1/kernel/softlockup.c
--- 2/kernel/softlockup.c
+++ b/kernel/softlockup.c
@@@ -164,7 -164,7 +164,7 @@@ unsigned long __read_mostly sysctl_hung
  /*
   * Zero means infinite timeout - no checking done:
   */
 -unsigned long __read_mostly sysctl_hung_task_timeout_secs = 120;
 +unsigned long __read_mostly sysctl_hung_task_timeout_secs = 480;
  
  unsigned long __read_mostly sysctl_hung_task_warnings = 10;
  
@@@ -233,7 -233,8 +233,8 @@@ static void check_hung_uninterruptible_
        do_each_thread(g, t) {
                if (!--max_count)
                        goto unlock;
-               if (t->state & TASK_UNINTERRUPTIBLE)
+               /* use "==" to skip the TASK_KILLABLE tasks waiting on NFS */
+               if (t->state == TASK_UNINTERRUPTIBLE)
                        check_hung_task(t, now);
        } while_each_thread(g, t);
   unlock:

diff --combined lib/Kconfig.debug
index 342858fbabbcfc415e5580ddfabf08f00b6d9a69,0b504814e378067ff120b266e5b26c9fdd6fb90e..4116e10ea14ace405520b27d41c12e2b751e63b6
--- 1/lib/Kconfig.debug
--- 2/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@@ -394,7 -394,7 +394,7 @@@ config LOCKDE
        bool
        depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
        select STACKTRACE
-       select FRAME_POINTER if !X86 && !MIPS
+       select FRAME_POINTER if !X86 && !MIPS && !PPC
        select KALLSYMS
        select KALLSYMS_ALL
  
@@@ -536,16 -536,6 +536,16 @@@ config DEBUG_S
  
          If unsure, say N.
  
 +config DEBUG_NOTIFIERS
 +      bool "Debug notifier call chains"
 +      depends on DEBUG_KERNEL
 +      help
 +        Enable this to turn on sanity checking for notifier call chains.
 +        This is most useful for kernel developers to make sure that
 +        modules properly unregister themselves from notifier chains.
 +        This is a relatively cheap check but if you care about maximum
 +        performance, say N.
 +
  config FRAME_POINTER
        bool "Compile the kernel with frame pointers"
        depends on DEBUG_KERNEL && \
@@@ -686,13 -676,13 +686,13 @@@ config FAULT_INJECTION_STACKTRACE_FILTE
        depends on FAULT_INJECTION_DEBUG_FS && STACKTRACE_SUPPORT
        depends on !X86_64
        select STACKTRACE
-       select FRAME_POINTER
+       select FRAME_POINTER if !PPC
        help
          Provide stacktrace filter for fault-injection capabilities
  
  config LATENCYTOP
        bool "Latency measuring infrastructure"
-       select FRAME_POINTER if !MIPS
+       select FRAME_POINTER if !MIPS && !PPC
        select KALLSYMS
        select KALLSYMS_ALL
        select STACKTRACE