1. 18 Sep, 2009 32 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog · afa12e72
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
        [WATCHDOG] sizeof cleanup
        [WATCHDOG] wdt_pci: fix printk and variable type
        [WATCHDOG] wdt_pci - use pci_request_region
        [WATCHDOG] ar7_wdt: Fix error handling during probe.
        [WATCHDOG] ar7_wdt: convert to become a platform driver
        [WATCHDOG] fix book E watchdog to take WDIOC_SETTIMEOUT arg in seconds
        [WATCHDOG] davinci: use clock framework for timer frequency
        [WATCHDOG] Use DIV_ROUND_UP() macro in the coh901327 WDT
        [WATCHDOG] Add support for WM831x watchdog
        [WATCHDOG] Add watchdog driver for NUC900
        [WATCHDOG] add SBC-FITPC2 watchdog driver
      afa12e72
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://gitserver.sunplusct.com/linux-2.6-score · 81ce31b7
      Linus Torvalds authored
      * 'for-linus' of git://gitserver.sunplusct.com/linux-2.6-score: (22 commits)
        score: add TIF_NOTIFY_RESUME define in asm/thread_info.h
        score: make init_thread_union align to THREAD_SIZE
        score: update files according to review comments.
        score: add old syscall support
        score: add MEMORY_START and MEMORY_SIZE define, to make the code clear
        score: update inconsistent declare after .c was changed
        score: remove unused code, add include files in .c
        score: clean up mm/init.c
        score: make irq.h definitions local
        score: cleanups: dead code, 0 as pointer, shadowed variables
        score: fix function prototypes
        score: add address space annotations
        score: add missing #includes
        score: move save arg5 and arg6 instruction in front of enable_irq
        score: add prototypes for wrapped syscalls
        score: remove init_mm
        score: add generic sys_call_table
        score: remove __{put,get}_user_unknown
        score: unset __ARCH_WANT_IPC_PARSE_VERSION
        score: update files according to review comments
        ...
      81ce31b7
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 · 515b696b
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (262 commits)
        sh: mach-ecovec24: Add user debug switch support
        sh: Kill off unused se_skipped in alignment trap notification code.
        sh: Wire up HAVE_SYSCALL_TRACEPOINTS.
        video: sh_mobile_lcdcfb: use both register sets for display panning
        video: sh_mobile_lcdcfb: implement display panning
        sh: Fix up sh7705 flush_dcache_page() build.
        sh: kfr2r09: document the PLL/FLL <-> RF relationship.
        sh: mach-ecovec24: need asm/clock.h.
        sh: mach-ecovec24: deassert usb irq on boot.
        sh: Add KEYSC support for EcoVec24
        sh: add kycr2_delay for sh_keysc
        sh: cpufreq: Include CPU id in info messages.
        sh: multi-evt support for SH-X3 proto CPU.
        sh: clkfwk: remove bogus set_bus_parent() from SH7709.
        sh: Fix the indication point of the liquid crystal of AP-325RXA(AP3300)
        sh: Add EcoVec24 romImage defconfig
        sh: USB disable process is needed if romImage boot for EcoVec24
        sh: EcoVec24: add HIZA setting for LED
        sh: EcoVec24: write MAC address in boot
        sh: Add romImage support for EcoVec24
        ...
      515b696b
    • Linus Torvalds's avatar
      Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 · fa877c71
      Linus Torvalds authored
      * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
        [IA64] Clean up linker script using standard macros.
        [IA64] Use standard macros for page-aligned data.
        [IA64] Use .ref.text, not .text.init for start_ap.
        [IA64] sgi-xp: fix printk format warnings
        [IA64] ioc4_serial: fix printk format warnings
        [IA64] mbcs: fix printk format warnings
        [IA64] pci_br, fix infinite loop in find_free_ate()
        [IA64] kdump: Short path to freeze CPUs
        [IA64] kdump: Try INIT regardless of
        [IA64] kdump: Mask INIT first in panic-kdump path
        [IA64] kdump: Don't return APs to SAL from kdump
        [IA64] kexec: Unregister MCA handler before kexec
        [IA64] kexec: Make INIT safe while transition to
        [IA64] kdump: Mask MCA/INIT on frozen cpus
      
      Fix up conflict in arch/ia64/kernel/vmlinux.lds.S as per Tony's
      suggestion.
      fa877c71
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse · 9eead2a8
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
        fuse: add fusectl interface to max_background
        fuse: limit user-specified values of max background requests
        fuse: use drop_nlink() instead of direct nlink manipulation
        fuse: document protocol version negotiation
        fuse: make the number of max background requests and congestion threshold tunable
      9eead2a8
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6 · 6f130478
      Linus Torvalds authored
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (55 commits)
        regulator: Voltage count for AB3100
        mfd: Convert WM8350 to use request_threaded_irq()
        mfd: Update MAINTAINERS patterns for WM831x
        mfd: Fix twl4030-power warnings
        regulator: AB3100 support
        rtc: AB3100 RTC support
        mfd: Fix ab3100-otp build failure
        mfd: OMAP: Board-specifc twl4030 DPS scripts for RX51 board
        mfd: Print warning for twl4030 out-of-order script loading
        mfd: Add support for TWL4030/5030 dynamic power switching
        mfd: AB3100 OTP readout
        regulator: Add Freescale MC13783 driver
        mfd: Add Freescale MC13783 driver
        mfd: AB3100 disable irq nosync
        mfd: AB3100 alter default setting
        mfd: AB3100 propagate error
        mfd: AB3100 accessor function cleanups
        rtc: Add support for RTCs on Wolfson WM831x devices
        regulator: get pcap data from the parent device
        input: PCAP2 misc input driver
        ...
      6f130478
    • Linus Torvalds's avatar
      Merge branch 'davinci-for-linus' of... · 6f128fa3
      Linus Torvalds authored
      Merge branch 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci
      
      * 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci: (62 commits)
        DaVinci: DM646x - platform changes for vpif capture and display drivers
        davinci: DM355 - platform changes for vpfe capture
        davinci: DM644x platform changes for vpfe capture
        davinci: audio: move tlv320aic33 i2c setup into board files
        DaVinci: EDMA: Adding 2 new APIs for allocating/freeing PARAMs
        DaVinci: DM365: Adding entries for DM365 IRQ's
        DaVinci: DM355: Adding PINMUX entries for DM355 Display
        davinci: Handle pinmux conflict between mmc/sd and nor flash
        davinci: Add NOR flash support for da850/omap-l138
        davinci: Add NAND flash support for DA850/OMAP-L138
        davinci: Add MMC/SD support for da850/omap-l138
        davinci: Add platform support for da850/omap-l138 GLCD
        davinci: Macro to convert GPIO signal to GPIO pin number
        davinci: Audio support for DA850/OMAP-L138 EVM
        davinci: Audio support for DA830 EVM
        davinci: Correct the number of GPIO pins for da850/omap-l138
        davinci: Configure MDIO pins for EMAC
        DaVinci: DM365: Add Support for new Revision of silicon
        DaVinci: DM365: Fix Compilation issue due to PINMUX entry
        DaVinci: EDMA: Updating default queue handling
        ...
      6f128fa3
    • Linus Torvalds's avatar
      Merge branch 'omap-for-linus' of... · 73c583e4
      Linus Torvalds authored
      Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
      
      * 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (47 commits)
        OMAP clock: use debugfs_remove_recursive() for rewinding
        OMAP2/3/4 core: create omap_device layer
        OMAP: omap_hwmod: call omap_hwmod init at boot; create interconnects
        OMAP2/3/4: create omap_hwmod layer
        OMAP2/3 board-*.c files: read bootloader configuration earlier
        OMAP2/3/4 PRCM: add module IDLEST wait code
        OMAP2/3 PM: create the OMAP PM interface and add a default OMAP PM no-op layer
        OMAP3 clock: remove superfluous calls to omap2_init_clk_clkdm
        OMAP clock: associate MPU clocks with the mpu_clkdm
        OMAP3 clock: Fixed processing of bootarg 'mpurate'
        OMAP: SDRC: Add several new register definitions
        OMAP: powerdomain: Fix overflow when doing powerdomain deps lookups.
        OMAP: PM: Added suspend target state control to debugfs for OMAP3
        OMAP: PM debug: Add PRCM register dump support
        OMAP: PM debug: make powerdomains use PM-debug counters
        OMAP: PM: Add pm-debug counters
        OMAP: PM: Add closures to clkdm_for_each and pwrdm_for_each.
        OMAP: PM: Hook into PM counters
        OMAP: PM counter infrastructure.
        OMAP3: PM: fix lockdep warning caused by omap3_pm_init
        ...
      73c583e4
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm · 5ce00289
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm:
        dlm: use kernel_sendpage
        dlm: fix connection close handling
        dlm: fix double-release of socket in error exit path
      5ce00289
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6 · 2511817c
      Linus Torvalds authored
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6:
        ext3: Flush disk caches on fsync when needed
        ext3: Add locking to ext3_do_update_inode
        ext3: Fix possible deadlock between ext3_truncate() and ext3_get_blocks()
        jbd: Annotate transaction start also for journal_restart()
        jbd: Journal block numbers can ever be only 32-bit use unsigned int for them
        ext3: Update MAINTAINERS for ext3 and JBD
        JBD: round commit timer up to avoid uncommitted transaction
      2511817c
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq · 714af069
      Linus Torvalds authored
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
        [CPUFREQ] Fix NULL ptr regression in powernow-k8
        [CPUFREQ] Create a blacklist for processors that should not load the acpi-cpufreq module.
        [CPUFREQ] Powernow-k8: Enable more than 2 low P-states
        [CPUFREQ] remove rwsem lock from CPUFREQ_GOV_STOP call (second call site)
        [CPUFREQ] ondemand - Use global sysfs dir for tuning settings
        [CPUFREQ] Introduce global, not per core: /sys/devices/system/cpu/cpufreq
        [CPUFREQ] Bail out of cpufreq_add_dev if the link for a managed CPU got created
        [CPUFREQ] Factor out policy setting from cpufreq_add_dev
        [CPUFREQ] Factor out interface creation from cpufreq_add_dev
        [CPUFREQ] Factor out symlink creation from cpufreq_add_dev
        [CPUFREQ] cleanup up -ENOMEM handling in cpufreq_add_dev
        [CPUFREQ] Reduce scope of cpu_sys_dev in cpufreq_add_dev
        [CPUFREQ] update Doc for cpuinfo_cur_freq and scaling_cur_freq
      714af069
    • Linus Torvalds's avatar
      Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · a03fdb76
      Linus Torvalds authored
      * 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (34 commits)
        time: Prevent 32 bit overflow with set_normalized_timespec()
        clocksource: Delay clocksource down rating to late boot
        clocksource: clocksource_select must be called with mutex locked
        clocksource: Resolve cpu hotplug dead lock with TSC unstable, fix crash
        timers: Drop a function prototype
        clocksource: Resolve cpu hotplug dead lock with TSC unstable
        timer.c: Fix S/390 comments
        timekeeping: Fix invalid getboottime() value
        timekeeping: Fix up read_persistent_clock() breakage on sh
        timekeeping: Increase granularity of read_persistent_clock(), build fix
        time: Introduce CLOCK_REALTIME_COARSE
        x86: Do not unregister PIT clocksource on PIT oneshot setup/shutdown
        clocksource: Avoid clocksource watchdog circular locking dependency
        clocksource: Protect the watchdog rating changes with clocksource_mutex
        clocksource: Call clocksource_change_rating() outside of watchdog_lock
        timekeeping: Introduce read_boot_clock
        timekeeping: Increase granularity of read_persistent_clock()
        timekeeping: Update clocksource with stop_machine
        timekeeping: Add timekeeper read_clock helper functions
        timekeeping: Move NTP adjusted clock multiplier to struct timekeeper
        ...
      
      Fix trivial conflict due to MIPS lemote -> loongson renaming.
      a03fdb76
    • Linus Torvalds's avatar
      pty_write: don't do a tty_wakeup() when the buffers are full · 202c4675
      Linus Torvalds authored
      Commit ac89a917 ("pty: don't limit the writes to 'pty_space()' inside
      'pty_write()'") removed the pty_space() checking, in order to let the
      regular tty buffer code limit the buffering itself.
      
      That was all good, but as a subtle side effect it meant that we'd be
      doing a tty_wakeup() even in the case where the buffers were all filled
      up, and didn't actually make any progress on the write.
      
      Which sounds innocuous, but it interacts very badly with the ppp_async
      code, which has an infinite loop in ppp_async_push() that tries to push
      out data to the tty.  When we call tty_wakeup(), that loop ends up
      thinking that progress was made (see the subtle interactions between
      XMIT_WAKEUP and 'tty_stuffed' for details).  End result: one unhappy ppp
      user.
      
      Fixed by noticing when tty_insert_flip_string() didn't actually do
      anything, and then not doing any more processing (including, very much
      not calling tty_wakeup()).
      Bisected-and-tested-by: default avatarPeter Volkov <pva@gentoo.org>
      Cc: stable@kernel.org (2.6.31)
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      202c4675
    • Wim Van Sebroeck's avatar
      [WATCHDOG] sizeof cleanup · e04ab958
      Wim Van Sebroeck authored
      Use sizeof(*) instead of sizeof * (See Codingstyle documentation).
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      e04ab958
    • Randy Dunlap's avatar
      [WATCHDOG] wdt_pci: fix printk and variable type · d1833c21
      Randy Dunlap authored
      Fix printk format warning:
      drivers/watchdog/wdt_pci.c:652: warning: format '%04x' expects type 'unsigned int', but argument 2 has type 'resource_size_t'
      
      and then use resource_size_t for the "io" variable as well
      so that it won't be truncated.
      Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      d1833c21
    • Wim Van Sebroeck's avatar
      [WATCHDOG] wdt_pci - use pci_request_region · 119d3e56
      Wim Van Sebroeck authored
      Use pci_request_region instead of request_region for this pci_driver.
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      119d3e56
    • Wim Van Sebroeck's avatar
      [WATCHDOG] ar7_wdt: Fix error handling during probe. · d7e9791b
      Wim Van Sebroeck authored
      Fix error handling in the probe function.
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      Tested-by: default avatarFlorian Fainelli <florian@openwrt.org>
      d7e9791b
    • Florian Fainelli's avatar
      [WATCHDOG] ar7_wdt: convert to become a platform driver · 64d4062a
      Florian Fainelli authored
      This patch converts the ar7_wdt driver to become
      a platform driver. The AR7 SoC specific identification
      and base register calculation is performed by the board
      code, therefore we no longer need to have access to
      ar7_chip_id. We also remove the reboot notifier code to
      use the platform shutdown method as Wim suggested.
      Signed-off-by: default avatarFlorian Fainelli <florian@openwrt.org>
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      64d4062a
    • Chris Friesen's avatar
      [WATCHDOG] fix book E watchdog to take WDIOC_SETTIMEOUT arg in seconds · dcfb7484
      Chris Friesen authored
      The WDIOC_SETTIMEOUT argument is supposed to be a "seconds" value.
      However, the book E wdt currently treats it as a "period" which is
      interpreted in a board-specific way.
      
      This patch allows the user to pass in a "seconds" value and the driver
      will set the smallest timeout that is at least as large as specified
      by the user.  It's been tested on e500 hardware and works as
      expected.
      
      The patch only modifies the CONFIG_FSL_BOOKE case, the CONFIG_4xx case
      is left unmodified as I don't have any hardware to test it on.
      Signed-off-by: default avatarChris Friesen <cfriesen@nortel.com>
      Cc: Kumar Gala <galak@gate.crashing.org>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      dcfb7484
    • Kevin Hilman's avatar
      [WATCHDOG] davinci: use clock framework for timer frequency · 9fd868f4
      Kevin Hilman authored
      Remove use of CLOCK_TICK_RATE in favor of using clock framework
      for getting timer frequency.
      Signed-off-by: default avatarKevin Hilman <khilman@deeprootsystems.com>
      Signed-off-by: default avatarRussell King <linux@arm.linux.org.uk>
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      9fd868f4
    • Linus Walleij's avatar
      [WATCHDOG] Use DIV_ROUND_UP() macro in the coh901327 WDT · 0ecc3bf4
      Linus Walleij authored
      I saw Julia Lawalls various commits fixing up the use of rounding
      macros and since my already submitted patch was not caught in this
      I took it upon myself to fix it up for this driver as well.
      Signed-off-by: default avatarLinus Walleij <linus.walleij@stericsson.com>
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      0ecc3bf4
    • Mark Brown's avatar
      [WATCHDOG] Add support for WM831x watchdog · 502a0106
      Mark Brown authored
      The WM831x series of devices provide a watchdog with configurable
      behaviour on timer expiry.
      
      Currently this driver support refreshes via a register or GPIO line and
      autonomous refreshes from a hardware source (eg, a clock).
      Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      502a0106
    • Wan ZongShun's avatar
      [WATCHDOG] Add watchdog driver for NUC900 · 0400e313
      Wan ZongShun authored
      Add watchdog device driver for the Nuvoton NUC900 series SoCs.
      Signed-off-by: default avatarWan ZongShun <mcuos.com@gmail.com>
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      0400e313
    • Denis Turischev's avatar
      [WATCHDOG] add SBC-FITPC2 watchdog driver · 3a5f9000
      Denis Turischev authored
      Add support for watchdog found on SBC-FITPC2 board.
      Signed-off-by: default avatarDenis Turischev <denis@compulab.co.il>
      Signed-off-by: default avatarMike Rapoport <mike@compulab.co.il>
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      3a5f9000
    • Linus Torvalds's avatar
      Merge branch 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · df58bee2
      Linus Torvalds authored
      * 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (21 commits)
        x86, mce: Fix compilation with !CONFIG_DEBUG_FS in mce-severity.c
        x86, mce: CE in last bank prevents panic by unknown MCE
        x86, mce: Fake panic support for MCE testing
        x86, mce: Move debugfs mce dir creating to mce.c
        x86, mce: Support specifying raise mode for software MCE injection
        x86, mce: Support specifying context for software mce injection
        x86, mce: fix reporting of Thermal Monitoring mechanism enabled
        x86, mce: remove never executed code
        x86, mce: add missing __cpuinit tags
        x86, mce: fix "mce" boot option handling for CONFIG_X86_NEW_MCE
        x86, mce: don't log boot MCEs on Pentium M (model == 13) CPUs
        x86: mce: Lower maximum number of banks to architecture limit
        x86: mce: macros to compute banks MSRs
        x86: mce: Move per bank data in a single datastructure
        x86: mce: Move code in mce.c
        x86: mce: Rename CONFIG_X86_NEW_MCE to CONFIG_X86_MCE
        x86: mce: Remove old i386 machine check code
        x86: mce: Update X86_MCE description in x86/Kconfig
        x86: mce: Make CONFIG_X86_ANCIENT_MCE dependent on CONFIG_X86_MCE
        x86, mce: use atomic_inc_return() instead of add by 1
        ...
      
      Manually fixed up trivial conflicts:
      	Documentation/feature-removal-schedule.txt
      	arch/x86/kernel/cpu/mcheck/mce.c
      df58bee2
    • Linus Torvalds's avatar
      Merge branch 'sched-core-for-linus' of... · dcbf77b9
      Linus Torvalds authored
      Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (37 commits)
        sched: Fix SD_POWERSAVING_BALANCE|SD_PREFER_LOCAL vs SD_WAKE_AFFINE
        sched: Stop buddies from hogging the system
        sched: Add new wakeup preemption mode: WAKEUP_RUNNING
        sched: Fix TASK_WAKING & loadaverage breakage
        sched: Disable wakeup balancing
        sched: Rename flags to wake_flags
        sched: Clean up the load_idx selection in select_task_rq_fair
        sched: Optimize cgroup vs wakeup a bit
        sched: x86: Name old_perf in a unique way
        sched: Implement a gentler fair-sleepers feature
        sched: Add SD_PREFER_LOCAL
        sched: Add a few SYNC hint knobs to play with
        sched: Fix sync wakeups again
        sched: Add WF_FORK
        sched: Rename sync arguments
        sched: Rename select_task_rq() argument
        sched: Feature to disable APERF/MPERF cpu_power
        x86: sched: Provide arch implementations using aperf/mperf
        x86: Add generic aperf/mperf code
        x86: Move APERF/MPERF into a X86_FEATURE
        ...
      
      Fix up trivial conflict in arch/x86/include/asm/processor.h due to
      nearby addition of amd_get_nb_id() declaration from the EDAC merge.
      dcbf77b9
    • Linus Torvalds's avatar
      Merge branch 'x86-fixes-for-linus' of... · ca043a66
      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:
        x86, pat: don't use rb-tree based lookup in reserve_memtype()
        x86: Increase MIN_GAP to include randomized stack
      ca043a66
    • Linus Torvalds's avatar
      Merge branch 'tracing-core-for-linus' of... · 1218259b
      Linus Torvalds authored
      Merge branch 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (44 commits)
        vsnprintf: remove duplicate comment of vsnprintf
        softirq: add BLOCK_IOPOLL to softirq_to_name
        oprofile: fix oprofile regression: select RING_BUFFER_ALLOW_SWAP
        tracing: switch function prints from %pf to %ps
        vsprintf: add %ps that is the same as %pS but is like %pf
        tracing: Fix minor bugs for __unregister_ftrace_function_probe
        tracing: remove notrace from __kprobes annotation
        tracing: optimize global_trace_clock cachelines
        MAINTAINERS: Update tracing tree details
        ftrace: document function and function graph implementation
        tracing: make testing syscall events a separate configuration
        tracing: remove some unused macros
        ftrace: add compile-time check on F_printk()
        tracing: fix F_printk() typos
        tracing: have TRACE_EVENT macro use __flags to not shadow parameter
        tracing: add static to generated TRACE_EVENT functions
        ring-buffer: typecast cmpxchg to fix PowerPC warning
        tracing: add filter event logic to special, mmiotrace and boot tracers
        tracing: remove trace_event_types.h
        tracing: use the new trace_entries.h to create format files
        ...
      1218259b
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev · ca9a702e
      Linus Torvalds authored
      * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
        libata: Add pata_atp867x driver for Artop/Acard ATP867X controllers
        pata_amd: do not filter out valid modes in nv_mode_filter
        sata_promise: update reset code
        sata_promise: disable hotplug on 1st gen chips
        libata: fix spurious WARN_ON_ONCE() on port freeze
        ahci: restore pci_intx() handling
      ca9a702e
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 · bbe5a96f
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
        sparc: Update defconfigs.
        sparc: Kill PROM console driver.
      bbe5a96f
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · f205ce83
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (66 commits)
        be2net: fix some cmds to use mccq instead of mbox
        atl1e: fix 2.6.31-git4 -- ATL1E 0000:03:00.0: DMA-API: device driver frees DMA
        pkt_sched: Fix qstats.qlen updating in dump_stats
        ipv6: Log the affected address when DAD failure occurs
        wl12xx: Fix print_mac() conversion.
        af_iucv: fix race when queueing skbs on the backlog queue
        af_iucv: do not call iucv_sock_kill() twice
        af_iucv: handle non-accepted sockets after resuming from suspend
        af_iucv: fix race in __iucv_sock_wait()
        iucv: use correct output register in iucv_query_maxconn()
        iucv: fix iucv_buffer_cpumask check when calling IUCV functions
        iucv: suspend/resume error msg for left over pathes
        wl12xx: switch to %pM to print the mac address
        b44: the poll handler b44_poll must not enable IRQ unconditionally
        ipv6: Ignore route option with ROUTER_PREF_INVALID
        bonding: make ab_arp select active slaves as other modes
        cfg80211: fix SME connect
        rc80211_minstrel: fix contention window calculation
        ssb/sdio: fix printk format warnings
        p54usb: add Zcomax XG-705A usbid
        ...
      f205ce83
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus · 3dc95666
      Linus Torvalds authored
      * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (51 commits)
        MIPS: BCM63xx: Add integrated ethernet mac support.
        MIPS: BCM63xx: Add support for the Broadcom BCM63xx family of SOCs.
        MIPS: BCM63xx: Add Broadcom 63xx CPU definitions.
        MIPS: Octeon:  Move some platform device registration to its own file.
        MIPS: Don't corrupt page tables on vmalloc fault.
        MIPS: Shrink the size of tlb handler
        MIPS: Alchemy: override loops_per_jiffy detection
        MIPS: hw_random: Add hardware RNG for Octeon SOCs.
        MIPS: Octeon:  Add hardware RNG platform device.
        MIPS: Remove useless zero initializations.
        MIPS: Alchemy: get rid of allow_au1k_wait
        MIPS: Octeon: Set kernel_uses_llsc to false on non-SMP builds.
        MIPS: Allow kernel use of LL/SC to be separate from the presence of LL/SC.
        MIPS: Get rid of CONFIG_CPU_HAS_LLSC
        MIPS: Malta: Remove pointless use use of CONFIG_CPU_HAS_LLSC
        MIPS: Rewrite clearing of ll_bit on context switch in C
        MIPS: Rewrite sysmips(MIPS_ATOMIC_SET, ...) in C with inline assembler
        MIPS: Consolidate all CONFIG_CPU_HAS_LLSC use in a single C file.
        MIPS: Clean up linker script using new linker script macros.
        MIPS: Use PAGE_SIZE in assembly instead of _PAGE_SIZE.
        ...
      3dc95666
  2. 17 Sep, 2009 8 commits
    • H. Peter Anvin's avatar
      Merge branch 'x86/pat' into x86/urgent · 3bb045f1
      H. Peter Anvin authored
      Merge reason:
      
      Suresh Siddha (1):
            x86, pat: don't use rb-tree based lookup in reserve_memtype()
      
      ... requires previous x86/pat commits already pushed to Linus.
      Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
      3bb045f1
    • Suresh Siddha's avatar
      x86, pat: don't use rb-tree based lookup in reserve_memtype() · dcb73bf4
      Suresh Siddha authored
      Recent enhancement of rb-tree based lookup exposed a  bug with the lookup
      mechanism in the reserve_memtype() which ensures that there are no conflicting
      memtype requests for the memory range.
      
      memtype_rb_search() returns an entry which has a start address <= new start
      address. And from here we traverse the linear linked list to check if there
      any conflicts with the existing mappings. As the rbtree is based on the
      start address of the memory range, it is quite possible that we have several
      overlapped mappings whose start address is much less than new requested start
      but the end is >= new requested end. This results in conflicting memtype
      mappings.
      
      Same bug exists with the old code which uses cached_entry from where
      we traverse the linear linked list. But the new rb-tree code exposes this
      bug fairly easily.
      
      For now, don't use the memtype_rb_search() and always start the search from
      the head of linear linked list in reserve_memtype(). Linear linked list
      for most of the systems grow's to few 10's of entries(as we track memory type
      of RAM pages using struct page). So we should be ok for now.
      
      We still retain the rbtree and use it to speed up free_memtype() which
      doesn't have the same bug(as we know what exactly we are searching for
      in free_memtype).
      
      Also use list_for_each_entry_from() in free_memtype() so that we start
      the search from rb-tree lookup result.
      Reported-by: default avatarMarkus Trippelsdorf <markus@trippelsdorf.de>
      Signed-off-by: default avatarSuresh Siddha <suresh.b.siddha@intel.com>
      Cc: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
      LKML-Reference: <1253136483.4119.12.camel@sbs-t61.sc.intel.com>
      Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
      dcb73bf4
    • John(Jung-Ik) Lee's avatar
      libata: Add pata_atp867x driver for Artop/Acard ATP867X controllers · d15d6e6c
      John(Jung-Ik) Lee authored
      This is a new pata driver for ARTOP 867X 64bit 4-channel UDMA133 ATA ctrls.
      Based on the Atp867 data sheet rev 1.2, Acard, and in part on early ide codes
      from Eric Uhrhane <ericu@google.com>.
      Signed-off-by: default avatarJohn(Jung-Ik) Lee <jilee@google.com>
      Reviewed-by: default avatarGrant Grundler <grundler@google.com>
      Reviewed-by: default avatarGwendal Gringo <gwendal@google.com>
      Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
      d15d6e6c
    • Robert Hancock's avatar
      pata_amd: do not filter out valid modes in nv_mode_filter · 90950a25
      Robert Hancock authored
      On a Compaq Presario V3000 laptop (NVIDIA MCP51 chipset), pata_amd selects
      PIO0 mode for the PATA DVD-RAM drive instead of MWDMA2 which it supports:
      
      ata4.00: ATAPI: HL-DT-ST DVDRAM GSA-4084N, KQ09, max MWDMA2
      ata4: nv_mode_filter: 0x39f&0x7001->0x1, BIOS=0x0 (0x0) ACPI=0x7001 (60:600:0x11)
      ata4.00: configured for PIO0
      
      For some reason, the BIOS-set UDMA configuration returns 0 and the ACPI _GTM
      reports that UDMA2 and PIO0 are enabled. This causes nv_mode_filter to end up
      allowing only PIO0 and UDMA0-2. Since the drive doesn't support UDMA we end up
      using PIO0.
      
      Since the controllers should always support PIO4, MWDMA2 and UDMA2 regardless
      of what cable type is used, let's make sure we don't filter out these modes
      regardless of what wacky settings the BIOS is using.
      Signed-off-by: default avatarRobert Hancock <hancockrwd@gmail.com>
      Cc: stable@kernel.org
      Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
      90950a25
    • Mikael Pettersson's avatar
      sata_promise: update reset code · ff7cddf5
      Mikael Pettersson authored
      sata_promise's reset code has deviated quite a bit from
      the Promise reference driver's, and it has been observed
      to fail to recover from errors in some cases.
      
      This patch thus updates the reset code to more closely
      match the reference driver:
      
      - soft reset (pdc_reset_port):
        * wait for ATA engine to not be in packet command mode
          (2nd gen only)
        * write reset bit in PDC_CTLSTAT before the first read
          in the loop
        * for 2nd gen SATA follow up with FPDMA reset and clearing
          error status registers
      - hard reset (pdc_sata_hardreset):
        * wait for ATA engine to not be in packet command mode
          (2nd gen only)
        * reset ATA engine via the PCI control register
        * Tejun's change to use non-waiting hardreset + follow-up SRST
      
      I'm not changing the hotplug mask bits since they are taken care
      of by sata_promise's ->freeze() and ->thaw() operations. And I'm
      not writing the PMP port # because that's always zero (for now).
      
      Tested here on various controllers. In particular, one disk
      which used to timeout and fail to recover from certain hdparm
      and smartmonctl commands now works nicely.
      Signed-off-by: default avatarMikael Pettersson <mikpe@it.uu.se>
      Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
      ff7cddf5
    • Mikael Pettersson's avatar
      sata_promise: disable hotplug on 1st gen chips · 0ae6654d
      Mikael Pettersson authored
      1st generation Promise SATA chips are prone to generating spurious
      hotplug events which can disrupt normal operation. This has been
      observed on 20376 and 20378 chips. This patch thus disables hotplug
      support on 1st gen chips while leaving it enabled for 2nd gen chips.
      
      The pdc_sata_hotplug_offset() function becomes redundant so it is
      removed.
      
      Tested on 1st gen 20376 and 20378 mainboard chips and on a 2nd gen
      SATA300 PCI card.
      Signed-off-by: default avatarMikael Pettersson <mikpe@it.uu.se>
      Tested-by: default avatarKurt Roeckx <kurt@roeckx.be>
      Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
      0ae6654d
    • Tejun Heo's avatar
      libata: fix spurious WARN_ON_ONCE() on port freeze · 4dc738ed
      Tejun Heo authored
      Commit 54c38444 makes libata abort qcs
      after the port is frozen.  This is necessary to guarantee that TF
      registers are accessed after the DMA engine is shutdown after an
      error.  However, this triggers WARN_ON_ONCE() check in
      ata_qc_complete() spuriously.  Move WARN_ON_ONCE() downwards such that
      failing commands while frozen doesn't trigger it.
      Signed-off-by: default avatarTejun Heo <tj@kernel.org>
      Cc: stable <stable@kernel.org>
      Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
      4dc738ed
    • Tejun Heo's avatar
      ahci: restore pci_intx() handling · 31b239ad
      Tejun Heo authored
      Commit a5bfc471 dropped explicit
      pci_intx() manipulation from ahci because it seemed unnecessary and
      ahci doesn't seem to be the right place to be tweaking it if it were.
      This was largely okay but there are exceptions.  There was one on an
      embedded platform which was fixed via firmware and now bko#14124
      reports it on a HP DL320.
      
        http://bugzilla.kernel.org/show_bug.cgi?id=14124
      
      I still think this isn't something libata drivers should be caring
      about (the only ones which are calling pci_intx() explicitly are
      libata ones and one other driver) but for now reverting the change
      seems to be the right thing to do.
      Signed-off-by: default avatarTejun Heo <tj@kernel.org>
      Reported-by: default avatarThomas Jarosch <thomas.jarosch@intra2net.com>
      Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
      31b239ad