Merge branch 'oprofile-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

* 'oprofile-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  oprofile: introduce module_param oprofile.cpu_type
  oprofile: add support for Core i7 and Atom
  oprofile: remove undocumented oprofile.p4force option
  oprofile: re-add force_arch_perfmon option

diff --combined Documentation/kernel-parameters.txt
index af43f45e8358c3bcb1bc9de541adcf26379755cf,6ce5f48859cc54a2bcee75c89a261c48579e2d3d..f08e2bebb1864b44edb733ee96eae30c06cf6ee9
--- 1/Documentation/kernel-parameters.txt
--- 2/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -17,12 -17,6 +17,12 @@@ are specified on the kernel command lin
  
        usbcore.blinkenlights=1
  
 +Hyphens (dashes) and underscores are equivalent in parameter names, so
 +      log_buf_len=1M print-fatal-signals=1
 +can also be entered as
 +      log-buf-len=1M print_fatal_signals=1
 +
 +
  This document may not be entirely up to date and comprehensive. The command
  "modinfo -p ${modulename}" shows a current list of all parameters of a loadable
  module. Loadable modules, after being loaded into the running kernel, also
@@@ -329,6 -323,11 +329,6 @@@ and is between 256 and 4096 characters
                                    flushed before they will be reused, which
                                    is a lot of faster
  
 -      amd_iommu_size= [HW,X86-64]
 -                      Define the size of the aperture for the AMD IOMMU
 -                      driver. Possible values are:
 -                      '32M', '64M' (default), '128M', '256M', '512M', '1G'
 -
        amijoy.map=     [HW,JOY] Amiga joystick support
                        Map of devices attached to JOY0DAT and JOY1DAT
                        Format: <a>,<b>
@@@ -346,7 -345,7 +346,7 @@@
                        not play well with APC CPU idle - disable it if you have
                        APC and your system crashes randomly.
  
 -      apic=           [APIC,i386] Advanced Programmable Interrupt Controller
 +      apic=           [APIC,X86-32] Advanced Programmable Interrupt Controller
                        Change the output verbosity whilst booting
                        Format: { quiet (default) | verbose | debug }
                        Change the amount of debugging information output
@@@ -641,13 -640,6 +641,13 @@@
                        DMA-API debugging code disables itself because the
                        architectural default is too low.
  
 +      dma_debug_driver=<driver_name>
 +                      With this option the DMA-API debugging driver
 +                      filter feature can be enabled at boot time. Just
 +                      pass the driver to filter for as the parameter.
 +                      The filter can be disabled or changed to another
 +                      driver later using sysfs.
 +
        dscc4.setup=    [NET]
  
        dtc3181e=       [HW,SCSI]
@@@ -710,7 -702,7 +710,7 @@@
                        to discrete, to make X server driver able to add WB
                        entry later. This parameter enables that.
  
 -      enable_timer_pin_1 [i386,x86-64]
 +      enable_timer_pin_1 [X86]
                        Enable PIN 1 of APIC timer
                        Can be useful to work around chipset bugs
                        (in particular on some ATI chipsets).
@@@ -783,7 -775,7 +783,7 @@@
  
        hashdist=       [KNL,NUMA] Large hashes allocated during boot
                        are distributed across NUMA nodes.  Defaults on
 -                      for IA-64, off otherwise.
 +                      for 64bit NUMA, off otherwise.
                        Format: 0 | 1 (for off | on)
  
        hcl=            [IA-64] SGI's Hardware Graph compatibility layer
@@@ -1537,10 -1529,6 +1537,10 @@@
                        register save and restore. The kernel will only save
                        legacy floating-point registers on task switch.
  
 +      noxsave         [BUGS=X86] Disables x86 extended register state save
 +                      and restore using xsave. The kernel will fallback to
 +                      enabling legacy floating-point and sse state.
 +
        nohlt           [BUGS=ARM,SH] Tells the kernel that the sleep(SH) or
                        wfi(ARM) instruction doesn't work correctly and not to
                        use it. This is also useful when using JTAG debugger.
@@@ -1577,9 -1565,6 +1577,9 @@@
        noinitrd        [RAM] Tells the kernel not to load any configured
                        initial RAM disk.
  
 +      nointremap      [X86-64, Intel-IOMMU] Do not enable interrupt
 +                      remapping.
 +
        nointroute      [IA-64]
  
        nojitter        [IA64] Disables jitter checking for ITC timers.
@@@ -1665,6 -1650,14 +1665,14 @@@
        oprofile.timer= [HW]
                        Use timer interrupt instead of performance counters
  
+       oprofile.cpu_type=      Force an oprofile cpu type
+                       This might be useful if you have an older oprofile
+                       userland or if you want common events.
+                       Format: { archperfmon }
+                       archperfmon: [X86] Force use of architectural
+                               perfmon on Intel CPUs instead of the
+                               CPU specific event set.
+ 
        osst=           [HW,SCSI] SCSI Tape Driver
                        Format: <buffer_size>,<write_threshold>
                        See also Documentation/scsi/st.txt.