1. 24 9月, 2009 15 次提交
    • R
      misc: remove redundant start_kernel prototypes · cf63ff5f
      Rusty Russell 提交于
      Impact: cleanup
      
      No need for redeclaration.
      Signed-off-by: NRusty Russell <rusty@rustcorp.com.au>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NDavid Howells <dhowells@redhat.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      cf63ff5f
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6 · fd8b327e
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6: (41 commits)
        regulator: Add some brief design documentation
        regulator: fix voltage range in da9034 ldo12
        regulator/driver: be more specific in nanodoc for is_enabled
        regulator/lp3971: drop unnecessary initialization
        regulator: drop 'default n'
        regulator: fix typos
        regulator: fix calculation of voltage range in da9034_set_ldo12_voltage()
        regulator: update a filename in documentation
        drivers/regulator/Kconfig: fix typo (s/Usersapce/Userspace/) in REGULATOR_USERSPACE_CONSUMER description
        REGULATOR Handle positive returncode from enable
        regulator: tps650xx - build fixes for x86_64
        Fix some regulator documentation
        Regulator: Adding TPS65023 and TPS6507x in Kconfig and Makefile
        Regulator: Add TPS6507x regulator driver
        Regulator: Add TPS65023 regulator driver
        regulator: userspace: use sysfs_create_group
        regulator: Add GPIO enable control to fixed voltage regulator driver
        Regulator: Implement list_voltage for pcf50633 regulator driver.
        regulator: regulator_enable() permission checking
        regulator: Push locking for regulator_is_enabled() out
        ...
      fd8b327e
    • L
      Merge branch 'fix/misc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 · 0c9af280
      Linus Torvalds 提交于
      * 'fix/misc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
        ALSA: lx6464es - remove unused struct member
        ALSA: lx6464es - cleanup of rmh message bus function
        ALSA: pcm - Simplify snd_pcm_drain() implementation
      0c9af280
    • L
      Merge branch 'fix/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 · fe61c99a
      Linus Torvalds 提交于
      * 'fix/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
        ASoC: wm8753: fix mapping when MONOMIX is set to Stereo
        ASoC: some minor changes for AD1836 and AD1938 codec drivers
        ASoC: DaVinci: Fixes to McASP configuration
        ASoC: Blackfin I2S: fix resuming when device hasn't been used
        ASoC: Blackfin I2S: add lost platform_device parameter to resume function
        ASoC: fix typos in Blackfin headers
        ASoC: bf5xx-sport: the irq save/restore funcs take an unsigned long
        ASoC: Blackfin AC97: add a few missing multichannel define handling
      fe61c99a
    • L
      Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 · 9fd815b5
      Linus Torvalds 提交于
      * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: (22 commits)
        [S390] Update default configuration.
        [S390] hibernate: Do real CPU swap at resume time
        [S390] dasd: tolerate devices that have no feature codes
        [S390] zcrypt: Do not add/remove devices in s/r callbacks
        [S390] hibernate: make sure pfn_is_nosave handles lowcore pages
        [S390] smp: introduce LC_ORDER and simplify lowcore handling
        [S390] ptrace: use common code for simple peek/poke operations
        [S390] fix disabled_wait inline assembly clobber list
        [S390] Change kernel_page_present coding style.
        [S390] hibernation: reset system after resume
        [S390] hibernation: fix guest page hinting related crash
        [S390] Get rid of init_module/delete_module compat functions.
        [S390] Convert sys_execve to function with parameters.
        [S390] Convert sys_clone to function with parameters.
        [S390] qdio: change state of all primed input buffers
        [S390] qdio: reduce per device debug messages
        [S390] cio: introduce consistent subchannel scanning
        [S390] cio: idset use actual number of ssids
        [S390] cio: dont kfree vmalloced memory
        [S390] cio: introduce css_settle
        ...
      9fd815b5
    • L
      Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · 31bbb9b5
      Linus Torvalds 提交于
      * 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        itimers: Add tracepoints for itimer
        hrtimer: Add tracepoint for hrtimers
        timers: Add tracepoints for timer_list timers
        cputime: Optimize jiffies_to_cputime(1)
        itimers: Simplify arm_timer() code a bit
        itimers: Fix periodic tics precision
        itimers: Merge ITIMER_VIRT and ITIMER_PROF
      
      Trivial header file include conflicts in kernel/fork.c
      31bbb9b5
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 · ff830b8e
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
        ieee1394: sbp2: remove a workaround for Momobay FX-3A
        firewire: sbp2: remove a workaround for Momobay FX-3A
        firewire: sbp2: fix status reception
        firewire: core: fix topology map response handler
        firewire: core: fix race with parallel PCI device probe
        firewire: core: header file cleanup
        firewire: ohci: fix Self ID Count register mask (safeguard against buffer overflow)
        ieee1394: raw1394: Do not leak memory on failed trylock.
      ff830b8e
    • L
      Merge branch 'sfi-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6 · 746942d0
      Linus Torvalds 提交于
      * 'sfi-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6:
        SFI: remove unneeded includes
        sfi: Remove unused code
        SFI: Hook PCI MMCONFIG
        x86: add arch-specific SFI support
        SFI: add capability to parse ACPI tables
        SFI: add platform-independent core support
        SFI: create linux/sfi.h
        SFI: Simple Firmware Interface - MAINTAINERS, Kconfig
      746942d0
    • L
      Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 · c11f6c82
      Linus Torvalds 提交于
      * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (119 commits)
        ACPI: don't pass handle for fixed hardware notifications
        ACPI: remove null pointer checks in deferred execution path
        ACPI: simplify deferred execution path
        acerhdf: additional BIOS versions
        acerhdf: convert to dev_pm_ops
        acerhdf: fix fan control for AOA150 model
        thermal: add missing Kconfig dependency
        acpi: switch /proc/acpi/{debug_layer,debug_level} to seq_file
        hp-wmi: fix rfkill memory leak on unload
        ACPI: remove unnecessary #ifdef CONFIG_DMI
        ACPI: linux/acpi.h should not include linux/dmi.h
        hwmon driver for ACPI 4.0 power meters
        topstar-laptop: add new driver for hotkeys support on Topstar N01
        thinkpad_acpi: fix rfkill memory leak on unload
        thinkpad-acpi: report brightness events when required
        thinkpad-acpi: don't poll by default any of the reserved hotkeys
        thinkpad-acpi: Fix procfs hotkey reset command
        thinkpad-acpi: deprecate hotkey_bios_mask
        thinkpad-acpi: hotkey poll fixes
        thinkpad-acpi: be more strict when detecting a ThinkPad
        ...
      c11f6c82
    • L
      Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging · 40aba218
      Linus Torvalds 提交于
      * 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
        i2c: Clearly mark ACPI drivers as such
        i2c: Add driver for SMBus Control Method Interface
        i2c-pnx: Correct use of request_region/request_mem_region
        MAINTAINERS: Add maintainer for AT24 and PCA9564/PCA9665
        i2c-piix4: Add AMD SB900 SMBus device ID
        i2c/chips: Remove deprecated pcf8574 driver
        i2c/chips: Remove deprecated pca9539 driver
        i2c/chips: Remove deprecated pcf8575 driver
        gpio/pcf857x: Copy i2c_device_id from old pcf8574 driver
        i2c/scx200_acb: Provide more information on bus errors
        i2c: Provide compatibility links for i2c adapters
        i2c: Convert i2c adapters to bus devices
        i2c: Convert i2c clients to a device type
        i2c/tsl2550: Use combined SMBus transactions
        i2c-taos-evm: Switch echo off to improve performance
        i2c: Drop unused i2c_driver.id field
      40aba218
    • L
      Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2 · b64ada6b
      Linus Torvalds 提交于
      * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2: (85 commits)
        ocfs2: Use buffer IO if we are appending a file.
        ocfs2: add spinlock protection when dealing with lockres->purge.
        dlmglue.c: add missed mlog lines
        ocfs2: __ocfs2_abort() should not enable panic for local mounts
        ocfs2: Add ioctl for reflink.
        ocfs2: Enable refcount tree support.
        ocfs2: Implement ocfs2_reflink.
        ocfs2: Add preserve to reflink.
        ocfs2: Create reflinked file in orphan dir.
        ocfs2: Use proper parameter for some inode operation.
        ocfs2: Make transaction extend more efficient.
        ocfs2: Don't merge in 1st refcount ops of reflink.
        ocfs2: Modify removing xattr process for refcount.
        ocfs2: Add reflink support for xattr.
        ocfs2: Create an xattr indexed block if needed.
        ocfs2: Call refcount tree remove process properly.
        ocfs2: Attach xattr clusters to refcount tree.
        ocfs2: Abstract ocfs2 xattr tree extend rec iteration process.
        ocfs2: Abstract the creation of xattr block.
        ocfs2: Remove inode from ocfs2_xattr_bucket_get_name_value.
        ...
      b64ada6b
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 · be90a49c
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (142 commits)
        USB: Fix sysfs paths in documentation
        USB: skeleton: fix coding style issues.
        USB: O_NONBLOCK in read path of skeleton
        USB: make usb-skeleton honor O_NONBLOCK in write path
        USB: skel_read really sucks royally
        USB: Add hub descriptor update hook for xHCI
        USB: xhci: Support USB hubs.
        USB: xhci: Set multi-TT field for LS/FS devices under hubs.
        USB: xhci: Set route string for all devices.
        USB: xhci: Fix command wait list handling.
        USB: xhci: Change how xHCI commands are handled.
        USB: xhci: Refactor input device context setup.
        USB: xhci: Endpoint representation refactoring.
        USB: gadget: ether needs to select CRC32
        USB: fix USBTMC get_capabilities success handling
        USB: fix missing error check in probing
        USB: usbfs: add USBDEVFS_URB_BULK_CONTINUATION flag
        USB: support for autosuspend in sierra while online
        USB: ehci-dbgp,ehci: Allow dbpg to work with suspend/resume
        USB: ehci-dbgp,documentation: Documentation updates for ehci-dbgp
        ...
      be90a49c
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus · 1f0918d0
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
        lguest: don't force VIRTIO_F_NOTIFY_ON_EMPTY
        lguest: cleanup for map_switcher()
        lguest: use PGDIR_SHIFT for PAE code to allow different PAGE_OFFSET
        lguest: use set_pte/set_pmd uniformly for real page table entries
        lguest: move panic notifier registration to its expected place.
        virtio_blk: add support for cache flush
        virtio: add virtio IDs file
        virtio: get rid of redundant VIRTIO_ID_9P definition
        virtio: make add_buf return capacity remaining
        virtio_pci: minor MSI-X cleanups
      1f0918d0
    • H
      nommu: fix two build breakages · 4266c97a
      Hugh Dickins 提交于
      My 58fa879e "mm: FOLL flags for GUP flags"
      broke CONFIG_NOMMU build by forgetting to update nommu.c foll_flags type:
      
        mm/nommu.c:171: error: conflicting types for `__get_user_pages'
        mm/internal.h:254: error: previous declaration of `__get_user_pages' was here
        make[1]: *** [mm/nommu.o] Error 1
      
      My 03f6462a "mm: move highest_memmap_pfn"
      broke CONFIG_NOMMU build by forgetting to add a nommu.c highest_memmap_pfn:
      
        mm/built-in.o: In function `memmap_init_zone':
        (.meminit.text+0x326): undefined reference to `highest_memmap_pfn'
        mm/built-in.o: In function `memmap_init_zone':
        (.meminit.text+0x32d): undefined reference to `highest_memmap_pfn'
      
      Fix both breakages, and give myself 30 lashes (ouch!)
      Reported-by: NMichal Simek <michal.simek@petalogix.com>
      Signed-off-by: NHugh Dickins <hugh.dickins@tiscali.co.uk>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      4266c97a
    • H
      fs: change sys_truncate length parameter type · 4fd8da8d
      Heiko Carstens 提交于
      For this system call user space passes a signed long length parameter,
      while the kernel side takes an unsigned long parameter and converts it
      later to signed long again.
      
      This has led to bugs in compat wrappers see e.g.  dd90bbd5 "powerpc: Add
      compat_sys_truncate".  The s390 compat wrapper for this functions is
      broken as well since it also performs zero extension instead of sign
      extension for the length parameter.
      
      In addition if hpa comes up with an automated way of generating
      compat wrappers it would generate a wrong one here.
      
      So change the length parameter from unsigned long to long.
      
      Cc: "H. Peter Anvin" <hpa@zytor.com>
      Cc: Al Viro <viro@zeniv.linux.org.uk>
      Cc: Christoph Hellwig <hch@lst.de>
      Signed-off-by: NHeiko Carstens <heiko.carstens@de.ibm.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      4fd8da8d
  2. 23 9月, 2009 25 次提交