1. 30 6月, 2006 33 次提交
  2. 29 6月, 2006 7 次提交
    • L
      Fix vsnprintf off-by-one bug · 0a6047ee
      Linus Torvalds 提交于
      The recent vsnprintf() fix introduced an off-by-one, and it's now
      possible to overrun the target buffer by one byte.
      
      The "end" pointer points to past the end of the buffer, so if we
      have to truncate the result, it needs to be done though "end[-1]".
      
      [ This is just an alternate and simpler patch to one proposed by Andrew
        and Jeremy, who actually noticed the problem ]
      Acked-by: NAndrew Morton <akpm@osdl.org>
      Acked-by: NJeremy Fitzhardinge <jeremy@goop.org>
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      0a6047ee
    • L
      Merge branch 'nommu' of master.kernel.org:/home/rmk/linux-2.6-arm · 27d68a36
      Linus Torvalds 提交于
      * 'nommu' of master.kernel.org:/home/rmk/linux-2.6-arm:
        [ARM] nommu: backtrace code must not reference a discarded section
        [ARM] nommu: Initial uCLinux support for MMU-based CPUs
        [ARM] nommu: prevent Xscale-based machines being selected
        [ARM] nommu: export flush_dcache_page()
        [ARM] nommu: remove fault-armv, mmap and mm-armv files from nommu build
        [ARM] Remove TABLE_SIZE, and several unused function prototypes
        [ARM] nommu: Provide a simple flush_dcache_page implementation
        [ARM] nommu: add arch/arm/Kconfig-nommu to Kconfig files
        [ARM] nommu: add stubs for ioremap and friends
        [ARM] nommu: avoid selecting TLB and CPU specific copy code
        [ARM] nommu: uaccess tweaks
        [ARM] nommu: adjust headers for !MMU ARM systems
        [ARM] nommu: we need the TLS register emulation for nommu mode
      27d68a36
    • L
      Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm · 76a22271
      Linus Torvalds 提交于
      * 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm:
        [ARM] 3672/1: PXA: don't probe output GPIOs for interrupt
        [ARM] 3671/1: ep93xx: add cirrus logic edb9315 support
        [ARM] 3370/2: ep93xx: add crunch support
        [ARM] 3665/1: crunch: add ptrace support
        [ARM] 3664/1: crunch: add signal frame save/restore
        [ARM] 3663/1: fix resource->end off-by-one thinko during physmap conversion
        [ARM] 3662/1: ixp23xx: don't include asm/hardware.h in uncompress.h
        [ARM] 3660/1: Remove legacy defines
        [ARM] 3661/1: S3C2412: Fix compilation if CPU_S3C2410 only
        [ARM] 3658/1: S3C244X: Change usb-gadget name to s3c2440-usbgadget
        [ARM] Remove the __arch_* layer from uaccess.h
      76a22271
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog · fffcb480
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
        [WATCHDOG] Documentation/watchdog update
        [WATCHDOG] convert AT91RM9200 watchdog to platform driver
        [WATCHDOG] add WDIOC_GETTIMELEFT ioctl
        [WATCHDOG] Pre-Timeout flags
      fffcb480
    • T
      [PATCH] Fix plist include dependency · b4459790
      Thomas Gleixner 提交于
      plist.h uses container_of, which is defined in kernel.h.
      Include kernel.h in plist.h as the kernel.h include does not longer
      happen automatically on all architectures.
      Signed-off-by: NThomas Gleixner <tglx@linutronix.de>
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      b4459790
    • D
      [PATCH] SPI: infrastructure to initialize spi_device.mode early · 980a01c9
      David Brownell 提交于
      This patch adds earlier initialization of spi_device.mode, as needed
      on boards using nondefault chipselect polarity.  An example would be
      ones using the RS5C348 RTC without an external signal inverter between
      the RTC chipselect and the SPI controller.
      
      Without this mechanism, the first setup() call for that chip would
      wrongly enable chips, corrupting transfers to/from other chips sharing
      that SPI bus.
      Signed-off-by: NDavid Brownell <dbrownell@users.sourceforge.net>
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      980a01c9
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input · 8f7c5881
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/dtor/input:
        Input: db9 - fix potential buffer overrun
        Input: atkbd - fix hardware autorepeat
        Input: wistron - add mapping for Wistron MS 2111
      8f7c5881