1. 05 6月, 2010 26 次提交
  2. 04 6月, 2010 9 次提交
  3. 03 6月, 2010 5 次提交
    • P
      perf: Fix crash in swevents · c6df8d5a
      Peter Zijlstra 提交于
      Frederic reported that because swevents handling doesn't disable IRQs
      anymore, we can get a recursion of perf_adjust_period(), once from
      overflow handling and once from the tick.
      
      If both call ->disable, we get a double hlist_del_rcu() and trigger
      a LIST_POISON2 dereference.
      
      Since we don't actually need to stop/start a swevent to re-programm
      the hardware (lack of hardware to program), simply nop out these
      callbacks for the swevent pmu.
      Reported-by: NFrederic Weisbecker <fweisbec@gmail.com>
      Signed-off-by: NPeter Zijlstra <a.p.zijlstra@chello.nl>
      LKML-Reference: <1275557609.27810.35218.camel@twins>
      Signed-off-by: NIngo Molnar <mingo@elte.hu>
      c6df8d5a
    • L
    • L
      Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 · 1067b6c2
      Linus Torvalds 提交于
      * 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (41 commits)
        drm/radeon/kms: make sure display hw is disabled when suspending
        drm/vmwgfx: Allow userspace to change default layout. Bump minor.
        drm/vmwgfx: Fix framebuffer modesetting
        drm/vmwgfx: Fix vga save / restore with display topology.
        vgaarb: use MIT license
        vgaarb: convert pr_devel() to pr_debug()
        drm: fix typos in Linux DRM Developer's Guide
        drm/radeon/kms/pm: voltage fixes
        drm/radeon/kms/pm: radeon_set_power_state fixes
        drm/radeon/kms/pm: patch default power state with default clocks/voltages on r6xx+
        drm/radeon/kms/pm: enable SetVoltage on r7xx/evergreen
        drm/radeon/kms/pm: add support for SetVoltage cmd table (V2)
        drm/radeon/kms/evergreen: add initial CS parser
        drm/kms: disable/enable poll around switcheroo on/off
        drm/nouveau: fixup confusion over which handle the DSM is hanging off.
        drm/nouveau: attempt to get bios from ACPI v3
        drm/nv50: cast IGP memory location to u64 before shifting
        drm/ttm: Fix ttm_page_alloc.c
        drm/ttm: Fix cached TTM page allocation.
        drm/vmwgfx: Remove some leftover debug messages.
        ...
      1067b6c2
    • L
      Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6 · a652883a
      Linus Torvalds 提交于
      * 'merge' of git://git.secretlab.ca/git/linux-2.6:
        of/powerpc: fix fsl_msi device node pointer
        of/watchdog: gef_wdt.c: fix build breakage
        of/edac: fix build breakage in drivers
        of/net: fs_enet/mii-bitbang.c: fix build breakage
        of/usb: fsl_qe_udc.c: fix build breakage
        of/crypto: crypto4xx_core.c: fix build breakage
        of/dma: fix build breakage in ppc4xx adma driver
        of/mtd: nand: fix build breakage in drivers
        of/video: fix build breakage in FB drivers
        of/pcmcia: m8xx_pcmcia.c: Fix build failures
        of/rtc: rtc-mpc5121.c: Fix build failures
        of/dma: mpc512x_dma.c: Fix build failures
        of/mtd/nand: mpc5121_nfc.c: Fix build failures
        of/spi: mpc512x_psc_spi.c: Fix build failures
        watchdog: Fix build failure with OF changes
        of/spi: Fix build failure on spi_ppc4xx.c
        of/usb: fix build error due to of_node pointer move
        of/powerpc: fix 85xx RapidIO device node pointer
      a652883a
    • A
      virtio: console: Fix crash when port is unplugged and blocked for write · 60e5e0b8
      Amit Shah 提交于
      When a program that has a virtio port opened and blocked for a write
      operation, a port hot-unplug event will later led to a crash when
      SIGTERM was sent to the program. Fix that.
      Signed-off-by: NAmit Shah <amit.shah@redhat.com>
      Signed-off-by: NRusty Russell <rusty@rustcorp.com.au>
      60e5e0b8