]> Pileus Git - ~andy/linux/commitdiff
Merge commit 'v2.6.34-rc1' into perf/urgent
authorIngo Molnar <mingo@elte.hu>
Tue, 9 Mar 2010 16:11:53 +0000 (17:11 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 9 Mar 2010 16:11:53 +0000 (17:11 +0100)
Conflicts:
tools/perf/util/probe-event.c

Merge reason: Pick up -rc1 and resolve the conflict as well.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
1  2 
MAINTAINERS
arch/x86/kernel/cpu/perf_event.c
arch/x86/kernel/cpu/perf_event_intel.c
arch/x86/kernel/dumpstack_64.c
kernel/perf_event.c
lib/Kconfig.debug
tools/perf/util/probe-event.c

diff --combined MAINTAINERS
index 40ed22e02d6279f0810999f7efa66ba5306db10a,c8a8b1fd58b36d751fe31b308c8c76ba721cab0f..14d5c4c7091c04331178cf9ed90ccc857457a124
@@@ -71,6 -71,7 +71,7 @@@ Descriptions of section entries
        M: Mail patches to: FullName <address@domain>
        L: Mailing list that is relevant to this area
        W: Web-page with status/info
+       Q: Patchwork web based patch tracking system site
        T: SCM tree type and location.  Type is one of: git, hg, quilt, stgit.
        S: Status, one of the following:
           Supported:   Someone is actually paid to look after this.
@@@ -182,6 -183,7 +183,7 @@@ M: Ron Minnich <rminnich@sandia.gov
  M:    Latchesar Ionkov <lucho@ionkov.net>
  L:    v9fs-developer@lists.sourceforge.net
  W:    http://swik.net/v9fs
+ Q:    http://patchwork.kernel.org/project/v9fs-devel/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git
  S:    Maintained
  F:    Documentation/filesystems/9p.txt
@@@ -221,6 -223,7 +223,7 @@@ F: drivers/net/acenic
  
  ACER ASPIRE ONE TEMPERATURE AND FAN DRIVER
  M:    Peter Feuerer <peter@piie.net>
+ L:    platform-driver-x86@vger.kernel.org
  W:    http://piie.net/?section=acerhdf
  S:    Maintained
  F:    drivers/platform/x86/acerhdf.c
  ACER WMI LAPTOP EXTRAS
  M:    Carlos Corbacho <carlos@strangeworlds.co.uk>
  L:    aceracpi@googlegroups.com (subscribers-only)
+ L:    platform-driver-x86@vger.kernel.org
  W:    http://code.google.com/p/aceracpi
  S:    Maintained
  F:    drivers/platform/x86/acer-wmi.c
@@@ -236,6 -240,7 +240,7 @@@ ACP
  M:    Len Brown <lenb@kernel.org>
  L:    linux-acpi@vger.kernel.org
  W:    http://www.lesswatts.org/projects/acpi/
+ Q:    http://patchwork.kernel.org/project/linux-acpi/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git
  S:    Supported
  F:    drivers/acpi/
@@@ -288,7 -293,7 +293,7 @@@ F: drivers/acpi/video.
  
  ACPI WMI DRIVER
  M:    Carlos Corbacho <carlos@strangeworlds.co.uk>
- L:    linux-acpi@vger.kernel.org
+ L:    platform-driver-x86@vger.kernel.org
  W:    http://www.lesswatts.org/projects/acpi/
  S:    Maintained
  F:    drivers/platform/x86/wmi.c
@@@ -426,7 -431,6 +431,6 @@@ P: Jordan Crous
  L:    linux-geode@lists.infradead.org (moderated for non-subscribers)
  W:    http://www.amd.com/us-en/ConnectivitySolutions/TechnicalResources/0,,50_2334_2452_11363,00.html
  S:    Supported
- F:    arch/x86/kernel/geode_32.c
  F:    drivers/char/hw_random/geode-rng.c
  F:    drivers/crypto/geode*
  F:    drivers/video/geode/
@@@ -964,10 -968,18 +968,18 @@@ W:      http://www.arm.linux.org.uk
  S:    Maintained
  F:    arch/arm/vfp/
  
+ ASC7621 HARDWARE MONITOR DRIVER
+ M:    George Joseph <george.joseph@fairview5.com>
+ L:    lm-sensors@lm-sensors.org
+ S:    Maintained
+ F:    Documentation/hwmon/asc7621
+ F:    drivers/hwmon/asc7621.c
  ASUS ACPI EXTRAS DRIVER
  M:    Corentin Chary <corentincj@iksaif.net>
  M:    Karol Kozimor <sziwan@users.sourceforge.net>
  L:    acpi4asus-user@lists.sourceforge.net
+ L:    platform-driver-x86@vger.kernel.org
  W:    http://acpi4asus.sf.net
  S:    Maintained
  F:    drivers/platform/x86/asus_acpi.c
@@@ -981,6 -993,7 +993,7 @@@ F: drivers/hwmon/asb100.
  ASUS LAPTOP EXTRAS DRIVER
  M:    Corentin Chary <corentincj@iksaif.net>
  L:    acpi4asus-user@lists.sourceforge.net
+ L:    platform-driver-x86@vger.kernel.org
  W:    http://acpi4asus.sf.net
  S:    Maintained
  F:    drivers/platform/x86/asus-laptop.c
@@@ -1328,6 -1341,7 +1341,7 @@@ BTRFS FILE SYSTE
  M:    Chris Mason <chris.mason@oracle.com>
  L:    linux-btrfs@vger.kernel.org
  W:    http://btrfs.wiki.kernel.org/
+ Q:    http://patchwork.kernel.org/project/linux-btrfs/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable.git
  S:    Maintained
  F:    Documentation/filesystems/btrfs.txt
@@@ -1473,6 -1487,7 +1487,7 @@@ F:      drivers/scsi/fnic
  CMPC ACPI DRIVER
  M:    Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
  M:    Daniel Oliveira Nascimento <don@syst.com.br>
+ L:    platform-driver-x86@vger.kernel.org
  S:    Supported
  F:    drivers/platform/x86/classmate-laptop.c
  
@@@ -1491,6 -1506,7 +1506,7 @@@ M:      Steve French <sfrench@samba.org
  L:    linux-cifs-client@lists.samba.org (moderated for non-subscribers)
  L:    samba-technical@lists.samba.org (moderated for non-subscribers)
  W:    http://linux-cifs.samba.org/
+ Q:    http://patchwork.ozlabs.org/project/linux-cifs-client/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git
  S:    Supported
  F:    Documentation/filesystems/cifs.txt
@@@ -1516,6 -1532,7 +1532,7 @@@ F:      drivers/pci/hotplug/cpcihp_generic.
  
  COMPAL LAPTOP SUPPORT
  M:    Cezary Jackiewicz <cezary.jackiewicz@gmail.com>
+ L:    platform-driver-x86@vger.kernel.org
  S:    Maintained
  F:    drivers/platform/x86/compal-laptop.c
  
@@@ -1746,6 -1763,7 +1763,7 @@@ F:      drivers/net/defxx.
  
  DELL LAPTOP DRIVER
  M:    Matthew Garrett <mjg59@srcf.ucam.org>
+ L:    platform-driver-x86@vger.kernel.org
  S:    Maintained
  F:    drivers/platform/x86/dell-laptop.c
  
@@@ -1775,6 -1793,7 +1793,7 @@@ DEVICE-MAPPER  (LVM
  P:    Alasdair Kergon
  L:    dm-devel@redhat.com
  W:    http://sources.redhat.com/dm
+ Q:    http://patchwork.kernel.org/project/dm-devel/list/
  S:    Maintained
  F:    Documentation/device-mapper/
  F:    drivers/md/dm*
@@@ -2028,6 -2047,7 +2047,7 @@@ F:      drivers/edac/r82600_edac.
  EEEPC LAPTOP EXTRAS DRIVER
  M:    Corentin Chary <corentincj@iksaif.net>
  L:    acpi4asus-user@lists.sourceforge.net
+ L:    platform-driver-x86@vger.kernel.org
  W:    http://acpi4asus.sf.net
  S:    Maintained
  F:    drivers/platform/x86/eeepc-laptop.c
@@@ -2118,6 -2138,7 +2138,7 @@@ M:      "Theodore Ts'o" <tytso@mit.edu
  M:    Andreas Dilger <adilger@sun.com>
  L:    linux-ext4@vger.kernel.org
  W:    http://ext4.wiki.kernel.org
+ Q:    http://patchwork.ozlabs.org/project/linux-ext4/list/
  S:    Maintained
  F:    Documentation/filesystems/ext4.txt
  F:    fs/ext4/
@@@ -2141,6 -2162,17 +2162,17 @@@ S:    Supporte
  F:    Documentation/fault-injection/
  F:    lib/fault-inject.c
  
+ FCOE SUBSYSTEM (libfc, libfcoe, fcoe)
+ M:    Robert Love <robert.w.love@intel.com>
+ L:    devel@open-fcoe.org
+ W:    www.Open-FCoE.org
+ S:    Supported
+ F:    drivers/scsi/libfc/
+ F:    drivers/scsi/fcoe/
+ F:    include/scsi/fc/
+ F:    include/scsi/libfc.h
+ F:    include/scsi/libfcoe.h
  FILE LOCKING (flock() and fcntl()/lockf())
  M:    Matthew Wilcox <matthew@wil.cx>
  L:    linux-fsdevel@vger.kernel.org
@@@ -2295,7 -2327,7 +2327,7 @@@ F:      arch/frv
  
  FUJITSU LAPTOP EXTRAS
  M:    Jonathan Woithe <jwoithe@physics.adelaide.edu.au>
- L:    linux-acpi@vger.kernel.org
+ L:    platform-driver-x86@vger.kernel.org
  S:    Maintained
  F:    drivers/platform/x86/fujitsu-laptop.c
  
@@@ -2372,6 -2404,12 +2404,12 @@@ F:    Documentation/isdn/README.gigase
  F:    drivers/isdn/gigaset/
  F:    include/linux/gigaset_dev.h
  
+ GRETH 10/100/1G Ethernet MAC device driver
+ M:    Kristoffer Glembo <kristoffer@gaisler.com>
+ L:    netdev@vger.kernel.org
+ S:    Maintained
+ F:    drivers/net/greth*
  HARD DRIVE ACTIVE PROTECTION SYSTEM (HDAPS) DRIVER
  M:    Frank Seidel <frank@f-seidel.de>
  L:    lm-sensors@lm-sensors.org
@@@ -2393,6 -2431,18 +2431,18 @@@ L:    linuxppc-dev@ozlabs.or
  S:    Odd Fixes
  F:    drivers/char/hvc_*
  
+ VIRTIO CONSOLE DRIVER
+ M:    Amit Shah <amit.shah@redhat.com>
+ L:    virtualization@lists.linux-foundation.org
+ S:    Maintained
+ F:    drivers/char/virtio_console.c
+ iSCSI BOOT FIRMWARE TABLE (iBFT) DRIVER
+ M:    Peter Jones <pjones@redhat.com>
+ M:    Konrad Rzeszutek Wilk <konrad@kernel.org>
+ S:    Maintained
+ F:    drivers/firmware/iscsi_ibft*
  GSPCA FINEPIX SUBDRIVER
  M:    Frank Zago <frank@zago.net>
  L:    linux-media@vger.kernel.org
@@@ -2465,13 -2515,6 +2515,6 @@@ L:     linux-parisc@vger.kernel.or
  S:    Maintained
  F:    sound/parisc/harmony.*
  
- HAYES ESP SERIAL DRIVER
- M:    "Andrew J. Robinson" <arobinso@nyx.net>
- W:    http://www.nyx.net/~arobinso
- S:    Maintained
- F:    Documentation/serial/hayes-esp.txt
- F:    drivers/char/esp.c
  HEWLETT-PACKARD SMART2 RAID DRIVER
  M:    Chirag Kantharia <chirag.kantharia@hp.com>
  L:    iss_storagedev@hp.com
@@@ -2561,6 -2604,7 +2604,7 @@@ F:      drivers/net/wireless/hostap
  
  HP COMPAQ TC1100 TABLET WMI EXTRAS DRIVER
  M:    Carlos Corbacho <carlos@strangeworlds.co.uk>
+ L:    platform-driver-x86@vger.kernel.org
  S:    Odd Fixes
  F:    drivers/platform/x86/tc1100-wmi.c
  
@@@ -2679,6 -2723,7 +2723,7 @@@ F:      drivers/scsi/ips.
  IDE SUBSYSTEM
  M:    "David S. Miller" <davem@davemloft.net>
  L:    linux-ide@vger.kernel.org
+ Q:    http://patchwork.ozlabs.org/project/linux-ide/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6.git
  S:    Maintained
  F:    Documentation/ide/
@@@ -2733,6 -2778,7 +2778,7 @@@ M:      Sean Hefty <sean.hefty@intel.com
  M:    Hal Rosenstock <hal.rosenstock@gmail.com>
  L:    linux-rdma@vger.kernel.org
  W:    http://www.openib.org/
+ Q:    http://patchwork.kernel.org/project/linux-rdma/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git
  S:    Supported
  F:    Documentation/infiniband/
@@@ -2752,6 -2798,7 +2798,7 @@@ INPUT (KEYBOARD, MOUSE, JOYSTICK, TOUCH
  M:    Dmitry Torokhov <dmitry.torokhov@gmail.com>
  M:    Dmitry Torokhov <dtor@mail.ru>
  L:    linux-input@vger.kernel.org
+ Q:    http://patchwork.kernel.org/project/linux-input/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git
  S:    Maintained
  F:    drivers/input/
@@@ -2771,7 -2818,7 +2818,7 @@@ F:      drivers/video/i810
  
  INTEL MENLOW THERMAL DRIVER
  M:    Sujith Thomas <sujith.thomas@intel.com>
- L:    linux-acpi@vger.kernel.org
+ L:    platform-driver-x86@vger.kernel.org
  W:    http://www.lesswatts.org/projects/acpi/
  S:    Supported
  F:    drivers/platform/x86/intel_menlow.c
@@@ -3008,6 -3055,13 +3055,13 @@@ W:    http://www.melware.d
  S:    Maintained
  F:    drivers/isdn/hardware/eicon/
  
+ IT87 HARDWARE MONITORING DRIVER
+ M:    Jean Delvare <khali@linux-fr.org>
+ L:    lm-sensors@lm-sensors.org
+ S:    Maintained
+ F:    Documentation/hwmon/it87
+ F:    drivers/hwmon/it87.c
  IVTV VIDEO4LINUX DRIVER
  M:    Andy Walls <awalls@radix.net>
  L:    ivtv-devel@ivtvdriver.org (moderated for non-subscribers)
@@@ -3061,6 -3115,7 +3115,7 @@@ F:      drivers/hwmon/k8temp.
  KCONFIG
  M:    Roman Zippel <zippel@linux-m68k.org>
  L:    linux-kbuild@vger.kernel.org
+ Q:    http://patchwork.kernel.org/project/linux-kbuild/list/
  S:    Maintained
  F:    Documentation/kbuild/kconfig-language.txt
  F:    scripts/kconfig/
@@@ -3135,7 -3190,7 +3190,7 @@@ F:      arch/x86/include/asm/svm.
  F:    arch/x86/kvm/svm.c
  
  KERNEL VIRTUAL MACHINE (KVM) FOR POWERPC
- M:    Hollis Blanchard <hollisb@us.ibm.com>
+ M:    Alexander Graf <agraf@suse.de>
  L:    kvm-ppc@vger.kernel.org
  W:    http://kvm.qumranet.com
  S:    Supported
@@@ -3274,6 -3329,7 +3329,7 @@@ M:      Benjamin Herrenschmidt <benh@kernel.
  M:    Paul Mackerras <paulus@samba.org>
  W:    http://www.penguinppc.org/
  L:    linuxppc-dev@ozlabs.org
+ Q:    http://patchwork.ozlabs.org/project/linuxppc-dev/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git
  S:    Supported
  F:    Documentation/powerpc/
@@@ -3394,6 -3450,13 +3450,13 @@@ S:    Maintaine
  F:    Documentation/ldm.txt
  F:    fs/partitions/ldm.*
  
+ LogFS
+ M:    Joern Engel <joern@logfs.org>
+ L:    logfs@logfs.org
+ W:    logfs.org
+ S:    Maintained
+ F:    fs/logfs/
  LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI)
  M:    Eric Moore <Eric.Moore@lsi.com>
  M:    support@lsi.com
@@@ -3496,9 -3559,9 +3559,9 @@@ F:      drivers/net/mv643xx_eth.
  F:    include/linux/mv643xx.h
  
  MARVELL MWL8K WIRELESS DRIVER
- M:    Lennert Buytenhek <buytenh@marvell.com>
+ M:    Lennert Buytenhek <buytenh@wantstofly.org>
  L:    linux-wireless@vger.kernel.org
- S:    Supported
+ S:    Maintained
  F:    drivers/net/wireless/mwl8k.c
  
  MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER
@@@ -3530,6 -3593,7 +3593,7 @@@ M:      Mauro Carvalho Chehab <mchehab@infra
  P:    LinuxTV.org Project
  L:    linux-media@vger.kernel.org
  W:    http://linuxtv.org
+ Q:    http://patchwork.kernel.org/project/linux-media/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
  S:    Maintained
  F:    Documentation/dvb/
@@@ -3565,8 -3629,9 +3629,9 @@@ F:      mm/memcontrol.
  
  MEMORY TECHNOLOGY DEVICES (MTD)
  M:    David Woodhouse <dwmw2@infradead.org>
- W:    http://www.linux-mtd.infradead.org/
  L:    linux-mtd@lists.infradead.org
+ W:    http://www.linux-mtd.infradead.org/
+ Q:    http://patchwork.ozlabs.org/project/linux-mtd/list/
  T:    git git://git.infradead.org/mtd-2.6.git
  S:    Maintained
  F:    drivers/mtd/
@@@ -3637,6 -3702,7 +3702,7 @@@ F:      drivers/char/mxser.
  
  MSI LAPTOP SUPPORT
  M:    Lennart Poettering <mzxreary@0pointer.de>
+ L:    platform-driver-x86@vger.kernel.org
  W:    https://tango.0pointer.de/mailman/listinfo/s270-linux
  W:    http://0pointer.de/lennart/tchibo.html
  S:    Maintained
@@@ -3644,6 -3710,7 +3710,7 @@@ F:      drivers/platform/x86/msi-laptop.
  
  MSI WMI SUPPORT
  M:    Anisse Astier <anisse@astier.eu>
+ L:    platform-driver-x86@vger.kernel.org
  S:    Supported
  F:    drivers/platform/x86/msi-wmi.c
  
@@@ -3824,6 -3891,7 +3891,7 @@@ S:      Maintaine
  NETWORKING [WIRELESS]
  M:    "John W. Linville" <linville@tuxdriver.com>
  L:    linux-wireless@vger.kernel.org
+ Q:    http://patchwork.kernel.org/project/linux-wireless/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git
  S:    Maintained
  F:    net/mac80211/
@@@ -3916,6 -3984,7 +3984,7 @@@ M:      Tony Lindgren <tony@atomide.com
  L:    linux-omap@vger.kernel.org
  W:    http://www.muru.com/linux/omap/
  W:    http://linux.omap.com/
+ Q:    http://patchwork.kernel.org/project/linux-omap/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git
  S:    Maintained
  F:    arch/arm/*omap*/
@@@ -4096,6 -4165,7 +4165,7 @@@ F:      drivers/i2c/busses/i2c-pasemi.
  
  PANASONIC LAPTOP ACPI EXTRAS DRIVER
  M:    Harald Welte <laforge@gnumonks.org>
+ L:    platform-driver-x86@vger.kernel.org
  S:    Maintained
  F:    drivers/platform/x86/panasonic-laptop.c
  
@@@ -4141,6 -4211,7 +4211,7 @@@ M:      Helge Deller <deller@gmx.de
  M:    "James E.J. Bottomley" <jejb@parisc-linux.org>
  L:    linux-parisc@vger.kernel.org
  W:    http://www.parisc-linux.org/
+ Q:    http://patchwork.kernel.org/project/linux-parisc/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6.git
  S:    Maintained
  F:    arch/parisc/
@@@ -4183,6 -4254,7 +4254,7 @@@ F:      Documentation/powerpc/eeh-pci-error-
  PCI SUBSYSTEM
  M:    Jesse Barnes <jbarnes@virtuousgeek.org>
  L:    linux-pci@vger.kernel.org
+ Q:    http://patchwork.kernel.org/project/linux-pci/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6.git
  S:    Supported
  F:    Documentation/PCI/
@@@ -4221,11 -4293,12 +4293,13 @@@ PERFORMANCE EVENTS SUBSYSTE
  M:    Peter Zijlstra <a.p.zijlstra@chello.nl>
  M:    Paul Mackerras <paulus@samba.org>
  M:    Ingo Molnar <mingo@elte.hu>
 +M:    Arnaldo Carvalho de Melo <acme@redhat.com>
  S:    Supported
  F:    kernel/perf_event.c
  F:    include/linux/perf_event.h
- F:    arch/*/*/kernel/perf_event.c
+ F:    arch/*/kernel/perf_event.c
+ F:    arch/*/kernel/*/perf_event.c
+ F:    arch/*/kernel/*/*/perf_event.c
  F:    arch/*/include/asm/perf_event.h
  F:    arch/*/lib/perf_event.c
  F:    arch/*/kernel/perf_callchain.c
@@@ -4446,6 -4519,13 +4520,13 @@@ S:    Supporte
  F:    Documentation/networking/LICENSE.qla3xxx
  F:    drivers/net/qla3xxx.*
  
+ QLOGIC QLCNIC (1/10)Gb ETHERNET DRIVER
+ M:    Amit Kumar Salecha <amit.salecha@qlogic.com>
+ M:    linux-driver@qlogic.com
+ L:    netdev@vger.kernel.org
+ S:    Supported
+ F:    drivers/net/qlcnic/
  QLOGIC QLGE 10Gb ETHERNET DRIVER
  M:    Ron Mercer <ron.mercer@qlogic.com>
  M:    linux-driver@qlogic.com
@@@ -4510,7 -4590,7 +4591,7 @@@ F:      drivers/net/wireless/ray
  RCUTORTURE MODULE
  M:    Josh Triplett <josh@freedesktop.org>
  M:    "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
- S:    Maintained
+ S:    Supported
  F:    Documentation/RCU/torture.txt
  F:    kernel/rcutorture.c
  
@@@ -4535,11 -4615,12 +4616,12 @@@ M:   Dipankar Sarma <dipankar@in.ibm.com
  M:    "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
  W:    http://www.rdrop.com/users/paulmck/rclock/
  S:    Supported
- F:    Documentation/RCU/rcu.txt
- F:    Documentation/RCU/rcuref.txt
- F:    include/linux/rcupdate.h
- F:    include/linux/srcu.h
- F:    kernel/rcupdate.c
+ F:    Documentation/RCU/
+ F:    include/linux/rcu*
+ F:    include/linux/srcu*
+ F:    kernel/rcu*
+ F:    kernel/srcu*
+ X:    kernel/rcutorture.c
  
  REAL TIME CLOCK DRIVER
  M:    Paul Gortmaker <p_gortmaker@yahoo.com>
@@@ -4551,6 -4632,7 +4633,7 @@@ F:      include/linux/rtc.
  REAL TIME CLOCK (RTC) SUBSYSTEM
  M:    Alessandro Zummo <a.zummo@towertech.it>
  L:    rtc-linux@googlegroups.com
+ Q:    http://patchwork.ozlabs.org/project/rtc-linux/list/
  S:    Maintained
  F:    Documentation/rtc.txt
  F:    drivers/rtc/
@@@ -4677,6 -4759,13 +4760,13 @@@ F:    drivers/media/common/saa7146
  F:    drivers/media/video/*7146*
  F:    include/media/*7146*
  
+ TLG2300 VIDEO4LINUX-2 DRIVER
+ M:    Huang Shijie <shijie8@gmail.com>
+ M:    Kang Yong <kangyong@telegent.com>
+ M:    Zhang Xiaobing <xbzhang@telegent.com>
+ S:    Supported
+ F:    drivers/media/video/tlg2300
  SC1200 WDT DRIVER
  M:    Zwane Mwaikambo <zwane@arm.linux.org.uk>
  S:    Maintained
@@@ -4832,6 -4921,8 +4922,8 @@@ F:      drivers/scsi/be2iscsi
  SERVER ENGINES 10Gbps NIC - BladeEngine 2 DRIVER
  M:    Sathya Perla <sathyap@serverengines.com>
  M:    Subbu Seetharaman <subbus@serverengines.com>
+ M:    Sarveshwar Bandi <sarveshwarb@serverengines.com>
+ M:    Ajit Khaparde <ajitk@serverengines.com>
  L:    netdev@vger.kernel.org
  W:    http://www.serverengines.com
  S:    Supported
@@@ -4909,6 -5000,7 +5001,7 @@@ F:      drivers/*/*/*s3c2410
  TI DAVINCI MACHINE SUPPORT
  P:    Kevin Hilman
  M:    davinci-linux-open-source@linux.davincidsp.com
+ Q:    http://patchwork.kernel.org/project/linux-davinci/list/
  S:    Supported
  F:    arch/arm/mach-davinci
  
@@@ -5035,7 -5127,7 +5128,7 @@@ F:      include/linux/ssb
  
  SONY VAIO CONTROL DEVICE DRIVER
  M:    Mattia Dongili <malattia@linux.it>
- L:    linux-acpi@vger.kernel.org
+ L:    platform-driver-x86@vger.kernel.org
  W:    http://www.linux.it/~malattia/wiki/index.php/Sony_drivers
  S:    Maintained
  F:    Documentation/laptops/sony-laptop.txt
@@@ -5074,6 -5166,7 +5167,7 @@@ F:      include/sound/soc
  SPARC + UltraSPARC (sparc/sparc64)
  M:    "David S. Miller" <davem@davemloft.net>
  L:    sparclinux@vger.kernel.org
+ Q:    http://patchwork.ozlabs.org/project/sparclinux/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git
  S:    Maintained
@@@ -5089,6 -5182,7 +5183,7 @@@ SPI SUBSYSTE
  M:    David Brownell <dbrownell@users.sourceforge.net>
  M:    Grant Likely <grant.likely@secretlab.ca>
  L:    spi-devel-general@lists.sourceforge.net
+ Q:    http://patchwork.kernel.org/project/spi-devel-general/list/
  S:    Maintained
  F:    Documentation/spi/
  F:    drivers/spi/
@@@ -5144,7 -5238,7 +5239,7 @@@ F:      drivers/net/starfire
  
  STARMODE RADIO IP (STRIP) PROTOCOL DRIVER
  S:    Orphan
- F:    drivers/net/wireless/strip.c
+ F:    drivers/staging/strip/strip.c
  F:    include/linux/if_strip.h
  
  STRADIS MPEG-2 DECODER DRIVER
@@@ -5165,6 -5259,7 +5260,7 @@@ SUPER
  M:    Paul Mundt <lethal@linux-sh.org>
  L:    linux-sh@vger.kernel.org
  W:    http://www.linux-sh.org
+ Q:    http://patchwork.kernel.org/project/linux-sh/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git
  S:    Supported
  F:    Documentation/sh/
@@@ -5241,6 -5336,7 +5337,7 @@@ F:      arch/xtensa
  THINKPAD ACPI EXTRAS DRIVER
  M:    Henrique de Moraes Holschuh <ibm-acpi@hmh.eng.br>
  L:    ibm-acpi-devel@lists.sourceforge.net
+ L:    platform-driver-x86@vger.kernel.org
  W:    http://ibm-acpi.sourceforge.net
  W:    http://thinkwiki.org/wiki/Ibm-acpi
  T:    git git://repo.or.cz/linux-2.6/linux-acpi-2.6/ibm-acpi-2.6.git
@@@ -5294,10 -5390,12 +5391,12 @@@ F:   security/tomoyo
  
  TOPSTAR LAPTOP EXTRAS DRIVER
  M:    Herton Ronaldo Krzesinski <herton@mandriva.com.br>
+ L:    platform-driver-x86@vger.kernel.org
  S:    Maintained
  F:    drivers/platform/x86/topstar-laptop.c
  
  TOSHIBA ACPI EXTRAS DRIVER
+ L:    platform-driver-x86@vger.kernel.org
  S:    Orphan
  F:    drivers/platform/x86/toshiba_acpi.c
  
@@@ -5797,6 -5895,15 +5896,15 @@@ S:    Maintaine
  F:    Documentation/filesystems/vfat.txt
  F:    fs/fat/
  
+ VIRTIO HOST (VHOST)
+ M:    "Michael S. Tsirkin" <mst@redhat.com>
+ L:    kvm@vger.kernel.org
+ L:    virtualization@lists.osdl.org
+ L:    netdev@vger.kernel.org
+ S:    Maintained
+ F:    drivers/vhost/
+ F:    include/linux/vhost.h
  VIA RHINE NETWORK DRIVER
  M:    Roger Luethi <rl@hellgate.ch>
  S:    Maintained
@@@ -5920,7 -6027,7 +6028,7 @@@ L:      linux-wireless@vger.kernel.or
  W:    http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/
  S:    Maintained
  F:    Documentation/networking/wavelan.txt
- F:    drivers/net/wireless/wavelan*
+ F:    drivers/staging/wavelan/
  
  WD7000 SCSI DRIVER
  M:    Miroslav Zagorac <zaga@fly.cc.fer.hr>
@@@ -5955,7 -6062,7 +6063,7 @@@ S:      Maintaine
  F:    drivers/input/misc/wistron_btns.c
  
  WL1251 WIRELESS DRIVER
- M:    Kalle Valo <kalle.valo@nokia.com>
+ M:    Kalle Valo <kalle.valo@iki.fi>
  L:    linux-wireless@vger.kernel.org
  W:    http://wireless.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
@@@ -6025,6 -6132,13 +6133,13 @@@ S:    Maintaine
  F:    Documentation/x86/
  F:    arch/x86/
  
+ X86 PLATFORM DRIVERS
+ M:    Matthew Garrett <mjg@redhat.com>
+ L:    platform-driver-x86@vger.kernel.org
+ T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86.git
+ S:    Maintained
+ F:    drivers/platform/x86
  XEN HYPERVISOR INTERFACE
  M:    Jeremy Fitzhardinge <jeremy@xensource.com>
  M:    Chris Wright <chrisw@sous-sol.org>
@@@ -6109,6 -6223,7 +6224,7 @@@ F:      drivers/serial/zs.
  THE REST
  M:    Linus Torvalds <torvalds@linux-foundation.org>
  L:    linux-kernel@vger.kernel.org
+ Q:    http://patchwork.kernel.org/project/LKML/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
  S:    Buried alive in reporters
  F:    *
index bfc43fa208bc73620e80016ae739ae0f4b3d613d,b1fbdeecf6c923e9f3bcf93e487a89abd7016dac..97cddbf32936f581b70ed6717486568355612cff
@@@ -73,10 -73,10 +73,10 @@@ struct debug_store 
  struct event_constraint {
        union {
                unsigned long   idxmsk[BITS_TO_LONGS(X86_PMC_IDX_MAX)];
 -              u64             idxmsk64[1];
 +              u64             idxmsk64;
        };
 -      int     code;
 -      int     cmask;
 +      u64     code;
 +      u64     cmask;
        int     weight;
  };
  
@@@ -103,7 -103,7 +103,7 @@@ struct cpu_hw_events 
  };
  
  #define __EVENT_CONSTRAINT(c, n, m, w) {\
 -      { .idxmsk64[0] = (n) },         \
 +      { .idxmsk64 = (n) },            \
        .code = (c),                    \
        .cmask = (m),                   \
        .weight = (w),                  \
        EVENT_CONSTRAINT(c, n, INTEL_ARCH_EVTSEL_MASK)
  
  #define FIXED_EVENT_CONSTRAINT(c, n)  \
 -      EVENT_CONSTRAINT(c, n, INTEL_ARCH_FIXED_MASK)
 +      EVENT_CONSTRAINT(c, (1ULL << (32+n)), INTEL_ARCH_FIXED_MASK)
  
  #define EVENT_CONSTRAINT_END          \
        EVENT_CONSTRAINT(0, 0, 0)
@@@ -503,9 -503,6 +503,9 @@@ static int __hw_perf_event_init(struct 
         */
        if (attr->type == PERF_TYPE_RAW) {
                hwc->config |= x86_pmu.raw_event(attr->config);
 +              if ((hwc->config & ARCH_PERFMON_EVENTSEL_ANY) &&
 +                  perf_paranoid_cpu() && !capable(CAP_SYS_ADMIN))
 +                      return -EACCES;
                return 0;
        }
  
@@@ -556,9 -553,9 +556,9 @@@ static void x86_pmu_disable_all(void
                if (!test_bit(idx, cpuc->active_mask))
                        continue;
                rdmsrl(x86_pmu.eventsel + idx, val);
 -              if (!(val & ARCH_PERFMON_EVENTSEL0_ENABLE))
 +              if (!(val & ARCH_PERFMON_EVENTSEL_ENABLE))
                        continue;
 -              val &= ~ARCH_PERFMON_EVENTSEL0_ENABLE;
 +              val &= ~ARCH_PERFMON_EVENTSEL_ENABLE;
                wrmsrl(x86_pmu.eventsel + idx, val);
        }
  }
@@@ -593,7 -590,7 +593,7 @@@ static void x86_pmu_enable_all(void
                        continue;
  
                val = event->hw.config;
 -              val |= ARCH_PERFMON_EVENTSEL0_ENABLE;
 +              val |= ARCH_PERFMON_EVENTSEL_ENABLE;
                wrmsrl(x86_pmu.eventsel + idx, val);
        }
  }
