Merge commit 'v2.6.28-rc2' into tracing/urgent

diff --combined Makefile
index b7eb70b13cad3a57075a6c594f15128d82b8aac2,e9c5d47f31cdb42f8b98fc28065446a85fe7d2f6..a7f20687d8e55e9f099740b4b8d00554d0a9db33
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,8 -1,8 +1,8 @@@
  VERSION = 2
  PATCHLEVEL = 6
- SUBLEVEL = 27
- EXTRAVERSION =
- NAME = Rotary Wombat
+ SUBLEVEL = 28
+ EXTRAVERSION = -rc2
+ NAME = Killer Bat of Doom
  
  # *DOCUMENTATION*
  # To see a list of typical targets execute "make help"
@@@ -437,7 -437,7 +437,7 @@@ ifeq ($(config-targets),1
  # KBUILD_DEFCONFIG may point out an alternative default configuration
  # used for 'make defconfig'
  include $(srctree)/arch/$(SRCARCH)/Makefile
- export KBUILD_DEFCONFIG
+ export KBUILD_DEFCONFIG KBUILD_KCONFIG
  
  config %config: scripts_basic outputmakefile FORCE
        $(Q)mkdir -p include/linux include/config
@@@ -536,7 -536,7 +536,7 @@@ KBUILD_CFLAGS      += -
  KBUILD_AFLAGS += -gdwarf-2
  endif
  
 -ifdef CONFIG_FTRACE
 +ifdef CONFIG_FUNCTION_TRACER
  KBUILD_CFLAGS += -pg
  endif
  

diff --combined arch/arm/Kconfig
index c5b431e231ddccae7a45240ce71374be34b7e2f3,5021db2217eddfbecd628aba53ca44f6fb62ade9..9722f8bb506cb9ad27f64b47ab15ce428886a0ba
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -16,7 -16,8 +16,7 @@@ config AR
        select HAVE_ARCH_KGDB
        select HAVE_KPROBES if (!XIP_KERNEL)
        select HAVE_KRETPROBES if (HAVE_KPROBES)
 -      select HAVE_FTRACE if (!XIP_KERNEL)
 -      select HAVE_DYNAMIC_FTRACE if (HAVE_FTRACE)
 +      select HAVE_FUNCTION_TRACER if (!XIP_KERNEL)
        select HAVE_GENERIC_DMA_COHERENT
        help
          The ARM series is a line of low-power-consumption RISC chip designs
@@@ -355,7 -356,7 +355,7 @@@ config ARCH_IXP4X
        select GENERIC_GPIO
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS
-       select ZONE_DMA if PCI
+       select DMABOUNCE if PCI
        help
          Support for Intel's IXP4XX (XScale) family of processors.
  
@@@ -539,16 -540,15 +539,15 @@@ config ARCH_OMA
        help
          Support for TI's OMAP platform (OMAP1 and OMAP2).
  
- config ARCH_MSM7X00A
-       bool "Qualcomm MSM7X00A"
+ config ARCH_MSM
+       bool "Qualcomm MSM"
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS
        help
-         Support for Qualcomm MSM7X00A based systems.  This runs on the ARM11
-         apps processor of the MSM7X00A and depends on a shared memory
+         Support for Qualcomm MSM7K based systems.  This runs on the ARM11
+         apps processor of the MSM7K and depends on a shared memory
          interface to the ARM9 modem processor which runs the baseband stack
          and controls some vital subsystems (clock and power control, etc).
-         <http://www.cdmatech.com/products/msm7200_chipset_solution.jsp>
  
  endchoice
  
@@@ -1255,6 -1255,8 +1254,8 @@@ source "drivers/hid/Kconfig
  
  source "drivers/usb/Kconfig"
  
+ source "drivers/uwb/Kconfig"
+ 
  source "drivers/mmc/Kconfig"
  
  source "drivers/memstick/Kconfig"

diff --combined arch/powerpc/Kconfig
index 5122a67e6ffaa94ae8d2acb294f26c2cd087e5f5,5b1527883fcb590b361fcda998164a59f4a33e4a..525c13a4de93ede9cd9451569d41cd20760b3636
--- 1/arch/powerpc/Kconfig
--- 2/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@@ -19,9 -19,6 +19,6 @@@ config WORD_SIZ
        default 64 if PPC64
        default 32 if !PPC64
  
- config PPC_MERGE
-       def_bool y
- 
  config ARCH_PHYS_ADDR_T_64BIT
         def_bool PPC64 || PHYS_64BIT
  
@@@ -111,7 -108,8 +108,7 @@@ config ARCH_NO_VIRT_TO_BU
  config PPC
        bool
        default y
 -      select HAVE_DYNAMIC_FTRACE
 -      select HAVE_FTRACE
 +      select HAVE_FUNCTION_TRACER
        select ARCH_WANT_OPTIONAL_GPIOLIB
        select HAVE_IDE
        select HAVE_IOREMAP_PROT
@@@ -325,13 -323,11 +322,11 @@@ config KEXE
  
  config CRASH_DUMP
        bool "Build a kdump crash kernel"
-       depends on PPC_MULTIPLATFORM && PPC64
+       depends on PPC_MULTIPLATFORM && PPC64 && RELOCATABLE
        help
          Build a kernel suitable for use as a kdump capture kernel.
-         The kernel will be linked at a different address than normal, and
-         so can only be used for Kdump.
- 
-         Don't change this unless you know what you are doing.
+         The same kernel binary can be used as production kernel and dump
+         capture kernel.
  
  config PHYP_DUMP
        bool "Hypervisor-assisted dump (EXPERIMENTAL)"
@@@ -831,11 -827,9 +826,9 @@@ config PAGE_OFFSE
        default "0xc000000000000000"
  config KERNEL_START
        hex
-       default "0xc000000002000000" if CRASH_DUMP
        default "0xc000000000000000"
  config PHYSICAL_START
        hex
-       default "0x02000000" if CRASH_DUMP
        default "0x00000000"
  endif
  

diff --combined arch/x86/Kconfig
index 100325c8605e47499c5ffa7daab573719869136d,350bee1d54dc2ae41851f503d9ef7705a0e93e31..d11d7b513191fac5d46dcbe12f600fb3ca0832cd
--- 1/arch/x86/Kconfig
--- 2/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -28,7 -28,7 +28,7 @@@ config X8
        select HAVE_KRETPROBES
        select HAVE_FTRACE_MCOUNT_RECORD
        select HAVE_DYNAMIC_FTRACE
 -      select HAVE_FTRACE
 +      select HAVE_FUNCTION_TRACER
        select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64)
        select HAVE_ARCH_KGDB if !X86_VOYAGER
        select HAVE_ARCH_TRACEHOOK
