1. 02 8月, 2007 25 次提交
  2. 01 8月, 2007 15 次提交
    • B
      pata_sis: fix MWDMA for <= UDMA66 chipsets and UDMA for UDMA33 chipsets · 4761c06c
      Bartlomiej Zolnierkiewicz 提交于
      * Fix MWDMA timings setup in sis_old_set_dmamode() and sis_66_set_dmamode().
      
        The old timings were overclocked (even worse behavior than sis5513 IDE driver
        which depends on BIOS to program correct timings), the new timings are taken
        from the datasheet (they match timings from ATA spec).
      
      * Fix UDMA timings setup in sis_old_set_dmamode().
      
        Misplaced pci_write_config_word() call resulted in UDMA timings never
        being set.
      
      * Fix comments for sis_133_early_set_dmamode() and sis_133_set_dmamode():
        - only the former function handles early SiS 961 bridges
        - both functions lack MWDMA timings setup
      
      * Fix typos in sis_100_set_piomode() and sis_133_set_piomode() comments.
      
      * Bump driver version.
      
      Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
      Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      Signed-off-by: NJeff Garzik <jeff@garzik.org>
      4761c06c
    • T
      libata: blacklist SAMSUNG HD401LJ / ZZ100-15 for NCQ · 5d6aca8d
      Tejun Heo 提交于
      SAMSUNG HD401LJ / ZZ100-15 does spurious completion of NCQ commands.
      Disable NCQ.  Reported by Ulrich in bugzilla #8805.
      Signed-off-by: NTejun Heo <htejun@gmail.com>
      Cc: Ulrich <stellplatz-nr.13a@datenparkplatz.de>
      Signed-off-by: NJeff Garzik <jeff@garzik.org>
      5d6aca8d
    • T
      ata_piix: add Tecra M3 to broken suspend blacklist · 7abe79c3
      Tejun Heo 提交于
      Add Tecra M3 to the broken suspend blacklist.  Tecra M3 doesn't have
      proper DMI_PRODUCT_NAME but has an OEM_STRING instead.  Match it.
      Signed-off-by: NTejun Heo <htejun@gmail.com>
      Signed-off-by: NJeff Garzik <jeff@garzik.org>
      7abe79c3
    • T
      ata_piix: implement piix_borken_suspend() · 8c3832eb
      Tejun Heo 提交于
      Separate out broken suspend blacklist matching into
      piix_broken_suspend().
      Signed-off-by: NTejun Heo <htejun@gmail.com>
      Signed-off-by: NJeff Garzik <jeff@garzik.org>
      8c3832eb
    • T
      pci: rename __pci_reenable_device() to pci_reenable_device() · 0b62e13b
      Tejun Heo 提交于
      Rename __pci_reenable_device() to pci_reenable_device().
      Signed-off-by: NTejun Heo <htejun@gmail.com>
      Signed-off-by: NJeff Garzik <jeff@garzik.org>
      0b62e13b
    • A
      libata-sff; Unbreak non DMA capable controllers again · 6fdc99a2
      Alan Cox 提交于
      Seems nobody else is checking/testing this case as it keeps getting
      horked.
      
      If we have no BAR4 mapping on an SFF controller this is *NOT* an error,
      it just means it isn't doing BMDMA.
      Signed-off-by: NAlan Cox <alan@redhat.com>
      Signed-off-by: NJeff Garzik <jeff@garzik.org>
      6fdc99a2
    • A
      pata_cmd64x: Correct the speed ranges · dbf0c89c
      Alan Cox 提交于
      I must have been half asleep when doing the original code
      Signed-off-by: NAlan Cox <alan@redhat.com>
      Signed-off-by: NJeff Garzik <jeff@garzik.org>
      dbf0c89c
    • L
      Fix WARN_ON() on bitfield ops · 8d4fbcfb
      Linus Torvalds 提交于
      Alexey Dobriyan noticed that the new WARN_ON() semantics that were
      introduced by commit 684f9783 (to also
      return the value to be warned on) didn't compile when given a bitfield,
      because the typeof doesn't work for bitfields.
      
      So instead of the typeof trick, use an "int" variable together with a
      "!!(x)" expression, as suggested by Al Viro.
      
      To make matters more interesting, Paul Mackerras points out that that is
      sub-optimal on Power, but the old asm-coded comparison seems to be buggy
      anyway on 32-bit Power if the conditional was 64-bit, so I think there
      are more problems there.
      
      Regardless, the new WARN_ON() semantics may have been a bad idea.  But
      this at least avoids the more serious complications.
      
      Cc: Alexey Dobriyan <adobriyan@sw.ru>
      Cc: Herbert Xu <herbert@gondor.apana.org.au>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Al Viro <viro@ftp.linux.org.uk>
      Cc: Ingo Molnar <mingo@elte.hu>
      Cc: Andrew Morton <akpm@osdl.org>
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      8d4fbcfb
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog · 2f63251e
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: (28 commits)
        [WATCHDOG] Fix pcwd_init_module crash
        [WATCHDOG] ICH9 support for iTCO_wdt
        [WATCHDOG] 631xESB/632xESB support for iTCO_wdt - add all LPC bridges
        [WATCHDOG] 631xESB/632xESB support for iTCO_wdt
        [WATCHDOG] omap_wdt.c - default error for IOCTL is -ENOTTY
        [WATCHDOG] Return value of nonseekable_open
        [WATCHDOG] mv64x60_wdt: Rework the timeout register manipulation
        [WATCHDOG] mv64x60_wdt: disable watchdog timer when driver is probed
        [WATCHDOG] mv64x60_wdt: Support the WDIOF_MAGICCLOSE feature
        [WATCHDOG] mv64x60_wdt: Add a module parameter to change nowayout setting
        [WATCHDOG] mv64x60_wdt: Add WDIOC_SETOPTIONS ioctl support
        [WATCHDOG] mv64x60_wdt: Support for WDIOC_SETTIMEOUT ioctl
        [WATCHDOG] mv64x60_wdt: Fix WDIOC_GETTIMEOUT return value
        [WATCHDOG] mv64x60_wdt: Check return value of nonseekable_open
        [WATCHDOG] mv64x60_wdt: Add arch/powerpc platform support
        [WATCHDOG] mv64x60_wdt: Get register address from platform data
        [WATCHDOG] mv64x60_wdt: set up platform_device in platform code
        [WATCHDOG] ensure mouse and keyboard ignored in w83627hf_wdt
        [WATCHDOG] s3c2410_wdt: fixup after arch include moves
        [WATCHDOG] git-watchdog-typo
        ...
      2f63251e
    • L
      Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus · d6dd9e93
      Linus Torvalds 提交于
      * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (50 commits)
        [MIPS] Add smp_call_function_single()
        [MIPS] thread_info.h: kmalloc + memset conversion to kzalloc
        [MIPS] Kexec: Fix several 64-bit bugs.
        [MIPS] Kexec: Fix several warnings.
        [MIPS] DDB5477: Remove support
        [MIPS] Fulong: Remove unneeded header file
        [MIPS] Cobalt: Enable UART on RaQ1
        [MIPS] Remove unused GROUP_TOSHIBA_NAMES
        [MIPS] remove some duplicate includes
        [MIPS] Oprofile: Fix rm9000 performance counter handler
        [MIPS] Use -Werror on subdirectories which build cleanly.
        [MIPS] Yosemite: Fix warning.
        [MIPS] PMON: Fix cpustart declaration.
        [MIPS] Yosemite: Only build ll_ht_smp_irq_handler() if HYPERTRANSPORT.
        [MIPS] Yosemite: Fix build error due to undeclared titan_mailbox_irq().
        [MIPS] Yosemite: Don't declare titan_mailbox_irq() as asmlinkage.
        [MIPS] Yosemite: Fix warnings in i2c-yoesmite by deleting the unused code.
        [MIPS] Delete unused arch/mips/gt64120/common/
        [MIPS] Fix build warning in unaligned load/store emulator.
        [MIPS] IP32: Don't ignore request_irq's return value.
        ...
      d6dd9e93
    • L
      Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6 · dd9cd6d4
      Linus Torvalds 提交于
      * 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6:
        hwmon: fscher read control bugfix
        hwmon: (adm1031) Fix broken links in documentation
        hwmon: make abituguru3_read_increment_offset() static
        hwmon: Fix regression caused by typo in lm90.c
        hwmon: (applesmc) add temperature sensors set for Macbook
        hwmon: fscher control update bugfix
        hwmon: fix dme1737 temp fault attribute
        hwmon: Add missing __devexit tags in various drivers
        hwmon: clean up duplicate includes
        hwmon: fix lm78 detection regression
        hwmon: fix array overruns in lm93.c
        hwmon: add support for THMC50 and ADM1022
      dd9cd6d4
    • L
      ACPI: delete CONFIG_ACPI_PROCFS_SLEEP (again) · 128a2bcf
      Len Brown 提交于
      CONFIG_ACPI_PROCFS_SLEEP is a NO-OP -- delete it (again).
      
      Apparently 296699de creating CONFIG_SUSPEND
      and CONFIG_PM_SLEEP was based on an out-dated version of drivers/acpi/Kconfig,
      as it erroneously restored this recently deleted config option.
      Signed-off-by: NLen Brown <len.brown@intel.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      128a2bcf
    • A
      Fix up "remove the arm26 port" · fc34f6c6
      Andrew Morton 提交于
      scripts/kconfig/conf -o arch/arm/Kconfig
      arch/arm/Kconfig:994: can't open file "drivers/acorn/block/Kconfig"
      
      Cc: Adrian Bunk <bunk@stusta.de>
      Cc: Ian Molton <spyro@f2s.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      fc34f6c6
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup · 8ddf83fe
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup:
        [x86 setup] EDD: Fix the computation of the MBR sector buffer
        [x86 setup] Newline after setup signature failure message
        x86 boot code comments typos
      8ddf83fe
    • L
      Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · 0d6caa17
      Linus Torvalds 提交于
      * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (41 commits)
        [RTNETLINK]: Fix warning for !CONFIG_KMOD
        [IPV4] ip_options.c: kmalloc + memset conversion to kzalloc
        [DECNET]: kmalloc + memset conversion to kzalloc
        [NET]: ethtool_perm_addr only has one implementation
        [NET]: ethtool ops are the only way
        [PPPOE]: Improve hashing function in hash_item().
        [XFRM]: State selection update to use inner addresses.
        [IPSEC]: Ensure that state inner family is set
        [TCP]: Bidir flow must not disregard SACK blocks for lost marking
        [TCP]: Fix ratehalving with bidirectional flows
        [PPPOL2TP]: Add CONFIG_INET Kconfig dependency.
        [NET]: Page offsets and lengths need to be __u32.
        [AF_UNIX]: Make code static.
        [NETFILTER]: Make nf_ct_ipv6_skip_exthdr() static.
        [PKTGEN]: make get_ipsec_sa() static and non-inline
        [PPPoE]: move lock_sock() in pppoe_sendmsg() to the right location
        [PPPoX/E]: return ENOTTY on unknown ioctl requests
        [IPV6]: ipv6_addr_type() doesn't know about RFC4193 addresses.
        [NET]: Fix prio_tune() handling of root qdisc.
        [NET]: Fix sch_api to properly set sch->parent on the root.
        ...
      0d6caa17