Merge branches 'tracing/ftrace' and 'linus' into tracing/core

diff --combined Documentation/kernel-parameters.txt
index 4a77008,0ed3234..4d7e001
--- 1/Documentation/kernel-parameters.txt
--- 2/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -49,7 -49,6 +49,7 @@@ parameter is applicable
        ISAPNP  ISA PnP code is enabled.
        ISDN    Appropriate ISDN support is enabled.
        JOY     Appropriate joystick support is enabled.
 +      KMEMTRACE kmemtrace is enabled.
        LIBATA  Libata driver is enabled
        LP      Printer support is enabled.
        LOOP    Loopback device support is enabled.
@@@ -869,8 -868,10 +869,10 @@@ and is between 256 and 4096 characters
        icn=            [HW,ISDN]
                        Format: <io>[,<membase>[,<icn_id>[,<icn_id2>]]]
  
-       ide=            [HW] (E)IDE subsystem
-                       Format: ide=nodma or ide=doubler
+       ide-core.nodma= [HW] (E)IDE subsystem
+                       Format: =0.0 to prevent dma on hda, =0.1 hdb =1.0 hdc
+                       .vlb_clock .pci_clock .noflush .noprobe .nowerr .cdrom
+                       .chs .ignore_cable are additional options
                        See Documentation/ide/ide.txt.
  
        idebus=         [HW] (E)IDE subsystem - VLB/PCI bus speed
@@@ -1046,15 -1047,6 +1048,15 @@@
                        use the HighMem zone if it exists, and the Normal
                        zone if it does not.
  
 +      kmemtrace.enable=       [KNL,KMEMTRACE] Format: { yes | no }
 +                              Controls whether kmemtrace is enabled
 +                              at boot-time.
 +
 +      kmemtrace.subbufs=n     [KNL,KMEMTRACE] Overrides the number of
 +                      subbufs kmemtrace's relay channel has. Set this
 +                      higher than default (KMEMTRACE_N_SUBBUFS in code) if
 +                      you experience buffer overruns.
 +
        movablecore=nn[KMG]     [KNL,X86-32,IA-64,PPC,X86-64] This parameter
                        is similar to kernelcore except it specifies the
                        amount of memory used for migratable allocations.

diff --combined arch/ia64/Kconfig
index 5b2a237,153e727..294a3b1
--- 1/arch/ia64/Kconfig
--- 2/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@@ -22,9 -22,6 +22,9 @@@ config IA6
        select HAVE_OPROFILE
        select HAVE_KPROBES
        select HAVE_KRETPROBES
 +      select HAVE_FTRACE_MCOUNT_RECORD
 +      select HAVE_DYNAMIC_FTRACE if (!ITANIUM)
 +      select HAVE_FUNCTION_TRACER
        select HAVE_DMA_ATTRS
        select HAVE_KVM
        select HAVE_ARCH_TRACEHOOK
@@@ -641,6 -638,17 +641,17 @@@ config DMA
          and include PCI device scope covered by these DMA
          remapping devices.
  
+ config DMAR_DEFAULT_ON
+       def_bool y
+       prompt "Enable DMA Remapping Devices by default"
+       depends on DMAR
+       help
+         Selecting this option will enable a DMAR device at boot time if
+         one is found. If this option is not selected, DMAR support can
+         be enabled by passing intel_iommu=on to the kernel. It is
+         recommended you say N here while the DMAR code remains
+         experimental.
+ 
  endmenu
  
  endif