@@@ -116,6 -116,9 +116,9 @@@ config GENERIC_TIME_VSYSCAL
  config ARCH_HAS_CPU_RELAX
        def_bool y
  
+ config ARCH_HAS_DEFAULT_IDLE
+       def_bool y
+ 
  config ARCH_HAS_CACHE_LINE_SIZE
        def_bool y
  
@@@ -1635,6 -1638,8 +1638,8 @@@ source "arch/x86/kernel/cpu/cpufreq/Kco
  
  source "drivers/cpuidle/Kconfig"
  
+ source "drivers/idle/Kconfig"
+ 
  endmenu
  
  

diff --combined arch/x86/include/asm/ftrace.h
index 233bb9b869c0605665b48a51b7b46f5f7ffc40a6,47f7e65e6c1d51bbd17715127e8ffc00a2c7afb8..9e8bc29b8b17dd3739d7479af6920c3c627130cb
--- 1/include/asm-x86/ftrace.h
--- 2/arch/x86/include/asm/ftrace.h
+++ b/arch/x86/include/asm/ftrace.h
@@@ -1,7 -1,7 +1,7 @@@
- #ifndef ASM_X86__FTRACE_H
- #define ASM_X86__FTRACE_H
+ #ifndef _ASM_X86_FTRACE_H
+ #define _ASM_X86_FTRACE_H
  
 -#ifdef CONFIG_FTRACE
 +#ifdef CONFIG_FUNCTION_TRACER
  #define MCOUNT_ADDR           ((long)(mcount))
  #define MCOUNT_INSN_SIZE      5 /* sizeof mcount call */
  
