Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Tag: v2.6.31-rc2
Commits on Jul 4, 2009
  1. @torvalds

    Linux 2.6.31-rc2

    torvalds authored
  2. @pmundt @torvalds

    video: sm501fb: Early initialization of mm_lock mutex.

    pmundt authored torvalds committed
    Commit 537a1bf (fbdev: add mutex for
    fb_mmap locking) introduces a ->mm_lock mutex for protecting smem
    assignments. Unfortunately in the case of sm501fb these happen quite
    early in the initialization code, well before the mutex_init() that takes
    place in register_framebuffer(), leading to:
    
       Badness at kernel/mutex.c:207
    
       Pid : 1, Comm:          swapper
       CPU : 0                 Not tainted  (2.6.31-rc1-00284-g529ba0d-dirty #2273)
    
       PC is at __mutex_lock_slowpath+0x72/0x1bc
       PR is at __mutex_lock_slowpath+0x66/0x1bc
       ...
    
    matroxfb appears to have the same issue and has solved it with an early
    mutex_init(), so we do the same for sm501fb.
    
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>
    Cc: Krzysztof Helt <krzysztof.h1@wp.pl>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  3. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/kyle/parisc-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6: (27 commits)
      parisc: use generic atomic64 on 32-bit
      parisc: superio: fix build breakage
      parisc: Fix PCI resource allocation on non-PAT SBA machines
      parisc: perf: wire up sys_perf_counter_open
      parisc: add task_pt_regs macro
      parisc: wire sys_perf_counter_open to sys_ni_syscall
      parisc: inventory.c, fix bloated stack frame
      parisc: processor.c, fix bloated stack frame
      parisc: fix compile warning in mm/init.c
      parisc: remove dead code from sys_parisc32.c
      parisc: wire up rt_tgsigqueueinfo
      parisc: ensure broadcast tlb purge runs single threaded
      parisc: fix "delay!" timer handling
      parisc: fix mismatched parenthesis in memcpy.c
      parisc: Fix gcc 4.4 warning in lba_pci.c
      parisc: add parameter to read_cr16()
      parisc: decode_exc.c should include kernel.h
      parisc: remove obsolete hw_interrupt_type
      parisc: fix irq compile bugs in arch/parisc/kernel/irq.c
      parisc: advertise PCI devs after "assign_resources"
      ...
    
    Manually fixed up trivial conflicts in tools/perf/perf.h due to addition
    of SH vs HPPA perf-counter support.
  4. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/sameo/mfd-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6:
      mfd: fix pcap adc locking
      mfd: sm501, fix lock imbalance
  5. @torvalds

    Merge branch 'for-2.6.31' of git://linux-nfs.org/~bfields/linux

    torvalds authored
    * 'for-2.6.31' of git://linux-nfs.org/~bfields/linux:
      NFSD: Don't hold unrefcounted creds over call to nfsd_setuser()
  6. @torvalds

    Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-…

    torvalds authored
    …linus
    
    * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
      MIPS: Fix CONFIG_FLATMEM version of pfn_valid()
      MIPS: Reorganize Cavium OCTEON PCI support.
      Update Yoichi Yuasa's e-mail address
      MIPS: Allow suspend and hibernation again on uniprocessor kernels.
      MIPS: 64-bit: Fix o32 core dump
      MIPS: BC47xx: Fix SSB irq setup
      MIPS: CMP: Update sync-r4k for current kernel
      MIPS: CMP: Move gcmp_probe to before the SMP ops
      MIPS: CMP: activate CMP support
      MIPS: CMP: Extend IPI handling to CPU number
      MIPS: CMP: Extend the GIC IPI interrupts beyond 32
      MIPS: Define __arch_swab64 for all mips r2 cpus
      MIPS: Update VR41xx GPIO driver to use gpiolib
      MIPS: Hookup new syscalls sys_rt_tgsigqueueinfo and sys_perf_counter_open.
      MIPS: Malta: Remove unnecessary function prototypes
      MIPS: MT: Remove unnecessary semicolons
      MIPS: Add support for Texas Instruments AR7 System-on-a-Chip
  7. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/tiwai/sound-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
      sound: do not set DEVNAME for OSS devices
      ALSA: hda - Add sanity check in PCM open callback
      ALSA: hda - Call snd_pcm_lib_hw_rates() again after codec open callback
      ALSA: hda - Avoid invalid formats and rates with shared SPDIF
      ALSA: hda - Improve ASUS eeePC 1000 mixer
      ALSA: hda - Add GPIO1 control at muting with HP laptops
      ALSA: usx2y - reparent sound device
      ALSA: snd_usb_caiaq: reparent sound device
      sound: virtuoso: fix Xonar D1/DX silence after resume
      ASoC: Only disable pxa2xx-i2s clocks if we enabled them
      ALSA: hda - Add quirk for HP 6930p
      ALSA: hda - Add missing static to patch_ca0110()
      ASoC: OMAP: fix OMAP1510 broken PCM pointer callback
      ASoC: remove BROKEN from Efika and pcm030 fabric drivers
      ASoC: Fix typo in MPC5200 PSC AC97 driver Kconfig
  8. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes:
      kbuild: finally remove the obsolete variable $TOPDIR
      gitignore: ignore scripts/ihex2fw
      Kbuild: Disable the -Wformat-security gcc flag
      gitignore: ignore gcov output files
      kbuild: deb-pkg ship changelog
      Add new __init_task_data macro to be used in arch init_task.c files.
      asm-generic/vmlinux.lds.h: shuffle INIT_TASK* macro names in vmlinux.lds.h
      Add new macros for page-aligned data and bss sections.
      asm-generic/vmlinux.lds.h: Fix up RW_DATA_SECTION definition.
  9. @torvalds

    Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

    torvalds authored
    * 'for-linus' of git://git.kernel.dk/linux-2.6-block:
      block: don't merge requests of different failfast settings
      cciss: Ignore stale commands after reboot
Commits on Jul 3, 2009
  1. @tiwai

    Merge branch 'fix/soundcore' into for-linus

    tiwai authored
    * fix/soundcore:
      sound: do not set DEVNAME for OSS devices
  2. @tiwai

    Merge branch 'fix/hda' into for-linus

    tiwai authored
    * fix/hda:
      ALSA: hda - Add sanity check in PCM open callback
      ALSA: hda - Call snd_pcm_lib_hw_rates() again after codec open callback
      ALSA: hda - Avoid invalid formats and rates with shared SPDIF
      ALSA: hda - Improve ASUS eeePC 1000 mixer
      ALSA: hda - Add GPIO1 control at muting with HP laptops
  3. @tiwai

    sound: do not set DEVNAME for OSS devices

    Kay Sievers authored tiwai committed
    Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
  4. @tiwai

    ALSA: hda - Add sanity check in PCM open callback

    tiwai authored
    Add some sanity checks of struct snd_pcm_hardware fields in the PCM
    open callback of hda driver.  This makes a bit easier to debug any PCM
    setup errors in the codec side.
    
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
  5. @tiwai

    ALSA: hda - Call snd_pcm_lib_hw_rates() again after codec open callback

    tiwai authored
    The PCM rates bit field may have been changed by the codec open callback.
    In that case, we need to reset rate_min and rate_max.  So, simply call
    snd_pcm_lib_hw_rates() again after the codec open callback.
    
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
  6. @tiwai

    ALSA: hda - Avoid invalid formats and rates with shared SPDIF

    tiwai authored
    Check whether formats and rates don't result in zero due to the
    restriction of SPDIF sharing.  If any of them can be zero, disable
    the SPDIF sharing mode instead.  Otherwise it will lead to a PCM
    configuration error.
    
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
  7. block: don't merge requests of different failfast settings

    Tejun Heo authored Jens Axboe committed
    Block layer used to merge requests and bios with different failfast
    settings.  This caused regular IOs to fail prematurely when they were
    merged into failfast requests for readahead.
    
    Niel Lambrechts could trigger the problem semi-reliably on ext4 when
    resuming from STR.  ext4 uses readahead when reading inodes and
    combined with the deterministic extra SATA PHY exception cycle during
    resume on the specific configuration, non-readahead inode read would
    fail causing ext4 errors.  Please read the following thread for
    details.
    
      http://lkml.org/lkml/2009/5/23/21
    
    This patch makes block layer reject merging if the failfast settings
    don't match.  This is correct but likely to lower IO performance by
    preventing regular IOs from mingling into surrounding readahead
    requests.  Changes to allow such mixed merges and handle errors
    correctly will be added later.
    
    Signed-off-by: Tejun Heo <tj@kernel.org>
    Reported-by: Niel Lambrechts <niel.lambrechts@gmail.com>
    Cc: Theodore Tso <tytso@mit.edu>
    Signed-off-by: Jens Axboe <axboe@carl.(none)>
  8. @hreinecke

    cciss: Ignore stale commands after reboot

    hreinecke authored Jens Axboe committed
    When doing an unexpected shutdown like kexec the cciss
    firmware might still have some commands in flight, which
    it is trying to complete.
    The driver is doing it's best on resetting the HBA,
    but sadly there's a firmware issue causing the firmware
    _not_ to abort or drop old commands.
    So the firmware will send us commands which we haven't
    accounted for, causing the driver to panic.
    
    With this patch we're just ignoring these commands as
    there is nothing we could be doing with them anyway.
    
    Signed-off-by: Hannes Reinecke <hare@suse.de>
    Acked-by: Mike Miller <mike.miller@hp.com>
    Signed-off-by: Jens Axboe <axboe@carl.(none)>
  9. @ralfbaechle

    MIPS: Fix CONFIG_FLATMEM version of pfn_valid()

    ralfbaechle authored
    For systems which do not define PHYS_OFFSET as 0 pfn_valid() may falsely
    have returned 0 on most configurations.  Bug introduced by commit
    752fbeb (linux-mips.org) rsp.
    6f284a2 (kernel.org) titled "[MIPS]
    FLATMEM: introduce PHYS_OFFSET."
    
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  10. @ralfbaechle

    MIPS: Reorganize Cavium OCTEON PCI support.

    David Daney authored ralfbaechle committed
    Move the cavium PCI files to the arch/mips/pci directory.  Also cleanup
    comment formatting and code layout.  Code from pci-common.c, was moved
    into other files.
    
    Signed-off-by: David Daney <ddaney@caviumnetworks.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  11. @ralfbaechle

    Update Yoichi Yuasa's e-mail address

    Yoichi Yuasa authored ralfbaechle committed
    Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  12. @ralfbaechle

    MIPS: Allow suspend and hibernation again on uniprocessor kernels.

    ralfbaechle authored
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    Acked-by: Pavel Machek <pavel@ucw.cz>
  13. @ralfbaechle

    MIPS: 64-bit: Fix o32 core dump

    Yong Zhang authored ralfbaechle committed
    If an o32 process generates a core dump on a 64 bit kernel, the core file
    will not be correctly recognized. This is because ELF_CORE_COPY_REGS and
    ELF_CORE_COPY_TASK_REGS are not correctly defined for o32 and will use
    the default register set which would be CONFIG_64BIT in asm/elf.h.
    
    So we'll switch to use the right register defines in this situation by
    checking for WANT_COMPAT_REG_H and use the right defines of
    ELF_CORE_COPY_REGS and ELF_CORE_COPY_TASK_REGS.
    
    [Ralf: made ELF_CORE_COPY_TASK_REGS() bullet-proof against funny arguments.]
    
    Signed-off-by: Yong Zhang <yong.zhang@windriver.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  14. @mat-c @ralfbaechle

    MIPS: BC47xx: Fix SSB irq setup

    mat-c authored ralfbaechle committed
    The current ssb irq setup in ssb_mipscore_init has the problem that it
    configures some device on some irq without checking that the irq is not
    taken by an other device.
    
    For example in my case PCI host is on irq 0 and IPSEC on irq 3.
    The current code:
      - store in dev->irq that IPSEC irq is 3 + 2
      - do a set_irq 0->3 on PCI host
    
    But now IPSEC irq is not routed anymore to the mips code and dev->irq is
    wrong.  This causes a problem described in [1].
    
    This patch tries to solve the problem by making set_irq configure the
    device we want to take the irq on the shared irq0. The previous example
    becomes:
      - store in dev->irq that IPSEC irq is 3 + 2
      - do a set_irq 0->3 on PCI host:
      - irq 3 is already taken by IPSEC. do a set_irq 3->0 on IPSEC
    
    I also added some code to print the irq configuration after irq setup to
    allow easier debugging. And I add extra checking in ssb_mips_irq to report
    device without irq or device with not routed irq.
    
    [1] http://www.danm.de/files/src/bcm5365p/REPORTED_DEVICES
    
    Signed-off-by: Matthieu CASTET <castet.matthieu@free.fr>
    Acked-by : Michael Buesch <mb@bu3sch.de>
    Tested-by: Florian Fainelli <florian@openwrt.org>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  15. @ralfbaechle

    MIPS: CMP: Update sync-r4k for current kernel

    Tim Anderson authored ralfbaechle committed
    This revises the sync-4k so it will boot and operate since the removal of
    expirelo from the timer code.
    
    Signed-off-by: Tim Anderson <tanderson@mvista.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  16. @ralfbaechle

    MIPS: CMP: Move gcmp_probe to before the SMP ops

    Tim Anderson authored ralfbaechle committed
    This is to move the gcmp_probe call to before the use of and selection of
    the smp_ops functions. This allows malta with 1004K to work.
    
    Signed-off-by: Tim Anderson <tanderson@mvista.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  17. @ralfbaechle

    MIPS: CMP: activate CMP support

    Tim Anderson authored ralfbaechle committed
    Most of the CMP support was added before, this mostly correct compile
    problems but adds a platform specific translation for the interrupt number
    based on cpu number.
    
    Signed-off-by: Tim Anderson <tanderson@mvista.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  18. @ralfbaechle

    MIPS: CMP: Extend IPI handling to CPU number

    Tim Anderson authored ralfbaechle committed
    This takes the current IPI interrupt assignment from the fix number of 4
    to the number of CPUs defined in the system.
    
    Signed-off-by: Tim Anderson <tanderson@mvista.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  19. @ralfbaechle

    MIPS: CMP: Extend the GIC IPI interrupts beyond 32

    Tim Anderson authored ralfbaechle committed
    This patch extends the GIC interrupt handling beyond the current 32 bit
    range as well as extending the number of interrupts based on the number
    of CPUs.
    
    Signed-off-by: Tim Anderson <tanderson@mvista.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  20. @ralfbaechle

    MIPS: Define __arch_swab64 for all mips r2 cpus

    David Daney authored ralfbaechle committed
    Some CPUs implement mipsr2, but because they are a super-set of mips64r2 do
    not define CONFIG_CPU_MIPS64_R2.  Cavium OCTEON falls into this category.
    We would still like to use the optimized implementation, so since we have
    already checked for CONFIG_CPU_MIPSR2, checking for CONFIG_64BIT instead of
    CONFIG_CPU_MIPS64_R2 is sufficient.
    
    Signed-off-by: David Daney <ddaney@caviumnetworks.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  21. @ralfbaechle

    MIPS: Update VR41xx GPIO driver to use gpiolib

    Yoichi Yuasa authored ralfbaechle committed
    Signed-off-by: Yoichi Yuasa <yyuasa@linux.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  22. @ralfbaechle

    MIPS: Hookup new syscalls sys_rt_tgsigqueueinfo and sys_perf_counter_…

    David Daney authored ralfbaechle committed
    …open.
    
    [Ralf: I fixed up the numbering in the comment in scall64-n32.S.]
    
    Signed-off-by: David Daney <ddaney@caviumnetworks.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  23. @ralfbaechle

    MIPS: Malta: Remove unnecessary function prototypes

    Dmitri Vorobiev authored ralfbaechle committed
    Signed-off-by: Dmitri Vorobiev <dmitri.vorobiev@movial.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  24. @JoePerches @ralfbaechle

    MIPS: MT: Remove unnecessary semicolons

    JoePerches authored ralfbaechle committed
    Signed-off-by: Joe Perches <joe@perches.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  25. @ffainelli @ralfbaechle

    MIPS: Add support for Texas Instruments AR7 System-on-a-Chip

    ffainelli authored ralfbaechle committed
    This patch adds support for the Texas Instruments AR7 System-on-a-Chip.
    It supports the TNETD7100, 7200 and 7300 versions of the SoC.
    
    Signed-off-by: Matteo Croce <matteo@openwrt.org>
    Signed-off-by: Felix Fietkau <nbd@openwrt.org>
    Signed-off-by: Eugene Konev <ejka@openwrt.org>
    Signed-off-by: Nicolas Thill <nico@openwrt.org>
    Signed-off-by: Florian Fainelli <florian@openwrt.org>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  26. NFSD: Don't hold unrefcounted creds over call to nfsd_setuser()

    David Howells authored J. Bruce Fields committed
    nfsd_open() gets an unrefcounted pointer to the current process's effective
    credentials at the top of the function, then calls nfsd_setuser() via
    fh_verify() - which may replace and destroy the current process's effective
    credentials - and then passes the unrefcounted pointer to dentry_open() - but
    the credentials may have been destroyed by this point.
    
    Instead, the value from current_cred() should be passed directly to
    dentry_open() as one of its arguments, rather than being cached in a variable.
    
    Possibly fh_verify() should return the creds to use.
    
    This is a regression introduced by
    745ca24 "CRED: Pass credentials through
    dentry_open()".
    
    Signed-off-by: David Howells <dhowells@redhat.com>
    Tested-and-Verified-By: Steve Dickson <steved@redhat.com>
    Cc: stable@kernel.org
    Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Something went wrong with that request. Please try again.