1. 28 2月, 2010 13 次提交
  2. 27 2月, 2010 27 次提交
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6 · 06a79b82
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
        PM / Hibernate: Fix preallocating of memory
        PM / Hibernate: Remove swsusp.c finally
        PM / Hibernate: Remove trailing space in message
        PM: Allow SCSI devices to suspend/resume asynchronously
        PM: Allow USB devices to suspend/resume asynchronously
        USB: implement non-tree resume ordering constraints for PCI host controllers
        PM: Allow PCI devices to suspend/resume asynchronously
        PM / Hibernate: Swap, remove useless check from swsusp_read()
        PM / Hibernate: Really deprecate deprecated user ioctls
        PM: Allow device drivers to use dpm_wait()
        PM: Start asynchronous resume threads upfront
        PM: Add facility for advanced testing of async suspend/resume
        PM: Add a switch for disabling/enabling asynchronous suspend/resume
        PM: Asynchronous suspend and resume of devices
        PM: Add parent information to timing messages
        PM: Document device power attributes in sysfs
        PM / Runtime: Add sysfs switch for disabling device run-time PM
      06a79b82
    • C
      Remove EXPERIMENTAL from NFS_FSCACHE · 4912002f
      Christian Kujau 提交于
      There's currently an open Ubuntu bug[0], with the intent to compile NFS_FSCACHE
      (and possibly AFS_FSCACHE, 9P_FSCACHE) into the standard Ubuntu kernel.
      However, since *_FSCACHE still depends on EXPERIMENTAL, this won't happen.
      
      As Arjan van de Ven pointed out[1], the EXPERIMENTAL flag doesn't mean that
      much any more, I propose the following patch to fs/nfs/Kconfig.  I'd do the
      same for fs/9p/Kconfig and fs/afs/Kconfig, but as I did not test 9p or AFS, I
      feel it would not be appropriate for me to remove the flag.
      
      [0] https://bugs.launchpad.net/ubuntu/+source/linux/+bug/440522/comments/5
      [1] http://lkml.org/lkml/2010/1/23/145Signed-off-by: NChristian Kujau <lists@nerdbynature.de>
      Signed-off-by: NDavid Howells <dhowells@redhat.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      4912002f
    • L
      Merge branch 'for_linus' of... · 98723153
      Linus Torvalds 提交于
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86
      
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86:
        toshiba_acpi: Add full hotkey support
        hp-wmi: Add support for tablet rotation key
        dell-laptop: Add another Dell laptop to the DMI whitelist
        classmate-laptop: use a single MODULE_DEVICE_TABLE to get correct aliases
        dell-laptop: Pay attention to which devices the hardware switch controls
        dell-laptop: Use buffer with 32-bit physical address
        dell-laptop: Blacklist machines not supporting dell-laptop
        dell-laptop: Block software state changes when rfkill hard blocked
        dell-laptop: Fix small memory leak
        dell-laptop: Fix platform device unregistration
        dell-laptop: Update rfkill state on kill switch
        compal-laptop: Replace sysfs support with rfkill support
        compal-laptop: Add support for known Compal made Dell laptops
        MAINTAINERS: update drivers/platform/x86 information
      98723153
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm · 4cbd5518
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm:
        dlm: use bastmode in debugfs output
        dlm: Send lockspace name with uevents
        dlm: send reply before bast
        dlm: fix ordering of bast and cast
      4cbd5518
    • L
      Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs · b305956a
      Linus Torvalds 提交于
      * 'for-linus' of git://oss.sgi.com/xfs/xfs: (52 commits)
        fs/xfs: Correct NULL test
        xfs: optimize log flushing in xfs_fsync
        xfs: only clear the suid bit once in xfs_write
        xfs: kill xfs_bawrite
        xfs: log changed inodes instead of writing them synchronously
        xfs: remove invalid barrier optimization from xfs_fsync
        xfs: kill the unused XFS_QMOPT_* flush flags V2
        xfs: Use delay write promotion for dquot flushing
        xfs: Sort delayed write buffers before dispatch
        xfs: Don't issue buffer IO direct from AIL push V2
        xfs: Use delayed write for inodes rather than async V2
        xfs: Make inode reclaim states explicit
        xfs: more reserved blocks fixups
        xfs: turn off sign warnings
        xfs: don't hold onto reserved blocks on remount,ro
        xfs: quota limit statvfs available blocks
        xfs: replace KM_LARGE with explicit vmalloc use
        xfs: cleanup up xfs_log_force calling conventions
        xfs: kill XLOG_VEC_SET_TYPE
        xfs: remove duplicate buffer flags
        ...
      b305956a
    • L
      Merge branch 'ibft-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft-2.6 · 41630959
      Linus Torvalds 提交于
      * 'ibft-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft-2.6:
        ibft: Update MAINTAINERS file.
        drivers/firmware/iscsi_ibft.c: remove NIPQUAD_FMT, use %pI4
      41630959
    • L
      Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 · 2b8c70b2
      Linus Torvalds 提交于
      * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (362 commits)
        V4L-DVB: cx88-dvb: remove extra attribution for core
        V4L/DVB: v4l: soc_camera: fix bound checking of mbus_fmt[] index
        V4L/DVB: Add support for SMT7020 to cx88
        V4L/DVB: radio-si470x: Use UTF-8 encoding on a comment
        V4L/DVB: MAINTAINERS: Telegent tlg2300 section fix
        V4L/DVB: gspca_stv06xx: Add support for camera button
        V4L/DVB: gspca_ov519: add support for the button on ov511 based cams
        V4L/DVB: gspca_ov519: Add support for the button on ov518 based cams
        V4L/DVB: gspca_ov519: add support for the button on ov519 based cams
        V4L/DVB: gspca_main: Fix a compile error when CONFIG_INPUT is not set
        V4L/DVB: gspca_main: some input error handling fixes
        V4L/DVB: gspca_main: Allow use of input device creation code for non int. inputs
        V4L/DVB: gspca_pac7302: much improved exposure control
        V4L/DVB: gspca_sonixb: Make sonixb driver handle pas106 and pas202 cameras
        V4L/DVB: gspca_sonixb: pas106: fixup bright ctrl and add gain and exposure ctrls
        V4L/DVB: Documentation: gspca.txt: update known mr97310a cams
        V4L/DVB: gspca_mr97310a: add support for the Sakar 1638x CyberPix
        V4L/DVB: gscpa_sonixb: limit ov7630 max framerate at 640x480
        V4L/DVB: gspca_sonixb: pas202: fixup brightness ctrl and add gain and exposure ctrls
        V4L/DVB: gscpa_sonixb: Differentiate between sensors with a coarse and fine expo ctrl
        ...
      2b8c70b2
    • A
      dvb-core: Fix DoS bug in ULE decapsulation code that can be triggered by an invalid Payload Pointer · 29e1fa35
      Ang Way Chuang 提交于
      ULE (Unidirectional Lightweight Encapsulation RFC 4326) decapsulation
      has a bug that causes endless loop when Payload Pointer of MPEG2-TS
      frame is 182 or 183.  Anyone who sends malicious MPEG2-TS frame will
      cause the receiver of ULE SNDU to go into endless loop.
      
      This patch was generated and tested against linux-2.6.32.9 and should
      apply cleanly to linux-2.6.33 as well because there was only one typo
      fix to dvb_net.c since v2.6.32.
      
      This bug was brought to you by modern day Santa Claus who decided to
      shower the satellite dish at Keio University with heavy snow causing
      huge burst of errors.  We, receiver end, received Santa Claus's gift in
      the form of kernel bug.
      
      Care has been taken not to introduce more bug by fixing this bug, but
      please scrutinize the code for I always produces buggy code.
      Signed-off-by: NAng Way Chuang <wcang79@gmail.com>
      Acked-by: NMauro Carvalho Chehab <mchehab@redhat.com>
      Cc: stable@kernel.org
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      29e1fa35
    • L
      Merge branch 'kmemcheck-for-linus' of... · 2594a57a
      Linus Torvalds 提交于
      Merge branch 'kmemcheck-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6
      
      * 'kmemcheck-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
        kmemcheck: Test the full object in kmemcheck_is_obj_initialized()
      2594a57a
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/xfs-vipt · f24407d2
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/xfs-vipt:
        xfs: fix xfs to work with Virtually Indexed architectures
        sh: add mm API for DMA to vmalloc/vmap areas
        arm: add mm API for DMA to vmalloc/vmap areas
        parisc: add mm API for DMA to vmalloc/vmap areas
        mm: add coherence API for DMA to vmalloc/vmap areas
      f24407d2
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 · 65445174
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (158 commits)
        [SCSI] Fix printing of failed 32-byte commands
        [SCSI] Fix printing of variable length commands
        [SCSI] libsrp: fix bug in ADDITIONAL CDB LENGTH interpretation
        [SCSI] scsi_dh_alua: Add IBM Power Virtual SCSI ALUA device to dev list
        [SCSI] scsi_dh_alua: add netapp to dev list
        [SCSI] qla2xxx: Update version number to 8.03.02-k1.
        [SCSI] qla2xxx: EEH: Restore PCI saved state during pci slot reset.
        [SCSI] qla2xxx: Add firmware ETS burst support.
        [SCSI] qla2xxx: Correct loop-resync issues during SNS scans.
        [SCSI] qla2xxx: Correct use-after-free issue in terminate_rport_io callback.
        [SCSI] qla2xxx: Correct EH bus-reset handling.
        [SCSI] qla2xxx: Proper clean-up of BSG requests when request times out.
        [SCSI] qla2xxx: Initialize payload receive length in failure path of vendor commands
        [SCSI] fix duplicate removal on error path in scsi_sysfs_add_sdev
        [SCSI] fix refcounting bug in scsi_get_host_dev
        [SCSI] fix memory leak in scsi_report_lun_scan
        [SCSI] lpfc: correct PPC build failure
        [SCSI] raid_class: add raid1e
        [SCSI] mpt2sas: Do not call sas_is_tlr_enabled for RAID volumes.
        [SCSI] zfcp: Introduce header file for qdio structs and inline functions
        ...
      65445174
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 · 64d497f5
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (187 commits)
        sh: remove dead LED code for migo-r and ms7724se
        sh: ecovec build fix for CONFIG_I2C=n
        sh: ecovec r-standby support
        sh: ms7724se r-standby support
        sh: SH-Mobile R-standby register save/restore
        clocksource: Fix up a registration/IRQ race in the sh drivers.
        sh: ms7724: modify scan_timing for KEYSC
        sh: ms7724: Add sh_sir support
        sh: mach-ecovec24: Add sh_sir support
        sh: wire up SET/GET_UNALIGN_CTL.
        sh: allow alignment fault mode to be configured at kernel boot.
        sh: sh7724: Update FSI/SPU2 clock
        sh: always enable sh7724 vpu_clk and set to 166MHz on Ecovec
        sh: add sh7724 kick callback to clk_div4_table
        sh: introduce struct clk_div4_table
        sh: clock-cpg div4 set_rate() shift fix
        sh: Turn on speculative return for SH7785 and SH7786
        sh: Merge legacy and dynamic PMB modes.
        sh: Use uncached I/O helpers in PMB setup.
        sh: Provide uncached I/O helpers.
        ...
      64d497f5
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · 37d40084
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (31 commits)
        crypto: aes_generic - Fix checkpatch errors
        crypto: fcrypt - Fix checkpatch errors
        crypto: ecb - Fix checkpatch errors
        crypto: des_generic - Fix checkpatch errors
        crypto: deflate - Fix checkpatch errors
        crypto: crypto_null - Fix checkpatch errors
        crypto: cipher - Fix checkpatch errors
        crypto: crc32 - Fix checkpatch errors
        crypto: compress - Fix checkpatch errors
        crypto: cast6 - Fix checkpatch errors
        crypto: cast5 - Fix checkpatch errors
        crypto: camellia - Fix checkpatch errors
        crypto: authenc - Fix checkpatch errors
        crypto: api - Fix checkpatch errors
        crypto: anubis - Fix checkpatch errors
        crypto: algapi - Fix checkpatch errors
        crypto: blowfish - Fix checkpatch errors
        crypto: aead - Fix checkpatch errors
        crypto: ablkcipher - Fix checkpatch errors
        crypto: pcrypt - call the complete function on error
        ...
      37d40084
    • K
      ibft: Update MAINTAINERS file. · c4d1409b
      Konrad Rzeszutek Wilk 提交于
      Provide the right e-mail and names for me and Peter.
      Signed-off-by: NKonrad Rzeszutek Wilk <konrad@kernel.org>
      c4d1409b
    • J
      drivers/firmware/iscsi_ibft.c: remove NIPQUAD_FMT, use %pI4 · 00e7825b
      Joe Perches 提交于
      Convert netmask to __be32 and format it with %pI4
      Signed-off-by: NJoe Perches <joe@perches.com>
      Signed-off-by: NKonrad Rzeszutek <ketuzsezr@darnok.org>
      Reviewed-by: NMike Christie <michaelc@cs.wisc.edu>
      Cc: Peter Jones <pjones@redhat.com>
      Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      00e7825b
    • A
      Merge branch 'linux-2.6.33' · 398007f8
      Alex Elder 提交于
      398007f8
    • R
      PM / Hibernate: Fix preallocating of memory · a9c9b442
      Rafael J. Wysocki 提交于
      The hibernate memory preallocation code allocates memory to push some
      user space data out of physical RAM, so that the hibernation image is
      not too large.  It allocates more memory than necessary for creating
      the image, so it has to release some pages to make room for
      allocations made while suspending devices and disabling nonboot CPUs,
      or the system will hang due to the lack of free pages to allocate
      from.  Unfortunately, the function used for freeing these pages,
      free_unnecessary_pages(), contains a bug that prevents it from doing
      the job on all systems without highmem.
      
      Fix this problem, which is a regression from the 2.6.30 kernel, by
      using the right condition for the termination of the loop in
      free_unnecessary_pages().
      Signed-off-by: NRafael J. Wysocki <rjw@sisk.pl>
      Reported-and-tested-by: NAlan Jenkins <sourcejedi.lkml@googlemail.com>
      Cc: stable@kernel.org
      a9c9b442
    • J
      PM / Hibernate: Remove swsusp.c finally · f8bb0db8
      Jiri Slaby 提交于
      Its contents and entry in Makefile were already removed in
      8e60c6a1
      (Shift remaining code from swsusp.c to hibernate.c)
      but somehow it remained in-place (rjw: which most likely was my
      mistake).
      Signed-off-by: NJiri Slaby <jslaby@suse.cz>
      Acked-by: NNigel Cunningham <nigel@tuxonice.net>
      Signed-off-by: NRafael J. Wysocki <rjw@sisk.pl>
      f8bb0db8
    • F
      PM / Hibernate: Remove trailing space in message · 07c3bb57
      Frans Pop 提交于
      Remove a trailing space from a message in swsusp_save().
      Signed-off-by: NFrans Pop <elendil@planet.nl>
      Acked-by: NPavel Machek <pavel@ucw.cz>
      Signed-off-by: NRafael J. Wysocki <rjw@sisk.pl>
      07c3bb57
    • R
      PM: Allow SCSI devices to suspend/resume asynchronously · 4cb077d9
      Rafael J. Wysocki 提交于
      Set power.async_suspend for all SCSI devices, targets and hosts, so
      that they can be suspended and resumed in parallel with the main
      suspend/resume thread and possibly with other devices they don't
      depend on in a known way (i.e. devices which are not their parents or
      children).
      
      The power.async_suspend flag is also set for devices that don't have
      suspend or resume callbacks, because otherwise they would make the
      main suspend/resume thread wait for their "asynchronous" children
      (during suspend) or parents (during resume), effectively negating the
      possible gains from executing these devices' suspend and resume
      callbacks asynchronously.
      Signed-off-by: NRafael J. Wysocki <rjw@sisk.pl>
      4cb077d9
    • R
      PM: Allow USB devices to suspend/resume asynchronously · 927bc916
      Rafael J. Wysocki 提交于
      Set power.async_suspend for USB devices, endpoints and interfaces,
      allowing them to be suspended and resumed asynchronously during
      system sleep transitions.
      
      The power.async_suspend flag is also set for devices that don't have
      suspend or resume callbacks, because otherwise they would make the
      main suspend/resume thread wait for their "asynchronous" children
      (during suspend) or parents (during resume), effectively negating the
      possible gains from executing these devices' suspend and resume
      callbacks asynchronously.
      Signed-off-by: NRafael J. Wysocki <rjw@sisk.pl>
      927bc916
    • A
      USB: implement non-tree resume ordering constraints for PCI host controllers · 6d19c009
      Alan Stern 提交于
      This patch (as1331) adds non-tree ordering constraints needed for
      proper resume of PCI USB host controllers from hibernation.  The main
      issue is that non-high-speed devices must not be resumed before the
      high-speed root hub, because it is the ehci_bus_resume() routine which
      takes care of handing the device connection over to the companion
      controller.  If the device resume is attempted before the handover
      then the device won't be found and it will be treated as though it had
      disconnected.
      
      The patch adds a new field to the usb_bus structure; for each
      full/low-speed bus this field will contain a pointer to the companion
      high-speed bus (if one exists).  It is used during normal device
      resume; if the hs_companion pointer isn't NULL then we wait for the
      root-hub device on the hs_companion bus.
      
      A secondary issue is that an EHCI controlller shouldn't be resumed
      before any of its companions.  On some machines I have observed
      handovers failing if the companion controller is reinitialized after
      the handover.  Thus, the EHCI resume routine must wait for the
      companion controllers to be resumed.
      
      The patch also fixes a small bug in usb_hcd_pci_probe(); an error path
      jumps to the wrong label, causing a memory leak.
      
      [rjw: Fixed compilation for CONFIG_PM_SLEEP unset.]
      Signed-off-by: NAlan Stern <stern@rowland.harvard.edu>
      Acked-by: NGreg Kroah-Hartman <gregkh@suse.de>
      Signed-off-by: NRafael J. Wysocki <rjw@sisk.pl>
      6d19c009
    • R
      PM: Allow PCI devices to suspend/resume asynchronously · a1e4d72c
      Rafael J. Wysocki 提交于
      Set power.async_suspend for all PCI devices and PCIe port services,
      so that they can be suspended and resumed in parallel with other
      devices they don't depend on in a known way (i.e. devices which are
      not their parents or children).
      
      This only affects the "regular" suspend and resume stages, which
      means in particular that the restoration of the PCI devices' standard
      configuration registers during resume will still be carried out
      synchronously (at the "early" resume stage).
      Signed-off-by: NRafael J. Wysocki <rjw@sisk.pl>
      a1e4d72c
    • J
      PM / Hibernate: Swap, remove useless check from swsusp_read() · 09c09bc6
      Jiri Slaby 提交于
      It will never reach here if the sws_resume_bdev is erratic.
      swsusp_read() is called only from software_resume(), but after
      swsusp_check() which would catch the error state.
      Signed-off-by: NJiri Slaby <jslaby@suse.cz>
      Signed-off-by: NRafael J. Wysocki <rjw@sisk.pl>
      09c09bc6
    • J
      PM / Hibernate: Really deprecate deprecated user ioctls · b694e52e
      Jiri Slaby 提交于
      They were deprecated and removed from exported headers more than 2
      years ago. Inform users about their removal in the future now.
      
      (Switch cases needed to be reorderded for an easy fall through.)
      
      And add an entry to feature-removal-schedule.
      Signed-off-by: NJiri Slaby <jslaby@suse.cz>
      Acked-by: NPavel Machek <pavel@ucw.cz>
      Signed-off-by: NRafael J. Wysocki <rjw@sisk.pl>
      b694e52e
    • R
      PM: Allow device drivers to use dpm_wait() · f8824cee
      Rafael J. Wysocki 提交于
      There are some dependencies between devices (in particular, between
      EHCI USB controllers and their OHCI/UHCI siblings) which are not
      reflected by the structure of the device tree.  With synchronous
      suspend and resume these dependencies are taken into accout
      automatically, because the devices in question are always registered
      in the right order, but to meet these constraints with asynchronous
      suspend and resume the drivers of these devices will need to use
      dpm_wait() in their suspend/resume routines, so introduce a helper
      function allowing them to do that.
      Signed-off-by: NRafael J. Wysocki <rjw@sisk.pl>
      f8824cee
    • R
      PM: Start asynchronous resume threads upfront · 97df8c12
      Rafael J. Wysocki 提交于
      It has been shown by testing that total device resume time can be
      reduced significantly (by as much as 50% or more) if the async
      threads executing some devices' resume routines are all started
      before the main resume thread starts to handle the "synchronous"
      devices.
      
      This is a consequence of the fact that the slowest devices tend to be
      located at the end of dpm_list, so their resume routines are started
      very late.  Consequently, they have to wait for all the preceding
      "synchronous" devices before their resume routines can be started
      by the main resume thread, even if they are "asynchronous".  By
      starting their async threads upfront we effectively move those
      devices towards the beginning of dpm_list, without breaking their
      ordering with respect to their parents and children.  As a result,
      their resume routines are started much earlier and we are able to
      save much more device resume time this way.
      Signed-off-by: NRafael J. Wysocki <rjw@sisk.pl>
      97df8c12