Skip to content
  1. Jan 14, 2009
  2. Jan 13, 2009
    • Alan Cox's avatar
      pata_it821x: Update RDC UDMA handling · 4a99d95f
      Alan Cox authored
      
      
      The UDMA affliction is apparently specific to revision 0x11. Keeps us in sync
      with drivers/ide current.
      
      Signed-off-by: default avatarAlan Cox <alan@redhat.com>
      Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
      4a99d95f
    • Christian Borntraeger's avatar
      ata: fix wrong WARN_ON_ONCE · a0f79f7a
      Christian Borntraeger authored
      
      
      This patch fixes a wrong WARN_ON that was triggered by 32bit PIO support:
      WARNING: at drivers/ata/libata-sff.c:1017 ata_sff_hsm_move+0x45e/0x750()
      
      __atapi_pio_bytes simply doesnt know enough to decide if there is a bug.
      
      Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
      Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
      a0f79f7a
    • Roland Dreier's avatar
    • Randy Dunlap's avatar
      IB/iser: Add dependency on INFINIBAND_ADDR_TRANS · f5eb3b76
      Randy Dunlap authored
      
      
      Fix ib_iser build to depend on INFINIBAND_ADDR_TRANS; if INET=y but
      IPV6=n, then the RDMA CM is not built but INFINIBAND_ISER can be
      enabled, leading to:
      
          ERROR: "rdma_destroy_id" [drivers/infiniband/ulp/iser/ib_iser.ko] undefined!
          ERROR: "rdma_connect" [drivers/infiniband/ulp/iser/ib_iser.ko] undefined!
          ERROR: "rdma_destroy_qp" [drivers/infiniband/ulp/iser/ib_iser.ko] undefined!
          ERROR: "rdma_create_id" [drivers/infiniband/ulp/iser/ib_iser.ko] undefined!
          ERROR: "rdma_create_qp" [drivers/infiniband/ulp/iser/ib_iser.ko] undefined!
          ERROR: "rdma_resolve_route" [drivers/infiniband/ulp/iser/ib_iser.ko] undefined!
          ERROR: "rdma_disconnect" [drivers/infiniband/ulp/iser/ib_iser.ko] undefined!
          ERROR: "rdma_resolve_addr" [drivers/infiniband/ulp/iser/ib_iser.ko] undefined!
      
      Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
      f5eb3b76
    • Yossi Etigin's avatar
      IPoIB: Do not join broadcast group if interface is brought down · 50df48f5
      Yossi Etigin authored
      
      
      Because the ipoib_workqueue is not flushed when ipoib interface is
      brought down, ipoib_mcast_join() may trigger a join to the broadcast
      group after priv->broadcast was set to NULL (during cleanup).  This
      will cause the system to be a member of the broadcast group when
      interface is down.  As a side effect, this breaks the optimization of
      setting the Q_key only when joining the broadcast group.
      
      Signed-off-by: default avatarYossi Etigin <yosefe@voltaire.com>
      Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
      50df48f5
    • Arjan van de Ven's avatar
      async: fix __lowest_in_progress() · 37a76bd4
      Arjan van de Ven authored
      
      
      At 37000 feet somewhere near Greenland I woke up from a half-sleep with the
      realisation that __lowest_in_progress() is buggy. After landing I checked
      and there were indeed 2 problems with it; this patch fixes both:
      * The order of the list checks was wrong
      * The locking was not correct.
      
      Signed-off-by: default avatarArjan van de Ven <arjan@linux.intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      37a76bd4
    • Arjan van de Ven's avatar
      script: improve markup_oops.pl to also decode oopses in modules · d32ad102
      Arjan van de Ven authored
      
      
      There has been some light flamewar on lkml about decoding oopses
      in modules (as part of the crashdump flamewar).
      
      Now this isn't rocket science, just the markup_oops.pl script
      cheaped out and didn't handle modules. But really; a flamewar
      all about that?? What happened to C++ in the kernel or reading
      files from inside the kernel?
      
      This patch adds module support to markup_oops.pl; it's not the
      most pretty perl but it works for my testcases...
      
      Signed-off-by: default avatarArjan van de Ven <arjan@linux.intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      d32ad102
    • Chris Adams's avatar
      ti_usb_3410_5052: add Multi-Tech firmware · 7df52316
      Chris Adams authored
      
      
      Add the Multi-Tech cellular modem firmware to the TI USB serial driver.
      This firmware was extracted from:
      
      ftp://ftp.multitech.com/wireless/wireless_linux.zip
      
      Firmware licence: "all firmware components are redistributable in binary
      	form" per support@multitech.com
      	Copyright (C) 2005 Multi-Tech Systems, Inc.
      
      Signed-off-by: default avatarChris Adams <cmadams@hiwaay.net>
      Signed-off-by: default avatarAlan Cox <alan@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      7df52316
    • Chris Adams's avatar
      ti_usb_3410_5052: add Multi-Tech modem support · cb7a7c6a
      Chris Adams authored
      
      
      Add Multi-Tech cellular modem support to the ti_usb_3410_5052 driver.
      
      Signed-off-by: default avatarChris Adams <cmadams@hiwaay.net>
      Signed-off-by: default avatarAlan Cox <alan@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      cb7a7c6a
    • Chris Adams's avatar
      ti_usb_3410_5052: support alternate firmware · 05a3d905
      Chris Adams authored
      
      
      The TI USB serial driver supports specifying alternate vendor and
      product IDs (since the chips can and are used in devices under other
      vendor/product IDs).  However, the alternate IDs were not loaded in the
      combined product table.  This patch also adds support for loading
      alternate firmware for alternate vendor/product IDs.
      
      Signed-off-by: default avatarChris Adams <cmadams@hiwaay.net>
      Signed-off-by: default avatarAlan Cox <alan@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      05a3d905
    • Alan Cox's avatar
      usb-serial: remove NULL check · bf0672db
      Alan Cox authored
      
      
      Julia Lawell found a case where a NULL check was misplaced in the
      usb-serial code. However as the object in question cannot be NULL the
      check can simply be removed.
      
      Signed-off-by: default avatarAlan Cox <alan@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      bf0672db
    • Alan Cox's avatar
      neo: Remove a bogus NULL check · 21b56ec4
      Alan Cox authored
      
      
      Julia Lawall found an un-needed check in the neo driver. Her patch moves
      the check to cover the code dereferencing it, however it cannot be NULL
      anyway so remove the NULL check instead.
      
      Signed-off-by: default avatarAlan Cox <alan@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      21b56ec4
    • Alan Cox's avatar
      pty: Fix documentation · c774bda2
      Alan Cox authored
      
      
      The pty changes and updates for window sizing forgot to correct the
      kerneldoc
      
      Signed-off-by: default avatarAlan Cox <alan@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      c774bda2
    • Linus Torvalds's avatar
      Merge branch 'sched-fixes-for-linus' of... · 12847095
      Linus Torvalds authored
      Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        kernel/sched.c: add missing forward declaration for 'double_rq_lock'
        sched: partly revert "sched debug: remove NULL checking in print_cfs_rt_rq()"
        cpumask: fix CONFIG_NUMA=y sched.c
      12847095
    • Linus Torvalds's avatar
      Merge branch 'core-fixes-for-linus' of... · 1181a244
      Linus Torvalds authored
      Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        sparc64: Fix cpumask related build failure
        smp_call_function_single(): be slightly less stupid, fix
        smp_call_function_single(): be slightly less stupid
        rcu: fix bug in rcutorture system-shutdown code
      1181a244
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.o-hand.com/linux-mfd · b7437916
      Linus Torvalds authored
      * 'for-next' of git://git.o-hand.com/linux-mfd:
        mfd: Fix twl4030-core build
        mfd: Ensure sm501 GPIO pin mode is GPIO when configured
        mfd: dm355 evm MMC/SD card detection
        regulator: PCF50633 pmic driver
        input: PCF50633 input driver
        power_supply: PCF50633 battery charger driver
        rtc: PCF50633 rtc driver
        mfd: PCF50633 gpio support
        mfd: PCF50633 adc driver
        mfd: PCF50633 core driver
      b7437916
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus · 9219a3b9
      Linus Torvalds authored
      * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (37 commits)
        MIPS: Only write c0_framemask on CPUs which have this register.
        MIPS: Alchemy: new userspace suspend interface for development boards.
        MIPS: Alchemy: dbdma suspend/resume support.
        MIPS: Alchemy: Fix up PM code on Au1550/Au1200
        MIPS: Alchemy: move calc_clock function.
        MIPS: Alchemy: RTC counter clocksource / clockevent support.
        MIPS: make cp0 counter clocksource/event usable as fallback.
        MIPS: Alchemy: remove cpu_table.
        MIPS: Alchemy: remove get/set_au1x00_lcd_clock().
        MIPS: Print irq handler description
        MIPS: Alchemy: pb1200: update CPLD cascade irq handler.
        MIPS: Alchemy: update core interrupt code.
        MIPS: Alchemy: move commandline mangling out of common code
        MIPS: Alchemy: devboards: consolidate files
        MIPS: Alchemy: Move development board code to common subdirectory
        MIPS: Add Cavium OCTEON to arch/mips/Kconfig
        MIPS: Add defconfig for Cavium OCTEON.
        MIPS: Adjust the dma-common.c platform hooks.
        MIPS: Add Cavium OCTEON slot into proper tlb category.
        MIPS:  Compute branch returns for Cavium OCTEON specific branch instructions.
        ...
      9219a3b9
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · 23ead729
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (37 commits)
        ucc_geth: use correct UCCE macros
        net_dma: acquire/release dma channels on ifup/ifdown
        cxgb3: Keep LRO off if disabled when interface is down
        sfc: SFT9001: Fix condition for LNPGA power-off
        dccp ccid-3: Fix RFC reference
        smsc911x: register irq with device name, not driver name
        smsc911x: fix smsc911x_reg_read compiler warning
        forcedeth: napi schedule lock fix
        net: fix section mismatch warnings in dccp/ccids/lib/tfrc.c
        forcedeth: remove mgmt unit for mcp79 chipset
        qlge: Remove dynamic alloc of rx ring control blocks.
        qlge: Fix schedule while atomic issue.
        qlge: Remove support for device ID 8000.
        qlge: Get rid of split addresses in hardware control blocks.
        qlge: Get rid of volatile usage for shadow register.
        forcedeth: version bump and copyright
        forcedeth: xmit lock fix
        netdev: missing validate_address hooks
        netdev: add missing set_mac_address hook
        netdev: gianfar: add MII ioctl handler
        ...
      23ead729
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 · 54c26687
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
        sparc: Fix asm/signal.h for 32-bit.
        sparc: Eliminate PROMLIB_INTERNAL as it does nothing
        sparc: Kill exports of prom internal functions
        sparc64: move EXPORT_SYMBOL to the symbols definition
        sparc: move EXPORT_SYMBOL to the symbols definition
        sparc: Create a new file lib/ksyms.c and add export of all symbols defined in assembler in lib/ to this file.
        sparc: Most unaligned_64.c tweaks for branch tracer warnings.
        sparc: Fix sun4d_irq.c build.
        sparc: Update 32-bit defconfig.
        sparc64: fix warnings in psycho_common after ull conversion
      54c26687
    • Linus Torvalds's avatar
      Merge branch 'for_2.6.29' of git://git.kernel.org/pub/scm/linux/kernel/git/kkeil/ISDN-2.6 · ddb4a9dd
      Linus Torvalds authored
      * 'for_2.6.29' of git://git.kernel.org/pub/scm/linux/kernel/git/kkeil/ISDN-2.6:
        Fix small typo
        misdn: indentation and braces disagree - add braces
        misdn: one handmade ARRAY_SIZE converted
        drivers/isdn/hardware/mISDN: move a dereference below a NULL test
        indentation & braces disagree - add braces
        Make parameter debug writable
        BUGFIX: used NULL pointer at ioctl(sk,IMGETDEVINFO,&devinfo) when devinfo.id not registered
      ddb4a9dd
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog · 87aa08b7
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
        [WATCHDOG] Pika Warp appliance watchdog timer
        [WATCHDOG] Enable watchdog timer on GE Fanuc's SBC610
        [WATCHDOG] Basic support for GE Fanuc's FPGA based watchdog timer
        [WATCHDOG] wm8350: Fix section annotations
      87aa08b7
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k · 3b1b7195
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: (30 commits)
        m68k: Fix --build-id breakage for sun3
        m68k: Wire up sys_restart_syscall
        fbdev: Kill Atari vblank cursor blinking
        m68k: zorro - Use %pR to print resources
        m68k: dio - Kill resource_size_t format warnings
        m68k: dmasound - Kill warn_unused_result warnings
        m68k: zorro - Kill warn_unused_result warnings
        m68k: dio - Kill warn_unused_result warnings
        m68k: atafb - Kill warn_unused_result warnings
        m68k: amiserial - Kill warn_unused_result warnings
        m68k: ser_a2232 - Kill warn_unused_result warnings
        m68k: vme_scc - Kill warn_unused_result warnings
        m68k: sun3 core - Kill warn_unused_result warnings
        m68k: mvme147 core - Kill warn_unused_result warnings
        m68k: mac core - Kill warn_unused_result warnings
        m68k: hp300 core - Kill warn_unused_result warnings
        m68k: atari core - Kill warn_unused_result warnings
        m68k: apollo core - Kill warn_unused_result warnings
        m68k: amiga core - Kill warn_unused_result warnings
        m68k: Kill several external declarations in source files
        ...
      3b1b7195
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm · c69e8839
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm:
        dlm: change rsbtbl rwlock to spinlock
        dlm: fix seq_file usage in debugfs lock dump
      c69e8839
    • Linus Torvalds's avatar
      Merge branch 'x86-fixes-for-linus' of... · 3e55f1a2
      Linus Torvalds authored
      Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        Revert "cpumask: use work_on_cpu in acpi-cpufreq.c for drv_read and drv_write"
        x86: fix apic.c build error on latest git
        x86: fix mpparse.c build error on latest git
        x86: avoid theoretical vmalloc fault loop
        x86, mtrr: fix types used in userspace exported header
      3e55f1a2
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 · 9b0c474f
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
        ALSA: hda - Use own workqueue
        ALSA: hda - add support for Intel DX58SO board
        ASoC: TWL4030: Module unloading fix
        ALSA: hda - create hda_codec.control_mutex for kcontrol->private_value
        ALSA: caiaq - Version 1.3.10
        ALSA: hda - Add quirk for Dell Inspiron Mini9
        ALSA: caiaq - Fix Oops with MIDI
        ASoC: TWL4030: Change the soc_value_enum back to soc_enum
        ASoC: Merge the soc_value_enum to soc_enum struct
        ALSA: hda - Add quirks for Acer Aspire 5930G and 6930G
        ALSA: hda - Add codec ID for MCP73 HDMI
        ALSA: hda - Fix typos for AD1882 codecs
        ALSA: hda - Add quirk for HP 2230s
      9b0c474f
    • Sean MacLennan's avatar
      [WATCHDOG] Pika Warp appliance watchdog timer · 618efba9
      Sean MacLennan authored
      
      
      The FPGA based watchdog timer used by the Pika Warp appliance.
      
      Signed-off-by: default avatarSean MacLennan <smaclennan@pikatech.com>
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      618efba9
    • Martyn Welch's avatar
      [WATCHDOG] Enable watchdog timer on GE Fanuc's SBC610 · 6ec9eae6
      Martyn Welch authored
      
      
      Support for the FPGA based watchdog timer on GE Fanuc's SBC610.
      
      This patch enables one of the watchdog timers found on the SBC610. There are
      two identical watchdog timers at different offsets in the above mentioned
      boards, however the current driver is only capable of supporting one of them.
      
      The watchdog timers are also capable of generating interrupts at a
      user-configurable threshold, though support for this operation is currently
      not supported by the driver.
      
      Signed-off-by: default avatarMartyn Welch <martyn.welch@gefanuc.com>
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      6ec9eae6
    • Martyn Welch's avatar
      [WATCHDOG] Basic support for GE Fanuc's FPGA based watchdog timer · 3268b561
      Martyn Welch authored
      
      
      GE Fanuc SBC610
      
      Support for the FPGA based watchdog timer as found on GE Fanuc's SBC310,
      SBC610 and PPC9A Single Board Computers.
      
      This patch adds support for the watchdog timer found in one of the devices
      FPGAs. There are two identical watchdog timers at different offsets in the
      above mentioned boards, this driver is capable of supporting one of them.
      The watchdog timers are also capable of generating interrupts at a
      user-configurable threshold, though support for this operation is currently
      not supported by the driver.
      
      Signed-off-by: default avatarMartyn Welch <martyn.welch@gefanuc.com>
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      3268b561
    • Mark Brown's avatar
      [WATCHDOG] wm8350: Fix section annotations · b1cf3e99
      Mark Brown authored
      
      
      The probe and remove functions were incorrectly annotated, with the
      misannotation of the remove function causing build failures when built
      in.
      
      Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      b1cf3e99
    • Al Viro's avatar
      m68k: Fix --build-id breakage for sun3 · 877d5243
      Al Viro authored
      Counterpart of commit 08a3db94
      
       ("m68k: Add
      NOTES to init data so its discarded at boot") for sun3 build.
      
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
      877d5243
    • Andreas Schwab's avatar
      m68k: Wire up sys_restart_syscall · c162564e
      Andreas Schwab authored
      
      
      Make restart blocks working, required for proper syscall restarting.
      
      Signed-off-by: default avatarAndreas Schwab <schwab@suse.de>
      Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
      c162564e
    • Geert Uytterhoeven's avatar
      fbdev: Kill Atari vblank cursor blinking · 1fa0b29f
      Geert Uytterhoeven authored
      
      
      Kill the last remaining vblank cursor blinking user
      
      Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
      1fa0b29f