@@@ -615,8 -612,8 +615,8 @@@ static int x86_schedule_events(struct c
        bitmap_zero(used_mask, X86_PMC_IDX_MAX);
  
        for (i = 0; i < n; i++) {
 -              constraints[i] =
 -                x86_pmu.get_event_constraints(cpuc, cpuc->event_list[i]);
 +              c = x86_pmu.get_event_constraints(cpuc, cpuc->event_list[i]);
 +              constraints[i] = c;
        }
  
        /*
                        if (c->weight != w)
                                continue;
  
-                       for_each_bit(j, c->idxmsk, X86_PMC_IDX_MAX) {
+                       for_each_set_bit(j, c->idxmsk, X86_PMC_IDX_MAX) {
                                if (!test_bit(j, used_mask))
                                        break;
                        }
@@@ -856,7 -853,7 +856,7 @@@ void hw_perf_enable(void
  static inline void __x86_pmu_enable_event(struct hw_perf_event *hwc, int idx)
  {
        (void)checking_wrmsrl(hwc->config_base + idx,
 -                            hwc->config | ARCH_PERFMON_EVENTSEL0_ENABLE);
 +                            hwc->config | ARCH_PERFMON_EVENTSEL_ENABLE);
  }
  
  static inline void x86_pmu_disable_event(struct hw_perf_event *hwc, int idx)
@@@ -1350,7 -1347,6 +1350,7 @@@ static void __init pmu_check_apic(void
  
  void __init init_hw_perf_events(void)
  {
 +      struct event_constraint *c;
        int err;
  
        pr_info("Performance Events: ");
                __EVENT_CONSTRAINT(0, (1ULL << x86_pmu.num_events) - 1,
                                   0, x86_pmu.num_events);
  
 +      if (x86_pmu.event_constraints) {
 +              for_each_event_constraint(c, x86_pmu.event_constraints) {
 +                      if (c->cmask != INTEL_ARCH_FIXED_MASK)
 +                              continue;
 +
 +                      c->idxmsk64 |= (1ULL << x86_pmu.num_events) - 1;
 +                      c->weight += x86_pmu.num_events;
 +              }
 +      }
 +
        pr_info("... version:                %d\n",     x86_pmu.version);
        pr_info("... bit width:              %d\n",     x86_pmu.event_bits);
        pr_info("... generic registers:      %d\n",     x86_pmu.num_events);
index 4fbdfe5708d9fc127739d80f2ab93469955de978,977e7544738c5d657c50370856a94569b6bc0df2..73102df8bfc1527d8f11fc7a61b9969d2de875f7
@@@ -1,7 -1,7 +1,7 @@@
  #ifdef CONFIG_CPU_SUP_INTEL
  
  /*
 - * Intel PerfMon v3. Used on Core2 and later.
 + * Intel PerfMon, used on Core and later.
   */
  static const u64 intel_perfmon_event_map[] =
  {
@@@ -27,14 -27,8 +27,14 @@@ static struct event_constraint intel_co
  
  static struct event_constraint intel_core2_event_constraints[] =
  {
 -      FIXED_EVENT_CONSTRAINT(0xc0, (0x3|(1ULL<<32))), /* INSTRUCTIONS_RETIRED */
 -      FIXED_EVENT_CONSTRAINT(0x3c, (0x3|(1ULL<<33))), /* UNHALTED_CORE_CYCLES */
 +      FIXED_EVENT_CONSTRAINT(0x00c0, 0), /* INST_RETIRED.ANY */
 +      FIXED_EVENT_CONSTRAINT(0x003c, 1), /* CPU_CLK_UNHALTED.CORE */
 +      /*
 +       * Core2 has Fixed Counter 2 listed as CPU_CLK_UNHALTED.REF and event
 +       * 0x013c as CPU_CLK_UNHALTED.BUS and specifies there is a fixed
 +       * ratio between these counters.
 +       */
 +      /* FIXED_EVENT_CONSTRAINT(0x013c, 2),  CPU_CLK_UNHALTED.REF */
        INTEL_EVENT_CONSTRAINT(0x10, 0x1), /* FP_COMP_OPS_EXE */
        INTEL_EVENT_CONSTRAINT(0x11, 0x2), /* FP_ASSIST */
        INTEL_EVENT_CONSTRAINT(0x12, 0x2), /* MUL */
        INTEL_EVENT_CONSTRAINT(0x18, 0x1), /* IDLE_DURING_DIV */
        INTEL_EVENT_CONSTRAINT(0x19, 0x2), /* DELAYED_BYPASS */
        INTEL_EVENT_CONSTRAINT(0xa1, 0x1), /* RS_UOPS_DISPATCH_CYCLES */
 +      INTEL_EVENT_CONSTRAINT(0xc9, 0x1), /* ITLB_MISS_RETIRED (T30-9) */
        INTEL_EVENT_CONSTRAINT(0xcb, 0x1), /* MEM_LOAD_RETIRED */
        EVENT_CONSTRAINT_END
  };
  
  static struct event_constraint intel_nehalem_event_constraints[] =
  {
 -      FIXED_EVENT_CONSTRAINT(0xc0, (0xf|(1ULL<<32))), /* INSTRUCTIONS_RETIRED */
 -      FIXED_EVENT_CONSTRAINT(0x3c, (0xf|(1ULL<<33))), /* UNHALTED_CORE_CYCLES */
 +      FIXED_EVENT_CONSTRAINT(0x00c0, 0), /* INST_RETIRED.ANY */
 +      FIXED_EVENT_CONSTRAINT(0x003c, 1), /* CPU_CLK_UNHALTED.CORE */
 +      /* FIXED_EVENT_CONSTRAINT(0x013c, 2), CPU_CLK_UNHALTED.REF */
        INTEL_EVENT_CONSTRAINT(0x40, 0x3), /* L1D_CACHE_LD */
        INTEL_EVENT_CONSTRAINT(0x41, 0x3), /* L1D_CACHE_ST */
        INTEL_EVENT_CONSTRAINT(0x42, 0x3), /* L1D_CACHE_LOCK */
@@@ -66,9 -58,8 +66,9 @@@
  
  static struct event_constraint intel_westmere_event_constraints[] =
  {
 -      FIXED_EVENT_CONSTRAINT(0xc0, (0xf|(1ULL<<32))), /* INSTRUCTIONS_RETIRED */
 -      FIXED_EVENT_CONSTRAINT(0x3c, (0xf|(1ULL<<33))), /* UNHALTED_CORE_CYCLES */
 +      FIXED_EVENT_CONSTRAINT(0x00c0, 0), /* INST_RETIRED.ANY */
 +      FIXED_EVENT_CONSTRAINT(0x003c, 1), /* CPU_CLK_UNHALTED.CORE */
 +      /* FIXED_EVENT_CONSTRAINT(0x013c, 2), CPU_CLK_UNHALTED.REF */
        INTEL_EVENT_CONSTRAINT(0x51, 0x3), /* L1D */
        INTEL_EVENT_CONSTRAINT(0x60, 0x1), /* OFFCORE_REQUESTS_OUTSTANDING */
        INTEL_EVENT_CONSTRAINT(0x63, 0x3), /* CACHE_LOCK_CYCLES */
@@@ -77,9 -68,8 +77,9 @@@
  
  static struct event_constraint intel_gen_event_constraints[] =
  {
 -      FIXED_EVENT_CONSTRAINT(0xc0, (0x3|(1ULL<<32))), /* INSTRUCTIONS_RETIRED */
 -      FIXED_EVENT_CONSTRAINT(0x3c, (0x3|(1ULL<<33))), /* UNHALTED_CORE_CYCLES */
 +      FIXED_EVENT_CONSTRAINT(0x00c0, 0), /* INST_RETIRED.ANY */
 +      FIXED_EVENT_CONSTRAINT(0x003c, 1), /* CPU_CLK_UNHALTED.CORE */
 +      /* FIXED_EVENT_CONSTRAINT(0x013c, 2), CPU_CLK_UNHALTED.REF */
        EVENT_CONSTRAINT_END
  };
  
@@@ -767,7 -757,7 +767,7 @@@ again
  
        inc_irq_stat(apic_perf_irqs);
        ack = status;
-       for_each_bit(bit, (unsigned long *)&status, X86_PMC_IDX_MAX) {
+       for_each_set_bit(bit, (unsigned long *)&status, X86_PMC_IDX_MAX) {
                struct perf_event *event = cpuc->events[bit];
  
                clear_bit(bit, (unsigned long *) &status);
@@@ -945,7 -935,7 +945,7 @@@ static __init int intel_pmu_init(void
                x86_pmu.event_constraints = intel_nehalem_event_constraints;
                pr_cont("Nehalem/Corei7 events, ");
                break;
 -      case 28:
 +      case 28: /* Atom */
                memcpy(hw_cache_event_ids, atom_hw_cache_event_ids,
                       sizeof(hw_cache_event_ids));
  
                x86_pmu.event_constraints = intel_westmere_event_constraints;
                pr_cont("Westmere events, ");
                break;
 +
        default:
                /*
                 * default constraints for v2 and up
index 2012a4ed2727025fdd413aee50cd9446fd7f14b3,dce99abb449617d5c0d2e1d93dc1cf15a98bd7ac..d5e2a2ebb6272d73c55af7b696cab37f5fa3bef5
@@@ -120,15 -120,9 +120,15 @@@ fixup_bp_irq_link(unsigned long bp, uns
  {
  #ifdef CONFIG_FRAME_POINTER
        struct stack_frame *frame = (struct stack_frame *)bp;
 +      unsigned long next;
  
 -      if (!in_irq_stack(stack, irq_stack, irq_stack_end))
 -              return (unsigned long)frame->next_frame;
 +      if (!in_irq_stack(stack, irq_stack, irq_stack_end)) {
 +              if (!probe_kernel_address(&frame->next_frame, next))
 +                      return next;
 +              else
 +                      WARN_ONCE(1, "Perf: bad frame pointer = %p in "
 +                                "callchain\n", &frame->next_frame);
 +      }
  #endif
        return bp;
  }
@@@ -292,6 -286,7 +292,7 @@@ void show_registers(struct pt_regs *reg
  
        sp = regs->sp;
        printk("CPU %d ", cpu);
+       print_modules();
        __show_regs(regs, 1);
        printk("Process %s (pid: %d, threadinfo %p, task %p)\n",
                cur->comm, cur->pid, task_thread_info(cur), cur);
diff --combined kernel/perf_event.c
index 482d5e1d37642f0b68f52cc6949c5e1339c4a480,f40560b86544e8b999164c7cd17b5cb1f84d6510..e687450530132503052ede539ac32b83a8090611
@@@ -56,6 -56,21 +56,6 @@@ static atomic_t nr_task_events __read_m
   */
  int sysctl_perf_event_paranoid __read_mostly = 1;
  
 -static inline bool perf_paranoid_tracepoint_raw(void)
 -{
 -      return sysctl_perf_event_paranoid > -1;
 -}
 -
 -static inline bool perf_paranoid_cpu(void)
 -{
 -      return sysctl_perf_event_paranoid > 0;
 -}
 -
 -static inline bool perf_paranoid_kernel(void)
 -{
 -      return sysctl_perf_event_paranoid > 1;
 -}
 -
  int sysctl_perf_event_mlock __read_mostly = 512; /* 'free' kb per user */
  
  /*
@@@ -2595,7 -2610,7 +2595,7 @@@ static int perf_mmap(struct file *file
        if (user_locked > user_lock_limit)
                extra = user_locked - user_lock_limit;
  
-       lock_limit = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur;
+       lock_limit = rlimit(RLIMIT_MEMLOCK);
        lock_limit >>= PAGE_SHIFT;
        locked = vma->vm_mm->locked_vm + extra;
  
@@@ -5466,13 -5481,16 +5466,16 @@@ void __init perf_event_init(void
        register_cpu_notifier(&perf_cpu_nb);
  }
  
- static ssize_t perf_show_reserve_percpu(struct sysdev_class *class, char *buf)
+ static ssize_t perf_show_reserve_percpu(struct sysdev_class *class,
+                                       struct sysdev_class_attribute *attr,
+                                       char *buf)
  {
        return sprintf(buf, "%d\n", perf_reserved_percpu);
  }
  
  static ssize_t
  perf_set_reserve_percpu(struct sysdev_class *class,
+                       struct sysdev_class_attribute *attr,
                        const char *buf,
                        size_t count)
  {
        return count;
  }
  
- static ssize_t perf_show_overcommit(struct sysdev_class *class, char *buf)
+ static ssize_t perf_show_overcommit(struct sysdev_class *class,
+                                   struct sysdev_class_attribute *attr,
+                                   char *buf)
  {
        return sprintf(buf, "%d\n", perf_overcommit);
  }
  
  static ssize_t
- perf_set_overcommit(struct sysdev_class *class, const char *buf, size_t count)
+ perf_set_overcommit(struct sysdev_class *class,
+                   struct sysdev_class_attribute *attr,
+                   const char *buf, size_t count)
  {
        unsigned long val;
        int err;
diff --combined lib/Kconfig.debug
index 4dc24cc13f5c3a6dab455714c4943d7514d94275,b520ec1f33c515d478e3e598a4101b4a8d49f334..8e5ec5e1ab91f11505ac1a7589bb196ff10e1147
@@@ -355,7 -355,7 +355,7 @@@ config SLUB_STAT
  config DEBUG_KMEMLEAK
        bool "Kernel memory leak detector"
        depends on DEBUG_KERNEL && EXPERIMENTAL && !MEMORY_HOTPLUG && \
-               (X86 || ARM || PPC || S390)
+               (X86 || ARM || PPC || S390 || SUPERH)
  
        select DEBUG_FS if SYSFS
        select STACKTRACE if STACKTRACE_SUPPORT
@@@ -499,6 -499,18 +499,18 @@@ config PROVE_LOCKIN
  
         For more details, see Documentation/lockdep-design.txt.
  
+ config PROVE_RCU
+       bool "RCU debugging: prove RCU correctness"
+       depends on PROVE_LOCKING
+       default n
+       help
+        This feature enables lockdep extensions that check for correct
+        use of RCU APIs.  This is currently under development.  Say Y
+        if you want to debug RCU usage or help work on the PROVE_RCU
+        feature.
+        Say N if you are unsure.
  config LOCKDEP
        bool
        depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
@@@ -520,14 -532,6 +532,14 @@@ config LOCK_STA
  
         For more details, see Documentation/lockstat.txt
  
 +       This also enables lock events required by "perf lock",
 +       subcommand of perf.
 +       If you want to use "perf lock", you also need to turn on
 +       CONFIG_EVENT_TRACING.
 +
 +       CONFIG_LOCK_STAT defines "contended" and "acquired" lock events.
 +       (CONFIG_LOCKDEP defines "acquire" and "release" events.)
 +
  config DEBUG_LOCKDEP
        bool "Lock dependency engine debugging"
        depends on DEBUG_KERNEL && LOCKDEP
@@@ -773,10 -777,22 +785,22 @@@ config RCU_CPU_STALL_DETECTO
          CPUs are delaying the current grace period, but only when
          the grace period extends for excessive time periods.
  
-         Say Y if you want RCU to perform such checks.
+         Say N if you want to disable such checks.
+         Say Y if you are unsure.
+ config RCU_CPU_STALL_VERBOSE
+       bool "Print additional per-task information for RCU_CPU_STALL_DETECTOR"
+       depends on RCU_CPU_STALL_DETECTOR && TREE_PREEMPT_RCU
+       default n
+       help
+         This option causes RCU to printk detailed per-task information
+         for any tasks that are stalling the current RCU grace period.
  
          Say N if you are unsure.
  
+         Say Y if you want to enable such checks.
  config KPROBES_SANITY_TEST
        bool "Kprobes sanity tests"
        depends on DEBUG_KERNEL
@@@ -848,8 -864,7 +872,7 @@@ config DEBUG_FORCE_WEAK_PER_CP
  
  config LKDTM
        tristate "Linux Kernel Dump Test Tool Module"
-       depends on DEBUG_KERNEL
-       depends on KPROBES
+       depends on DEBUG_FS
        depends on BLOCK
        default n
        help
        called lkdtm.
  
        Documentation on how to use the module can be found in
-       drivers/misc/lkdtm.c
+       Documentation/fault-injection/provoke-crashes.txt
  
  config FAULT_INJECTION
        bool "Fault-injection framework"
index a21b6bf055acbad42df02e678a47a0be82cf293d,c971e81e9cbf2e9276780a81fe7915bd478c29c2..53181dbfe4a8dae101a279a40f10654865c90796
@@@ -119,14 -119,14 +119,14 @@@ static void parse_perf_probe_probepoint
        char c, nc = 0;
        /*
         * <Syntax>
-        * perf probe [EVENT=]SRC:LN
-        * perf probe [EVENT=]FUNC[+OFFS|%return][@SRC]
+        * perf probe [EVENT=]SRC[:LN|;PTN]
+        * perf probe [EVENT=]FUNC[@SRC][+OFFS|%return|:LN|;PAT]
         *
         * TODO:Group name support
         */
  
-       ptr = strchr(arg, '=');
-       if (ptr) {      /* Event name */
+       ptr = strpbrk(arg, ";=@+%");
+       if (ptr && *ptr == '=') {       /* Event name */
                *ptr = '\0';
                tmp = ptr + 1;
                ptr = strchr(arg, ':');
                arg = tmp;
        }
  
-       ptr = strpbrk(arg, ":+@%");
+       ptr = strpbrk(arg, ";:+@%");
        if (ptr) {
                nc = *ptr;
                *ptr++ = '\0';
        while (ptr) {
                arg = ptr;
                c = nc;
-               ptr = strpbrk(arg, ":+@%");
+               if (c == ';') { /* Lazy pattern must be the last part */
+                       pp->lazy_line = strdup(arg);
+                       break;
+               }
+               ptr = strpbrk(arg, ";:+@%");
                if (ptr) {
                        nc = *ptr;
                        *ptr++ = '\0';
                case ':':       /* Line number */
                        pp->line = strtoul(arg, &tmp, 0);
                        if (*tmp != '\0')
-                               semantic_error("There is non-digit charactor"
-                                               " in line number.");
+                               semantic_error("There is non-digit char"
+                                              " in line number.");
                        break;
                case '+':       /* Byte offset from a symbol */
                        pp->offset = strtoul(arg, &tmp, 0);
                        if (*tmp != '\0')
-                               semantic_error("There is non-digit charactor"
+                               semantic_error("There is non-digit character"
                                                " in offset.");
                        break;
                case '@':       /* File name */
                                semantic_error("SRC@SRC is not allowed.");
                        pp->file = strdup(arg);
                        DIE_IF(pp->file == NULL);
-                       if (ptr)
-                               semantic_error("@SRC must be the last "
-                                              "option.");
                        break;
                case '%':       /* Probe places */
                        if (strcmp(arg, "return") == 0) {
        }
  
        /* Exclusion check */
+       if (pp->lazy_line && pp->line)
+               semantic_error("Lazy pattern can't be used with line number.");
+       if (pp->lazy_line && pp->offset)
+               semantic_error("Lazy pattern can't be used with offset.");
        if (pp->line && pp->offset)
                semantic_error("Offset can't be used with line number.");
  
-       if (!pp->line && pp->file && !pp->function)
-               semantic_error("File always requires line number.");
+       if (!pp->line && !pp->lazy_line && pp->file && !pp->function)
+               semantic_error("File always requires line number or "
+                              "lazy pattern.");
  
        if (pp->offset && !pp->function)
                semantic_error("Offset requires an entry function.");
        if (pp->retprobe && !pp->function)
                semantic_error("Return probe requires an entry function.");
  
-       if ((pp->offset || pp->line) && pp->retprobe)
-               semantic_error("Offset/Line can't be used with return probe.");
+       if ((pp->offset || pp->line || pp->lazy_line) && pp->retprobe)
+               semantic_error("Offset/Line/Lazy pattern can't be used with "
+                              "return probe.");
  
-       pr_debug("symbol:%s file:%s line:%d offset:%d, return:%d\n",
-                pp->function, pp->file, pp->line, pp->offset, pp->retprobe);
+       pr_debug("symbol:%s file:%s line:%d offset:%d return:%d lazy:%s\n",
+                pp->function, pp->file, pp->line, pp->offset, pp->retprobe,
+                pp->lazy_line);
  }
  
  /* Parse perf-probe event definition */
@@@ -458,6 -468,8 +468,8 @@@ static void clear_probe_point(struct pr
                free(pp->function);
        if (pp->file)
                free(pp->file);
+       if (pp->lazy_line)
+               free(pp->lazy_line);
        for (i = 0; i < pp->nr_args; i++)
                free(pp->args[i]);
        if (pp->args)
@@@ -496,8 -508,8 +508,8 @@@ void show_perf_probe_events(void
        struct str_node *ent;
  
        setup_pager();
 -
        memset(&pp, 0, sizeof(pp));
 +
        fd = open_kprobe_events(O_RDONLY, 0);
        rawlist = get_trace_kprobe_event_rawlist(fd);
        close(fd);
@@@ -719,6 -731,7 +731,7 @@@ void del_trace_kprobe_events(struct str
  }
  
  #define LINEBUF_SIZE 256
+ #define NR_ADDITIONAL_LINES 2
  
  static void show_one_line(FILE *fp, unsigned int l, bool skip, bool show_num)
  {
@@@ -779,5 -792,11 +792,11 @@@ void show_line_range(struct line_range 
                        show_one_line(fp, (l++) - lr->offset, false, false);
                show_one_line(fp, (l++) - lr->offset, false, true);
        }
+       if (lr->end == INT_MAX)
+               lr->end = l + NR_ADDITIONAL_LINES;
+       while (l < lr->end && !feof(fp))
+               show_one_line(fp, (l++) - lr->offset, false, false);
        fclose(fp);
  }