07 Aug, 2008

14 commits


06 Aug, 2008

26 commits

  • Linus Torvalds
     
  • This re-introduces commit 2b142900784c6e38c8d39fa57d5f95ef08e735d8,
    which was reverted due to the regression it caused by commit
    fca082c9f1e11ec07efa8d2f9f13688521253f36.

    That regression was not root-caused by the original commit, it was just
    uncovered by it, and the real fix was done by Alan Stern in commit
    580da34847488b404218d1d7f53b156f245f5555 ("Fix USB storage hang on
    command abort").

    We can thus re-introduce the change that was confirmed by Alan Jenkins
    to be still required by his odd card reader.

    Cc: Alan Jenkins
    Cc: Alan Stern
    Cc: James Bottomley
    Signed-off-by: Linus Torvalds

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (78 commits)
    AX.25: Fix sysctl registration if !CONFIG_AX25_DAMA_SLAVE
    pktgen: mac count
    pktgen: random flow
    bridge: Eliminate unnecessary forward delay
    bridge: fix compile warning in net/bridge/br_netfilter.c
    ipv4: remove unused field in struct flowi (include/net/flow.h).
    tg3: Fix 'scheduling while atomic' errors
    net: Kill plain NET_XMIT_BYPASS.
    net_sched: Add qdisc __NET_XMIT_BYPASS flag
    net_sched: Add qdisc __NET_XMIT_STOLEN flag
    iwl3945: fix merge mistake for packet injection
    iwlwifi: grap nic access before accessing periphery registers
    iwlwifi: decrement rx skb counter in scan abort handler
    iwlwifi: fix unhandled interrupt when HW rfkill is on
    iwlwifi: implement iwl5000_calc_rssi
    iwlwifi: memory allocation optimization
    iwlwifi: HW bug fixes
    p54: Fix potential concurrent access to private data
    rt2x00: Disable link tuning in rt2500usb
    iwlwifi: Don't use buffer allocated on the stack for led names
    ...

    Linus Torvalds
     
  • Since 49ffcf8f99e8d33ec8afb450956804af518fd788 ("sysctl: update
    sysctl_check_table") setting struct ctl_table.procname = NULL does no
    longer work as it used to the way the AX.25 code is expecting it to
    resulting in the AX.25 sysctl registration code to break if
    CONFIG_AX25_DAMA_SLAVE was not set as in some distribution kernels.
    Kernel releases from 2.6.24 are affected.

    Signed-off-by: Ralf Baechle
    Signed-off-by: David S. Miller

    Ralf Baechle
     
  • dst_mac_count and src_mac_count patch from Eneas Hunguana
    We have sent one mac address to much.

    Signed-off-by: Robert Olsson
    Signed-off-by: David S. Miller

    Robert Olsson
     
  • Random flow generation has not worked. This fixes it.

    Signed-off-by: Robert Olsson
    Signed-off-by: David S. Miller

    Robert Olsson
     
  • From: Stephen Hemminger

    Based upon original patch by Herbert Xu, which contained
    the following problem description:

    --------------------
    When the forward delay is set to zero, we still delay the setting
    of the forwarding state by one or possibly two timers depending
    on whether STP is enabled. This could either turn out to be
    instantaneous, or horribly slow depending on the load of the
    machine.

    As there is nothing preventing us from enabling forwarding straight
    away, this patch eliminates this potential delay by executing the
    code directly if the forward delay is zero.

    The effect of this problem is that immediately after the carrier
    comes on a port, the bridge will drop all packets received from
    that port until it enters forwarding mode, thus causing unnecessary
    packet loss.

    Note that this patch doesn't fully remove the delay due to the
    link watcher. We should also check the carrier state when we
    are about to drop an incoming packet because the port is disabled.
    But that's for another patch.
    --------------------

    This version of the fix takes a different approach, in that
    it just does the state change directly.

    Signed-off-by: David S. Miller

    Stephen Hemminger
     
  • Fix (fatal error) s390 docbook file to handle renamed header files.

    Signed-off-by: Randy Dunlap
    cc: Martin Schwidefsky
    Signed-off-by: Linus Torvalds

    Randy Dunlap
     
  • mips allmodconfig:

    drivers/media/video/vino.c: In function `vino_free_buffer_with_count':
    drivers/media/video/vino.c:811: warning: passing arg 1 of `virt_to_phys' makes pointer from integer without a cast
    drivers/media/video/vino.c: In function `vino_allocate_buffer':
    drivers/media/video/vino.c:889: warning: passing arg 1 of `virt_to_phys' makes pointer from integer without a cast
    drivers/media/video/vino.c: In function `vino_ioctl':
    drivers/media/video/vino.c:4364: error: implicit declaration of function `video_usercopy'

    The patch fixes the error, but not the warnings.

    Cc: Mauro Carvalho Chehab
    Cc: Hans Verkuil
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Andrew Morton
     
  • gcc 4.3.0 correctly emits the following warnings.
    When a vma covering addr is found, find_vma_prepare indeed returns without
    setting pprev, rb_link, and rb_parent.

    mm/mmap.c: In function `insert_vm_struct':
    mm/mmap.c:2085: warning: `rb_parent' may be used uninitialized in this function
    mm/mmap.c:2085: warning: `rb_link' may be used uninitialized in this function
    mm/mmap.c:2084: warning: `prev' may be used uninitialized in this function
    mm/mmap.c: In function `copy_vma':
    mm/mmap.c:2124: warning: `rb_parent' may be used uninitialized in this function
    mm/mmap.c:2124: warning: `rb_link' may be used uninitialized in this function
    mm/mmap.c:2123: warning: `prev' may be used uninitialized in this function
    mm/mmap.c: In function `do_brk':
    mm/mmap.c:1951: warning: `rb_parent' may be used uninitialized in this function
    mm/mmap.c:1951: warning: `rb_link' may be used uninitialized in this function
    mm/mmap.c:1949: warning: `prev' may be used uninitialized in this function
    mm/mmap.c: In function `mmap_region':
    mm/mmap.c:1092: warning: `rb_parent' may be used uninitialized in this function
    mm/mmap.c:1092: warning: `rb_link' may be used uninitialized in this function
    mm/mmap.c:1089: warning: `prev' may be used uninitialized in this function

    Hugh adds: in fact, none of find_vma_prepare's callers use those values
    when a vma is found to be already covering addr, it's either an error or
    an occasion to munmap and repeat. Okay, let's quieten the compiler (but I
    would prefer it if pprev, rb_link and rb_parent were meaningful in that
    case, rather than whatever's in them from descending the tree).

    Signed-off-by: Benny Halevy
    Signed-off-by: Hugh Dickins
    Cc: "Ryan Hope"
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Benny Halevy
     
  • A documentation cleanup patch. With a minor tweak to clarify units for
    kbs.

    [akpm@linux-foundation.org: coding-style fixes]
    Signed-off-by: mark gross
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Richard Hughes
     
  • proc: fix warnings

    fs/proc/base.c:2429: warning: format '%llu' expects type 'long long unsigned int', but argument 3 has type 'u64'
    fs/proc/base.c:2429: warning: format '%llu' expects type 'long long unsigned int', but argument 4 has type 'u64'
    fs/proc/base.c:2429: warning: format '%llu' expects type 'long long unsigned int', but argument 5 has type 'u64'
    fs/proc/base.c:2429: warning: format '%llu' expects type 'long long unsigned int', but argument 6 has type 'u64'
    fs/proc/base.c:2429: warning: format '%llu' expects type 'long long unsigned int', but argument 7 has type 'u64'
    fs/proc/base.c:2429: warning: format '%llu' expects type 'long long unsigned int', but argument 8 has type 'u64'
    fs/proc/base.c:2429: warning: format '%llu' expects type 'long long unsigned int', but argument 9 has type 'u64'

    Signed-off-by: Alexander Beregalov
    Acked-by: Andrea Righi
    Cc: Oleg Nesterov
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Alexander Beregalov
     
  • Removed duplicated include in
    drivers/misc/sgi-gru/grutlbpurge.c.

    Signed-off-by: Huang Weiyi
    Cc: Jack Steiner
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Huang Weiyi
     
  • fs/omfs/inode.c:495: warning: format '%llx' expects type 'long long
    unsigned int', but argument 2 has type 'u64'
    fs/omfs/inode.c:495: warning: format '%llx' expects type 'long
    long unsigned int', but argument 3 has type '__be64'

    Signed-off-by: Alexander Beregalov
    Acked-by: Bob Copeland
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Alexander Beregalov
     
  • Fix handling of nested structs or unions. The regex to strip (eliminate)
    nested structs or unions was limited to only 0 or 1 matches. This can
    cause an uneven number of left/right braces to be stripped, which causes
    this:

    Warning(linux-2.6.27-rc1-git2//include/net/mac80211.h:336): No description found for parameter '}'

    Signed-off-by: Randy Dunlap
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Randy Dunlap
     
  • get_order() takes byte-sized input, not a page-granular one.

    Irrespective of this fix I'm inclined to believe that this doesn't work
    right anyway - bitmap_allocate_region() has an implicit assumption of
    'pos' being suitable for 'order', which this function doesn't seem to
    enforce (and since it's being called with a byte-granular value there's no
    reason to believe that the callers would make sure device_addr is passed
    accordingly - it's also not documented that way).

    Signed-off-by: Jan Beulich
    Cc: James E.J. Bottomley
    Cc: Ingo Molnar
    Cc: Dmitry Baryshkov
    Cc: Jesse Barnes
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jan Beulich
     
  • drivers/video/aty/atyfb_base.c:2663: warning: 'aty_resume_chip' defined
    but not used

    Signed-off-by: Alexander Beregalov
    Cc: Ville Syrjala
    Cc: Antonino A. Daplas
    Cc: Mark Asselstine
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Alexander Beregalov
     
  • of_node_put is needed before discarding a value received from
    of_find_node_by_type, eg in error handling code.

    The semantic patch that makes the change is as follows:
    (http://www.emn.fr/x-info/coccinelle/)

    //
    @@
    struct device_node *n;
    struct device_node *n1;
    struct device_node *n2;
    statement S;
    identifier f1,f2;
    expression E1,E2;
    constant C;
    @@

    n = of_find_node_by_type(...)
    ...
    if (!n) S
    ... when != of_node_put(n)
    when != n1 = f1(n,...)
    when != E1 = n
    when any
    when strict
    (
    + of_node_put(n);
    return -C;
    |
    of_node_put(n);
    |
    n2 = f2(n,...)
    |
    E2 = n
    |
    return ...;
    )
    //

    Signed-off-by: Julia Lawall
    Acked-by: Krzysztof Helt
    Cc: Timur Tabi
    Cc: York Sun
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Julia Lawall
     
  • The name of the i2c buses shows in the output of "i2cdetect -l", so
    it's important to give informative names.

    Signed-off-by: Jean Delvare
    Acked-by: Benjamin Herrenschmidt
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jean Delvare
     
  • If the 'clear' command is used on the frame buffer with a logo the upper
    area is filled by few lines but not scrolled anymore.

    Fix this by removing the protected area for the logo if any part of the
    logo is cleared.

    Signed-off-by: Krzysztof Helt
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Krzysztof Helt
     
  • I have a new PCI-E radeon RV380 series card (PCI device ID 5b64) that
    hangs in my sparc64 boxes when the init scripts set the font. The problem
    goes away if I disable acceleration.

    I haven't figured out that bug yet, but along the way I found some
    corrections to make based upon some auditing.

    1) The RB2D_DC_FLUSH_ALL value used by the kernel fb driver
    and the XORG video driver differ. I've made the kernel
    match what XORG is using.

    2) In radeonfb_engine_reset() we have top-level code structure
    that roughly looks like:

    if (family is 300, 350, or V350)
    do this;
    else
    do that;
    ...
    if (family is NOT 300, OR
    family is NOT 350, OR
    family is NOT V350)
    do another thing;

    this last conditional makes no sense, is always true,
    and obviously was likely meant to be "family is NOT
    300, 350, or V350". So I've made the code match the
    intent.

    Signed-off-by: David S. Miller
    Acked-by: Benjamin Herrenschmidt
    Tested-by: Benjamin Herrenschmidt
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    David Miller
     
  • These functions have been deprecated for some time now but remained until
    all legacy callers could be removed. With a few commits in 2.6.26 this
    has happened so now we can remove these deprecated functions.

    Signed-off-by: Mark Asselstine
    Reviewed-by: Matthew Wilcox
    Cc: Alan Cox
    Cc: Ingo Molnar
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Mark Asselstine
     
  • Add the missing MODULE_ALIAS() to the pwm_backlight driver.

    Cc: Russell King
    Signed-off-by: Ben Dooks
    Cc: Richard Purdie
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Ben Dooks
     
  • Make the error paths in the pwm_backlight driver more informative in the
    probe path, especially for the times that it finds an error.

    Cc: Russell King
    Signed-off-by: Ben Dooks
    Cc: Richard Purdie
    Acked-by: Krzysztof Helt
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Ben Dooks
     
  • …x of 1HZ and this same functionality is provided by UIE

    Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
    Signed-off-by: Bryan Wu <cooloney@kernel.org>
    Cc: David Brownell <david-b@pacbell.net>
    Cc: Alessandro Zummo <a.zummo@towertech.it>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

    Mike Frysinger
     
  • Signed-off-by: Mike Frysinger
    Signed-off-by: Bryan Wu
    Cc: David Brownell
    Cc: Alessandro Zummo
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Mike Frysinger