Merge branch 'tracing/ftrace' into tracing/urgent

diff --combined arch/arm/Kconfig
index df39d20f7425ad9c41679a566ae212f924a222ff,c2f18ea4050025c28d28ff5dc5c8706546af2056..600733426ae04e33042646f41a3579965288ce2f
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -16,8 -16,8 +16,8 @@@ 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_DYNAMIC_FTRACE if (HAVE_FUNCTION_TRACER)
        select HAVE_GENERIC_DMA_COHERENT
        help
          The ARM series is a line of low-power-consumption RISC chip designs
@@@ -192,8 -192,6 +192,8 @@@ config VECTORS_BAS
  
  source "init/Kconfig"
  
 +source "kernel/Kconfig.freezer"
 +
  menu "System Type"
  
  choice

diff --combined arch/powerpc/Kconfig
index 9391199d9e7731d166b45130fa322e27936b1da0,97d86702e2d57d9ab0b5972d6527e5c3076b9bef..441ce06174ff3013f2999e3d88d841616141344a
--- 1/arch/powerpc/Kconfig
--- 2/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@@ -112,7 -112,7 +112,7 @@@ config PP
        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
@@@ -230,8 -230,6 +230,8 @@@ config PPC_OF_PLATFORM_PC
  
  source "init/Kconfig"
  
 +source "kernel/Kconfig.freezer"
 +
  source "arch/powerpc/sysdev/Kconfig"
  source "arch/powerpc/platforms/Kconfig"
  

diff --combined arch/sparc64/Kconfig
index 035b15af90d8a668583001ef9610ab761d7b9478,d269400d2868564dffffa4993ac08e094e2d17e1..824f6122e1a51f4e8b5c1d9e2028cb46f353fbf8
--- 1/arch/sparc64/Kconfig
--- 2/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@@ -12,7 -12,7 +12,7 @@@ config SPARC6
        bool
        default y
        select HAVE_DYNAMIC_FTRACE
-       select HAVE_FTRACE
+       select HAVE_FUNCTION_TRACER
        select HAVE_IDE
        select HAVE_LMB
        select HAVE_ARCH_KGDB
@@@ -96,7 -96,6 +96,7 @@@ config GENERIC_HARDIRQS_NO__DO_IR
        def_bool y
  
  source "init/Kconfig"
 +source "kernel/Kconfig.freezer"
  
  menu "Processor type and features"
  

diff --combined arch/x86/Kconfig
index 5b9b12321ad132ed1987ae7e5a9bdf278cc4be7a,290e21aa774dd0279eccfaa87eeae9d426cf9c44..100325c8605e47499c5ffa7daab573719869136d
--- 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
@@@ -194,7 -194,6 +194,7 @@@ config X86_TRAMPOLIN
  config KTIME_SCALAR
        def_bool X86_32
  source "init/Kconfig"
 +source "kernel/Kconfig.freezer"
  
  menu "Processor type and features"
  
@@@ -1243,6 -1242,14 +1243,6 @@@ config EF
        resultant kernel should continue to boot on existing non-EFI
        platforms.
  
 -config IRQBALANCE
 -      def_bool y
 -      prompt "Enable kernel irq balancing"
 -      depends on X86_32 && SMP && X86_IO_APIC
 -      help
 -        The default yes will allow the kernel to do irq load balancing.
 -        Saying no will keep the kernel from doing irq load balancing.
 -
  config SECCOMP
        def_bool y
        prompt "Enable seccomp to safely compute untrusted bytecode"

diff --combined arch/x86/kernel/Makefile
index d7e5a58ee22f376c13caab451ac1dcf6d4e33b08,ec3d30136bf097d3265ea365efedebde3d544e53..f1283fe60723de6ec0cf5be772803d1c9a941b30
--- 1/arch/x86/kernel/Makefile
--- 2/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@@ -6,7 -6,7 +6,7 @@@ extra-y                := head_$(BITS).
  
  CPPFLAGS_vmlinux.lds += -U$(UTS_MACHINE)
  
- ifdef CONFIG_FTRACE
+ ifdef CONFIG_FUNCTION_TRACER
  # Do not profile debug and lowlevel utilities
  CFLAGS_REMOVE_tsc.o = -pg
  CFLAGS_REMOVE_rtc.o = -pg
