03 May, 2007

27 commits


01 May, 2007

11 commits

  • The Marvell IDE interface on my machine would hit a BUG_ON() in
    lib/iomem.c because it was calling ata_pci_init_one() specifying just a
    single port on the host, but that would actually end up trying to
    initialize two ports, the second one with bogus information.

    This fixes "ata_pci_init_one()" so that it actually passes down the
    n_ports variable that it got from the low-level driver to the host
    allocation routine ("ata_host_alloc_pinfo()"), which results in the ATA
    layer actually having the correct port number information.

    And in order to make it all work, I also needed to fix a few places that
    had incorrectly hard-coded the fact that a host always had exactly two
    ports (both ata_pci_init_bmdma() and ata_request_legacy_irqs() would
    just always iterate over both ports).

    Acked-by: Jeff Garzik
    Signed-off-by: Linus Torvalds

    Linus Torvalds
     
  • For backwards compatibility, call_platform_enable_wakeup() can return 0
    instead of -EIO since we aren't guaranteed to have errno defined.

    Cc: David Brownell
    Signed-off-by: David Rientjes
    Cc: "Randy.Dunlap"
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    David Rientjes
     
  • Add a kvasprintf() function to complement kasprintf().

    No in-tree users yet, but I have some coming up.

    [akpm@linux-foundation.org: EXPORT it]
    Signed-off-by: Jeremy Fitzhardinge
    Cc: Andrew Morton
    Cc: Keir Fraser
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jeremy Fitzhardinge
     
  • This patch changes the docs and behaviour from "all states valid" to "no
    states valid" if no .valid callback is assigned. Users of pm_ops that only
    need mem sleep can assign pm_valid_only_mem without any overhead, others
    will require more elaborate callbacks.

    Now that all users of pm_ops have a .valid callback this is a safe thing to
    do and prevents things from getting messy again as they were before.

    Signed-off-by: Johannes Berg
    Acked-by: Pavel Machek
    Looks-okay-to: Rafael J. Wysocki
    Cc:
    Cc: Greg KH
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Johannes Berg
     
  • Almost all users of pm_ops only support mem sleep, don't check in .valid and
    don't reject any others in .prepare so users can be confused if they check
    /sys/power/state, especially when new states are added (these would then
    result in s-t-r although they're supposed to be something different).

    This patch implements a generic pm_valid_only_mem function that is then
    exported for users and puts it to use in almost all existing pm_ops.

    Signed-off-by: Johannes Berg
    Cc: David Brownell
    Acked-by: Pavel Machek
    Cc: linux-pm@lists.linux-foundation.org
    Cc: Len Brown
    Acked-by: Russell King
    Cc: Greg KH
    Cc: "Rafael J. Wysocki"
    Cc: Paul Mundt
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Johannes Berg
     
  • This patch removes the firmware disk suspend mode which is the wrong approach,
    it is supposed to be used for implementing firmware-based disk suspend but
    cannot actually be used for that.

    Signed-off-by: Johannes Berg
    Acked-by: Pavel Machek
    Cc:
    Cc: David Brownell
    Cc: Len Brown
    Acked-by: Russell King
    Cc: Greg KH
    Cc: "Rafael J. Wysocki"
    Cc: Paul Mundt
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Johannes Berg
     
  • This patch series cleans up some misconceptions about pm_ops. Some users of
    the pm_ops structure attempt to use it to stop the user from entering suspend
    to disk, this, however, is not possible since the user can always use
    "shutdown" in /sys/power/disk and then the pm_ops are never invoked. Also,
    platforms that don't support suspend to disk simply should not allow
    configuring SOFTWARE_SUSPEND (read the help text on it, it only selects
    suspend to disk and nothing else, all the other stuff depends on PM).

    The pm_ops structure is actually intended to provide a way to enter
    platform-defined sleep states (currently supported states are "standby" and
    "mem" (suspend to ram)) and additionally (if SOFTWARE_SUSPEND is configured)
    allows a platform to support a platform specific way to enter low-power mode
    once everything has been saved to disk. This is currently only used by ACPI
    (S4).

    This patch:

    The pm_ops.pm_disk_mode is used in totally bogus ways since nobody really
    seems to understand what it actually does.

    This patch clarifies the pm_disk_mode description.

    It also removes all the arm and sh users that think they can veto suspend to
    disk via pm_ops; not so since the user can always do echo shutdown >
    /sys/power/disk, they need to find a better way involving Kconfig or such.

    ACPI is the only user left with a non-zero pm_disk_mode.

    The patch also sets the default mode to shutdown again, but when a new pm_ops
    is registered its pm_disk_mode is selected as default, that way the default
    stays for ACPI where it is apparently required.

    Signed-off-by: Johannes Berg
    Cc: David Brownell
    Acked-by: Pavel Machek
    Cc:
    Cc: Len Brown
    Acked-by: Russell King
    Cc: Greg KH
    Cc: "Rafael J. Wysocki"
    Acked-by: Paul Mundt
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Johannes Berg
     
  • We're getting lockdep warnings due to a post-2.6.21-rc7 bugfix.

    The xattr_sem can never be taken in the manner described. Internal inodes
    are protected by I_PRIVATE. Add the appropriate annotation.

    Cc:
    Cc: "Antonino A. Daplas"
    Cc: Takashi Iwai
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jeff Mahoney
     
  • Today's print_symbol function dumps a kernel symbol with printk. This
    patch extends the functionality of kallsyms.c so that the symbol lookup
    function may be used without the printk. This is useful for modules that
    want to dump symbols elsewhere, for example, to debugfs. I intend to use
    the new function call in the GFS2 file system (which will be a separate
    patch).

    [akpm@linux-foundation.org: build fix]
    [clameter@sgi.com: sprint_symbol should return length of string like sprintf]
    Signed-off-by: Robert Peterson
    Cc: Rusty Russell
    Cc: Roman Zippel
    Cc: "Randy.Dunlap"
    Cc: Sam Ravnborg
    Acked-by: Paulo Marques
    Signed-off-by: Christoph Lameter
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Robert Peterson
     
  • When allocating local ports, do not allow a bind to a port
    with a specific local address when a bind to that port with
    a wildcard local address already exists.

    Noticed by Linus.

    Signed-off-by: David S. Miller

    David S. Miller
     
  • I accidently applied an earlier version of Eric Dumazet's patch, from
    March 21st. His version from March 30th didn't have these bugs, so
    this just interdiffs to the correct patch.

    Signed-off-by: David S. Miller

    David S. Miller
     

30 Apr, 2007

2 commits

  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: (56 commits)
    ieee1394: remove garbage from Kconfig
    ieee1394: more help in Kconfig
    ieee1394: ohci1394: Fix mistake in printk message.
    ieee1394: ohci1394: remove unnecessary rcvPhyPkt bit flipping in LinkControl register
    ieee1394: ohci1394: fix cosmetic problem in error logging
    ieee1394: eth1394: send async streams at S100 on 1394b buses
    ieee1394: eth1394: fix error path in module_init
    ieee1394: eth1394: correct return codes in hard_start_xmit
    ieee1394: eth1394: hard_start_xmit is called in atomic context
    ieee1394: eth1394: some conditions are unlikely
    ieee1394: eth1394: clean up fragment_overlap
    ieee1394: eth1394: don't use alloc_etherdev
    ieee1394: eth1394: omit useless set_mac_address callback
    ieee1394: eth1394: CONFIG_INET is always defined
    ieee1394: eth1394: allow MTU bigger than 1500
    ieee1394: unexport highlevel_host_reset
    ieee1394: eth1394: contain host reset
    ieee1394: eth1394: shorter error messages
    ieee1394: eth1394: correct a memset argument
    ieee1394: eth1394: refactor .probe and .update
    ...

    Linus Torvalds
     
  • * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid: (21 commits)
    USB HID: don't warn on idVendor == 0
    USB HID: add 'quirks' module parameter
    USB HID: add support for dynamically-created quirks
    USB HID: clarify static quirk handling as squirks
    USB HID: encapsulate quirk handling into hid-quirks.c
    USB HID: EMS USBII device needs HID_QUIRK_MULTI_INPUT
    HID: update copyright and authorship macro
    HID: introduce proper zeroing of unused bits in output reports
    USB HID: add support for WiseGroup MP-8800 Quad Joypad
    USB HID: add FF support for Logitech Force 3D Pro Joystick
    USB HID: numlock quirk for dell W7658 keyboard
    USB HID: Logitech MX3000 keyboard needs report descriptor quirk
    USB HID: extend quirk for Logitech S510 keyboard
    USB HID: usbkbd/usbmouse - handle errors when registering devices
    USB HID: add QUIRK_HIDDEV for Belkin Flip KVM
    HID: enable dead keys on a belkin wireless keyboard
    USB HID: Thustmaster firestorm dual power v1 support
    USB HID: specify explicit size for hid_blacklist.quirks
    USB HID: fix retry & reset logic
    USB HID: consolidate vendor/product ids
    ...

    Linus Torvalds