1. 06 10月, 2009 8 次提交
  2. 05 10月, 2009 22 次提交
  3. 04 10月, 2009 10 次提交
    • L
      Merge branch 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev · 8a0382f6
      Linus Torvalds 提交于
      * 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev:
        m32r: Fix IPI function calls for SMP
        m32r: Fix set_memory() for DISCONTIGMEM
        m32r: add rtc_lock variable
        m32r: define ioread* and iowrite* macros
        m32r: export delay loop symbols
        m32r: fix tme_handler
      8a0382f6
    • L
      tty: Avoid dropping ldisc_mutex over hangup tty re-initialization · 0b5759c6
      Linus Torvalds 提交于
      A couple of people have hit the WARN_ON() in drivers/char/tty_io.c,
      tty_open() that is unhappy about seeing the tty line discipline go away
      during the tty hangup. See for example
      
      	http://bugzilla.kernel.org/show_bug.cgi?id=14255
      
      and the reason is that we do the tty_ldisc_halt() outside the
      ldisc_mutex in order to be able to flush the scheduled work without a
      deadlock with vhangup_work.
      
      However, it turns out that we can solve this particular case by
      
       - using "cancel_delayed_work_sync()" in tty_ldisc_halt(), which waits
         for just the particular work, rather than synchronizing with any
         random outstanding pending work.
      
         This won't deadlock, since the buf.work we synchronize with doesn't
         care about the ldisc_mutex, it just flushes the tty ldisc buffers.
      
       - realize that for this particular case, we don't need to wait for any
         hangup work, because we are inside the hangup codepaths ourselves.
      
      so as a result we can just drop the flush_scheduled_work() entirely, and
      then move the tty_ldisc_halt() call to inside the mutex.  That way we
      never expose the partially torn down ldisc state to tty_open(), and hold
      the ldisc_mutex over the whole sequence.
      Reported-by: NIngo Molnar <mingo@elte.hu>
      Reported-by: NHeinz Diehl <htd@fancy-poultry.org>
      Cc: stable@kernel.org
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      0b5759c6
    • T
      m32r: Fix IPI function calls for SMP · 0a3d31b7
      Toshihiro HANAWA 提交于
      This patch fixes the m32r SMP kernel after 2.6.27.
      
      A part of the following patch breaks m32r SMP operation.
      > m32r: convert to generic helpers for IPI function calls
      > commit 7b7426c8
      
      In the above patch, a CALL_FUNC_SINGLE_IPI was newly introduced,
      but the its IPI vector number was wrong in the patch code.
      
      The m32r SMP kernel hanged-up during boot operation, because
      the CPU_BOOT_IPI was called instead of CALL_FUNC_SINGLE_IPI
      (CPU_BOOT_IPI had no side effect at that time because the 2nd
      core had already been started up),
      as a result, csd_unlock() was not called, then a dead lock
      occurred in csd_lock_wait() after the detection of Compact Flash
      memory as IDE generic disk.
      Signed-off-by: NToshihiro HANAWA <hanawa@ccs.tsukuba.ac.jp>
      Signed-off-by: NHirokazu Takata <takata@linux-m32r.org>
      0a3d31b7
    • H
      m32r: Fix set_memory() for DISCONTIGMEM · 6b6fabce
      Hirokazu Takata 提交于
      In case CONFIG_DISCONTIGMEM is set, the memory size of system was
      always determined by CONFIG_MEMORY_SIZE and was not changeable.
      
      This patch fixes set_memory() of arch/m32r/mm/discontig.c so that
      we can specify memory size by the "mem=<size>" kernel parameter.
      Signed-off-by: NHirokazu Takata <takata@linux-m32r.org>
      6b6fabce
    • H
      m32r: add rtc_lock variable · bac33bd5
      Hirokazu Takata 提交于
      Add a spinlock variable "rtc_lock".
      This is taken from arch/arm/kernel/time.c.
      Signed-off-by: NHirokazu Takata <takata@linux-m32r.org>
      bac33bd5
    • H
      m32r: define ioread* and iowrite* macros · d2c5821c
      Hirokazu Takata 提交于
      Define ioread* and iowrite* macros to fix the following build errors:
      
        CC [M]  drivers/uio/uio_smx.o
      drivers/uio/uio_smx.c: In function 'smx_handler':
      drivers/uio/uio_smx.c:31: error: implicit declaration of function 'ioread32'
      drivers/uio/uio_smx.c:37: error: implicit declaration of function 'iowrite32'
      Signed-off-by: NHirokazu Takata <takata@linux-m32r.org>
      d2c5821c
    • H
      m32r: export delay loop symbols · ced0f005
      Hirokazu Takata 提交于
      - Move EXPORT_SYMBOL lines of delay loop functions
        from arch/m32r/kernel/m32r_ksyms.c to arch/m32r/lib/delay.c.
      - Export __ndelay.
      Signed-off-by: NHirokazu Takata <takata@linux-m32r.org>
      ced0f005
    • H
      m32r: fix tme_handler · 2cff5e1a
      Hirokazu Takata 提交于
      Fix pmd_bad check code of tme_handler (TLB Miss Exception handler).
      The correct _KERNPG_TABLE value is not 0x263(=611) but 0x163.
      Signed-off-by: NHirokazu Takata <takata@linux-m32r.org>
      2cff5e1a
    • M
      block: Topology ioctls · ac481c20
      Martin K. Petersen 提交于
      Not all users of the topology information want to use libblkid.  Provide
      the topology information through bdev ioctls.
      
      Also clarify sector size comments for existing BLK ioctls.
      Signed-off-by: NMartin K. Petersen <martin.petersen@oracle.com>
      Signed-off-by: NJens Axboe <jens.axboe@oracle.com>
      ac481c20
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 · f0a221ef
      Linus Torvalds 提交于
      * 'for-linus' of ssh://master.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (21 commits)
        ALSA: usb - Use strlcat() correctly
        ALSA: Fix invalid __exit in sound/mips/*.c
        ALSA: hda - Fix / improve ALC66x parser
        ALSA: ctxfi: Swapped SURROUND-SIDE mute
        sound: Make keywest_driver static
        ALSA: intel8x0 - Mute External Amplifier by default for Sony VAIO VGN-B1VP
        ALSA: hda - Fix digita/analog mic auto-switching with IDT codecs
        ASoC: fix kconfig order of Blackfin drivers
        ALSA: hda - Added quirk to enable sound on Toshiba NB200
        ASoC: Fix dependency of CONFIG_SND_PXA2XX_SOC_IMOTE2
        ALSA: Don't assume i2c device probing always succeeds
        ALSA: intel8x0 - Mute External Amplifier by default for Sony VAIO VGN-T350P
        ALSA: echoaudio - Re-enable the line-out control for the Mia card
        ALSA: hda - Resurrect input-source mixer of ALC268 model=acer
        ALSA: hda - Analog Devices AD1984A add HP Touchsmart model
        ALSA: hda - Add HP Pavilion dv4t-1300 to MSI whitelist
        ALSA: hda - CD-audio sound for hda-intel conexant benq laptop
        ASoC: DaVinci: Correct McASP FIFO initialization
        ASoC: Davinci: Fix race with cpu_dai->dma_data
        ASoC: DaVinci: Fix divide by zero error during 1st execution
        ...
      f0a221ef