@@@ -23,7 -23,7 +23,7 @@@ CFLAGS_hpet.o         := $(nostackp
  CFLAGS_tsc.o          := $(nostackp)
  
  obj-y                 := process_$(BITS).o signal_$(BITS).o entry_$(BITS).o
 -obj-y                 += traps.o irq_$(BITS).o dumpstack_$(BITS).o
 +obj-y                 += traps.o irq.o irq_$(BITS).o dumpstack_$(BITS).o
  obj-y                 += time_$(BITS).o ioport.o ldt.o
  obj-y                 += setup.o i8259.o irqinit_$(BITS).o setup_percpu.o
  obj-$(CONFIG_X86_VISWS)       += visws_quirks.o
@@@ -60,8 -60,8 +60,8 @@@ obj-$(CONFIG_X86_32_SMP)      += smpcommon.
  obj-$(CONFIG_X86_64_SMP)      += tsc_sync.o smpcommon.o
  obj-$(CONFIG_X86_TRAMPOLINE)  += trampoline_$(BITS).o
  obj-$(CONFIG_X86_MPPARSE)     += mpparse.o
 -obj-$(CONFIG_X86_LOCAL_APIC)  += apic_$(BITS).o nmi.o
 -obj-$(CONFIG_X86_IO_APIC)     += io_apic_$(BITS).o
 +obj-$(CONFIG_X86_LOCAL_APIC)  += apic.o nmi.o
 +obj-$(CONFIG_X86_IO_APIC)     += io_apic.o
  obj-$(CONFIG_X86_REBOOTFIXUPS)        += reboot_fixups_32.o
  obj-$(CONFIG_DYNAMIC_FTRACE)  += ftrace.o
  obj-$(CONFIG_KEXEC)           += machine_kexec_$(BITS).o
@@@ -108,7 -108,7 +108,7 @@@ obj-$(CONFIG_MICROCODE)                    += microcode.
  # 64 bit specific files
  ifeq ($(CONFIG_X86_64),y)
          obj-y                         += genapic_64.o genapic_flat_64.o genx2apic_uv_x.o tlb_uv.o
 -      obj-y                           += bios_uv.o
 +      obj-y                           += bios_uv.o uv_irq.o uv_sysfs.o
          obj-y                         += genx2apic_cluster.o
          obj-y                         += genx2apic_phys.o
          obj-$(CONFIG_X86_PM_TIMER)    += pmtimer_64.o

diff --combined arch/x86/kernel/entry_32.S
index c356423a6026fd62123a13d6229bfa4d9a224df3,9d49facc21f290fb09001d9eba63139e43f05487..008cc17521c3051a8db0aae31a9bb55ade698b91
--- 1/arch/x86/kernel/entry_32.S
--- 2/arch/x86/kernel/entry_32.S
+++ b/arch/x86/kernel/entry_32.S
@@@ -629,7 -629,7 +629,7 @@@ ENTRY(interrupt
  ENTRY(irq_entries_start)
        RING0_INT_FRAME
  vector=0
 -.rept NR_IRQS
 +.rept NR_VECTORS
        ALIGN
   .if vector
        CFI_ADJUST_CFA_OFFSET -4
@@@ -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/Makefile
index 305f11dbef216cd9cb5efba14483492b59a26354,85f588a9d0b14b9b31e3adfe269e6f12c5a52fcf..9a3ec66a9d841c961e51bfac872462d051098a18
--- 1/kernel/Makefile
--- 2/kernel/Makefile
+++ b/kernel/Makefile
@@@ -13,7 -13,7 +13,7 @@@ obj-y     = sched.o fork.o exec_domain.
  
  CFLAGS_REMOVE_sched.o = -mno-spe
  
- ifdef CONFIG_FTRACE
+ ifdef CONFIG_FUNCTION_TRACER
  # Do not trace debug files and internal ftrace files
  CFLAGS_REMOVE_lockdep.o = -pg
  CFLAGS_REMOVE_lockdep_proc.o = -pg
@@@ -24,7 -24,6 +24,7 @@@ CFLAGS_REMOVE_sched_clock.o = -p
  CFLAGS_REMOVE_sched.o = -mno-spe -pg
  endif
  
 +obj-$(CONFIG_FREEZER) += freezer.o
  obj-$(CONFIG_PROFILING) += profile.o
  obj-$(CONFIG_SYSCTL_SYSCALL_CHECK) += sysctl_check.o
  obj-$(CONFIG_STACKTRACE) += stacktrace.o
@@@ -56,7 -55,6 +56,7 @@@ obj-$(CONFIG_BACKTRACE_SELF_TEST) += ba
  obj-$(CONFIG_COMPAT) += compat.o
  obj-$(CONFIG_CGROUPS) += cgroup.o
  obj-$(CONFIG_CGROUP_DEBUG) += cgroup_debug.o
 +obj-$(CONFIG_CGROUP_FREEZER) += cgroup_freezer.o
  obj-$(CONFIG_CPUSETS) += cpuset.o
  obj-$(CONFIG_CGROUP_NS) += ns_cgroup.o
  obj-$(CONFIG_UTS_NS) += utsname.o
@@@ -88,7 -86,7 +88,7 @@@ obj-$(CONFIG_MARKERS) += marker.
  obj-$(CONFIG_TRACEPOINTS) += tracepoint.o
  obj-$(CONFIG_LATENCYTOP) += latencytop.o
  obj-$(CONFIG_HAVE_GENERIC_DMA_COHERENT) += dma-coherent.o
- obj-$(CONFIG_FTRACE) += trace/
+ obj-$(CONFIG_FUNCTION_TRACER) += trace/
  obj-$(CONFIG_TRACING) += trace/
  obj-$(CONFIG_SMP) += sched_cpupri.o
  

diff --combined kernel/sysctl.c
index b3cc73931d1f6411c6e99faf205124987d4a887e,619eb9f3acd8522bad4a848caaf7d44cbf0432cc..edb1075f80d23120219f16ba899b5078b706462c
--- 1/kernel/sysctl.c
--- 2/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@@ -464,7 -464,7 +464,7 @@@ static struct ctl_table kern_table[] = 
                .mode           = 0644,
                .proc_handler   = &proc_dointvec,
        },
- #ifdef CONFIG_FTRACE
+ #ifdef CONFIG_FUNCTION_TRACER
        {
                .ctl_name       = CTL_UNNUMBERED,
                .procname       = "ftrace_enabled",
@@@ -833,16 -833,6 +833,16 @@@
                .proc_handler   = &proc_dointvec,
        },
  #endif
 +#ifdef CONFIG_UNEVICTABLE_LRU
 +      {
 +              .ctl_name       = CTL_UNNUMBERED,
 +              .procname       = "scan_unevictable_pages",
 +              .data           = &scan_unevictable_pages,
 +              .maxlen         = sizeof(scan_unevictable_pages),
 +              .mode           = 0644,
 +              .proc_handler   = &scan_unevictable_handler,
 +      },
 +#endif
  /*
   * NOTE: do not add new entries to this table unless you have read
   * Documentation/sysctl/ctl_unnumbered.txt