03 May, 2007

15 commits


01 May, 2007

2 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
     
  • 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
     

30 Apr, 2007

23 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
     
  • * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (21 commits)
    [IPV4] SNMP: Support OutMcastPkts and OutBcastPkts
    [IPV4] SNMP: Support InMcastPkts and InBcastPkts
    [IPV4] SNMP: Support InTruncatedPkts
    [IPV4] SNMP: Support InNoRoutes
    [SNMP]: Add definitions for {In,Out}BcastPkts
    [TCP] FRTO: RFC4138 allows Nagle override when new data must be sent
    [TCP] FRTO: Delay skb available check until it's mandatory
    [XFRM]: Restrict upper layer information by bundle.
    [TCP]: Catch skb with S+L bugs earlier
    [PATCH] INET : IPV4 UDP lookups converted to a 2 pass algo
    [L2TP]: Add the ability to autoload a pppox protocol module.
    [SKB]: Introduce skb_queue_walk_safe()
    [AF_IUCV/IUCV]: smp_call_function deadlock
    [IPV6]: Fix slab corruption running ip6sic
    [TCP]: Update references in two old comments
    [XFRM]: Export SPD info
    [IPV6]: Track device renames in snmp6.
    [SCTP]: Fix sctp_getsockopt_local_addrs_old() to use local storage.
    [NET]: Remove NETIF_F_INTERNAL_STATS, default to internal stats.
    [NETPOLL]: Remove CONFIG_NETPOLL_RX
    ...

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block:
    [PATCH] elevator: elv_list_lock does not need irq disabling
    [BLOCK] Don't pin lots of memory in mempools
    cfq-iosched: speedup cic rb lookup
    ll_rw_blk: add io_context private pointer
    cfq-iosched: get rid of cfqq hash
    cfq-iosched: tighten queue request overlap condition
    cfq-iosched: improve sync vs async workloads
    cfq-iosched: never allow an async queue idling
    cfq-iosched: get rid of ->dispatch_slice
    cfq-iosched: don't pass unused preemption variable around
    cfq-iosched: get rid of ->cur_rr and ->cfq_list
    cfq-iosched: slice offset should take ioprio into account
    [PATCH] cfq-iosched: style cleanups and comments
    cfq-iosched: sort IDLE queues into the rbtree
    cfq-iosched: sort RT queues into the rbtree
    [PATCH] cfq-iosched: speed up rbtree handling
    cfq-iosched: rework the whole round-robin list concept
    cfq-iosched: minor updates
    cfq-iosched: development update
    cfq-iosched: improve preemption for cooperating tasks

    Linus Torvalds
     
  • * 'for-2.6.22' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (255 commits)
    [POWERPC] Remove dev_dbg redefinition in drivers/ps3/vuart.c
    [POWERPC] remove kernel module option for booke wdt
    [POWERPC] Avoid putting cpu node twice
    [POWERPC] Spinlock initializer cleanup
    [POWERPC] ppc4xx_sgdma needs dma-mapping.h
    [POWERPC] arch/powerpc/sysdev/timer.c build fix
    [POWERPC] get_property cleanups
    [POWERPC] Remove the unused HTDMSOUND driver
    [POWERPC] cell: cbe_cpufreq cleanup and crash fix
    [POWERPC] Declare enable_kernel_spe in a header
    [POWERPC] Add dt_xlate_addr() to bootwrapper
    [POWERPC] bootwrapper: CONFIG_ -> CONFIG_DEVICE_TREE
    [POWERPC] Don't define a custom bd_t for Xilixn Virtex based boards.
    [POWERPC] Add sane defaults for Xilinx EDK generated xparameters files
    [POWERPC] Add uartlite boot console driver for the zImage wrapper
    [POWERPC] Stop using ppc_sys for Xilinx Virtex boards
    [POWERPC] New registration for common Xilinx Virtex ppc405 platform devices
    [POWERPC] Merge common virtex header files
    [POWERPC] Rework Kconfig dependancies for Xilinx Virtex ppc405 platform
    [POWERPC] Clean up cpufreq Kconfig dependencies
    ...

    Linus Torvalds
     
  • This patch allows a name "pppox-proto-nnn" to be used in modprobe.conf
    to autoload a PPPoX protocol nnn.

    Signed-off-by: James Chapman
    Signed-off-by: David S. Miller

    James Chapman
     
  • Currently we scale the mempool sizes depending on memory installed
    in the machine, except for the bio pool itself which sits at a fixed
    256 entry pre-allocation.

    There's really no point in "optimizing" this OOM path, we just need
    enough preallocated to make progress. A single unit is enough, lets
    scale it down to 2 just to be on the safe side.

    This patch saves ~150kb of pinned kernel memory on a 32-bit box.

    Signed-off-by: Jens Axboe

    Jens Axboe
     
  • Commit 404d5b185b4eb56d6fa2f7bd27833f8df1c38ce4 changed the definition
    of dev_dbg in the !DEBUG case from being a #define to being a static
    inline. There was code in drivers/ps3/vuart.c to do exactly that,
    which fails to compile now. This fixes it by removing the redefinition,
    as the redefinition is now superfluous.

    Signed-off-by: Paul Mackerras

    Paul Mackerras
     
  • Paul Mackerras
     
  • Remove option of making booke_wdt into a kernel module. This watchdog
    cannot be disabled. No point being a kernel module.

    Signed-off-by: Dave Jiang
    Signed-off-by: Paul Mackerras

    Dave Jiang
     
  • Signed-off-by: Stefan Richter

    Stefan Richter
     
  • - s/Device Drivers/Controllers/
    - clarify who needs pcilynx
    - don't recommend Y for raw1394; M is typically used

    Signed-off-by: Stefan Richter

    Stefan Richter
     
  • Fix the "attempting to setting" message in ohci1394.

    Signed-off-by: Simon Arlott
    Signed-off-by: Andrew Morton
    Signed-off-by: Stefan Richter

    Simon Arlott
     
  • Remove the unneeded code that clears, sets and again clears the
    rcvPhyPkt bit in the ohci1394 LinkControl register in ohci_initialize().

    Signed-off-by: Bernhard Kauer
    Signed-off-by: Stefan Richter

    Bernhard Kauer
     
  • If posted write failed, an "Unhandled interrupt(s) 0x00000100" message
    was logged by mistake.

    Signed-off-by: Stefan Richter

    Stefan Richter
     
  • eth1394 did not work on buses consisting of S100B...S400B hardware
    because it attempted to send GASP packets at S800.

    Signed-off-by: Stefan Richter

    Stefan Richter
     
  • This patch fixes some error handlings in eth1394:

    - check return value of kmem_cache_create()
    - cleanup resources if hpsb_register_protocol() fails

    Signed-off-by: Akinobu Mita
    Signed-off-by: Stefan Richter (whitespace)

    Akinobu Mita
     
  • This patch actually doesn't change anything because there was always 0
    == NETDEV_TX_OK returned before.

    TODO: Return NETDEV_TX_BUSY in error case and test in different error
    conditions.

    Signed-off-by: Stefan Richter

    Stefan Richter
     
  • Signed-off-by: Stefan Richter

    Stefan Richter
     
  • Signed-off-by: Stefan Richter

    Stefan Richter
     
  • offset > fi->offset + fi->len - 1 == !(offset < fi->offset + fi->len)
    offset + len - 1 < fi->offset == !(offset + len > fi->offset)
    !(A || B) == (!A && !B)

    Signed-off-by: Stefan Richter

    Stefan Richter
     
  • Signed-off-by: Stefan Richter

    Stefan Richter
     
  • We can't reconfigure the MAC address, hence we don't need the callback.

    Signed-off-by: Stefan Richter

    Stefan Richter