@@@ -19,6 -19,6 +19,6 @@@ static inline unsigned long ftrace_call
  }
  #endif
  
 -#endif /* CONFIG_FTRACE */
 +#endif /* CONFIG_FUNCTION_TRACER */
  
- #endif /* ASM_X86__FTRACE_H */
+ #endif /* _ASM_X86_FTRACE_H */

diff --combined arch/x86/kernel/entry_32.S
index 008cc17521c3051a8db0aae31a9bb55ade698b91,dd65143941a841de0f55a4830732be7a0fcada4b..28b597ef9ca16b7992c333f10eae252ea695475c
--- 1/arch/x86/kernel/entry_32.S
--- 2/arch/x86/kernel/entry_32.S
+++ b/arch/x86/kernel/entry_32.S
@@@ -1024,7 -1024,7 +1024,7 @@@ ENTRY(machine_check
        RING0_INT_FRAME
        pushl $0
        CFI_ADJUST_CFA_OFFSET 4
-       pushl $do_machine_check
+       pushl machine_check_vector
        CFI_ADJUST_CFA_OFFSET 4
        jmp error_code
        CFI_ENDPROC
@@@ -1149,7 -1149,7 +1149,7 @@@ ENDPROC(xen_failsafe_callback
  
  #endif        /* CONFIG_XEN */
  
 -#ifdef CONFIG_FTRACE
 +#ifdef CONFIG_FUNCTION_TRACER
  #ifdef CONFIG_DYNAMIC_FTRACE
  
  ENTRY(mcount)
@@@ -1204,7 -1204,7 +1204,7 @@@ trace
        jmp ftrace_stub
  END(mcount)
  #endif /* CONFIG_DYNAMIC_FTRACE */
 -#endif /* CONFIG_FTRACE */
 +#endif /* CONFIG_FUNCTION_TRACER */
  
  .section .rodata,"a"
  #include "syscall_table_32.S"

diff --combined kernel/sysctl.c
index edb1075f80d23120219f16ba899b5078b706462c,a13bd4dfaeb1becfff933212893ea1c422ff0a04..9d048fa2d902ec2b768633afd4ecbaaafc01ec03
--- 1/kernel/sysctl.c
--- 2/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@@ -274,6 -274,16 +274,16 @@@ static struct ctl_table kern_table[] = 
                .mode           = 0644,
                .proc_handler   = &proc_dointvec,
        },
+       {
+               .ctl_name       = CTL_UNNUMBERED,
+               .procname       = "sched_shares_thresh",
+               .data           = &sysctl_sched_shares_thresh,
+               .maxlen         = sizeof(unsigned int),
+               .mode           = 0644,
+               .proc_handler   = &proc_dointvec_minmax,
+               .strategy       = &sysctl_intvec,
+               .extra1         = &zero,
+       },
        {
                .ctl_name       = CTL_UNNUMBERED,
                .procname       = "sched_child_runs_first",
@@@ -464,7 -474,7 +474,7 @@@
                .mode           = 0644,
                .proc_handler   = &proc_dointvec,
        },
 -#ifdef CONFIG_FTRACE
 +#ifdef CONFIG_FUNCTION_TRACER
        {
                .ctl_name       = CTL_UNNUMBERED,
                .procname       = "ftrace_enabled",