1. 19 9月, 2009 13 次提交
    • R
      kref: double kref_put() in my_data_handler() · 8f1ecc9f
      Roel Kluin 提交于
      The kref_put() already occurs after the out label
      Signed-off-by: NRoel Kluin <roel.kluin@gmail.com>
      Signed-off-by: NRandy Dunlap <randy.dunlap@oracle.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      8f1ecc9f
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog · afa12e72
      Linus Torvalds 提交于
      * 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
    • L
      Merge branch 'for-linus' of git://gitserver.sunplusct.com/linux-2.6-score · 81ce31b7
      Linus Torvalds 提交于
      * '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
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 · 515b696b
      Linus Torvalds 提交于
      * 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
    • L
      Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 · fa877c71
      Linus Torvalds 提交于
      * '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
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse · 9eead2a8
      Linus Torvalds 提交于
      * '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
    • L
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6 · 6f130478
      Linus Torvalds 提交于
      * '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
    • L
      Merge branch 'davinci-for-linus' of... · 6f128fa3
      Linus Torvalds 提交于
      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
    • L
      Merge branch 'omap-for-linus' of... · 73c583e4
      Linus Torvalds 提交于
      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
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm · 5ce00289
      Linus Torvalds 提交于
      * '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
    • L
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6 · 2511817c
      Linus Torvalds 提交于
      * '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
    • L
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq · 714af069
      Linus Torvalds 提交于
      * '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
    • L
      Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · a03fdb76
      Linus Torvalds 提交于
      * '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
  2. 18 9月, 2009 27 次提交