1. 21 6月, 2009 5 次提交
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 93db6294
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (35 commits)
        Input: add driver for Synaptics I2C touchpad
        Input: synaptics - add support for reporting x/y resolution
        Input: ALPS - handle touchpoints buttons correctly
        Input: gpio-keys - change timer to workqueue
        Input: ads7846 - pin change interrupt support
        Input: add support for touchscreen on W90P910 ARM platform
        Input: appletouch - improve finger detection
        Input: wacom - clear Intuos4 wheel data when finger leaves proximity
        Input: ucb1400 - move static function from header into core
        Input: add driver for EETI touchpanels
        Input: ads7846 - more detailed model name in sysfs
        Input: ads7846 - support swapping x and y axes
        Input: ati_remote2 - use non-atomic bitops
        Input: introduce lm8323 keypad driver
        Input: psmouse - ESD workaround fix for OLPC XO touchpad
        Input: tsc2007 - make sure platform provides get_pendown_state()
        Input: uinput - flush all pending ff effects before destroying device
        Input: simplify name handling for certain input handles
        Input: serio - do not use deprecated dev.power.power_state
        Input: wacom - add support for Intuos4 tablets
        ...
      93db6294
    • L
      Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 · 43813f39
      Linus Torvalds 提交于
      * 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (24 commits)
        agp/intel: Make intel_i965_mask_memory use dma_addr_t for physical addresses
        agp: add user mapping support to ATI AGP bridge.
        drm/i915: enable GEM on PAE.
        drm/radeon: fix unused variables warning
        agp: switch AGP to use page array instead of unsigned long array
        agpgart: detected ALi M???? chipset with M1621
        drm/radeon: command stream checker for r3xx-r5xx hardware
        drm/radeon: Fully initialize LVDS info also when we can't get it from the ROM.
        radeon: Fix CP byte order on big endian architectures with KMS.
        agp/uninorth: Handle user memory types.
        drm/ttm: Add some powerpc cache flush code.
        radeon: Enable modesetting on non-x86.
        drm/radeon: Respect AGP cant_use_aperture flag.
        drm: EDID endianness fixes.
        drm/radeon: this VRAM vs aperture test is wrong, just remove it.
        drm/ttm: fix an error path to exit function correctly
        drm: Apply "Memory fragmentation from lost alignment blocks"
        ttm: Return -ERESTART when a signal interrupts bo eviction.
        drm: Remove memory debugging infrastructure.
        drm/i915: Clear fence register on tiling stride change.
        ...
      43813f39
    • L
    • L
      Merge branch 'for-2.6.31' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 · e6423407
      Linus Torvalds 提交于
      * 'for-2.6.31' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (34 commits)
        ide-cd: prevent null pointer deref via cdrom_newpc_intr
        ide: BUG() on unknown requests
        ide: filter out invalid DMA xfer mode changes in HDIO_DRIVE_CMD ioctl handler
        ide: do not access ide_drive_t 'drive_data' field directly
        sl82c105: implement test_irq() method
        siimage: implement test_irq() method
        pdc202xx_old: implement test_irq() method (take 2)
        cmd64x: implement test_irq() method
        cmd640: implement test_irq() method
        ide: move ack_intr() method into 'struct ide_port_ops' (take 2)
        ide: move IRQ clearing from ack_intr() method to clear_irq() method (take 2)
        siimage: use ide_dma_test_irq() (take 2)
        cmd64x: implement clear_irq() method (take 2)
        ide: call clear_irq() method in ide_timer_expiry()
        sgiioc4: coding style cleanup
        ide: don't enable IORDY at a probe time
        ide: IORDY handling fixes
        ata: add ata_id_pio_need_iordy() helper (v2)
        ide-tape: fix build issue
        ide: unify interrupt reason checking
        ...
      e6423407
    • L
      x86: don't use 'access_ok()' as a range check in get_user_pages_fast() · 7f818906
      Linus Torvalds 提交于
      It's really not right to use 'access_ok()', since that is meant for the
      normal "get_user()" and "copy_from/to_user()" accesses, which are done
      through the TLB, rather than through the page tables.
      
      Why? access_ok() does both too few, and too many checks.  Too many,
      because it is meant for regular kernel accesses that will not honor the
      'user' bit in the page tables, and because it honors the USER_DS vs
      KERNEL_DS distinction that we shouldn't care about in GUP.  And too few,
      because it doesn't do the 'canonical' check on the address on x86-64,
      since the TLB will do that for us.
      
      So instead of using a function that isn't meant for this, and does
      something else and much more complicated, just do the real rules: we
      don't want the range to overflow, and on x86-64, we want it to be a
      canonical low address (on 32-bit, all addresses are canonical).
      Acked-by: NIngo Molnar <mingo@elte.hu>
      Cc: H. Peter Anvin <hpa@zytor.com>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      7f818906
  2. 20 6月, 2009 35 次提交