20 Jul, 2011

9 commits


19 Jul, 2011

1 commit

  • `make headers_check` complains that

    linux-2.6/usr/include/linux/sdla.h:116: userspace cannot reference
    function or variable defined in the kernel

    this is due to that there is no such a kernel function,

    void sdla(void *cfg_info, char *dev, struct frad_conf *conf, int quiet);

    I don't know why we have it in a kernel header, so remove it.

    Signed-off-by: WANG Cong
    Signed-off-by: David S. Miller

    WANG Cong
     

18 Jul, 2011

2 commits


15 Jul, 2011

2 commits

  • Signed-off-by: Alex Deucher
    Cc: stable@kernel.org
    Signed-off-by: Dave Airlie

    Alex Deucher
     
  • There is no software fallback implemented for SCTP or FCoE checksumming,
    and so it should not be passed on by software devices like bridge or bonding.

    For VLAN devices, this is different. First, the driver for underlying device
    should be prepared to get offloaded packets even when the feature is disabled
    (especially if it advertises it in vlan_features). Second, devices under
    VLANs do not get replaced without tearing down the VLAN first.

    This fixes a mess I accidentally introduced while converting bonding to
    ndo_fix_features.

    NETIF_F_SOFT_FEATURES are removed from BOND_VLAN_FEATURES because they
    are unused as of commit 712ae51afd.

    Signed-off-by: Michał Mirosław
    Signed-off-by: David S. Miller

    Michał Mirosław
     

14 Jul, 2011

6 commits

  • Len Brown
     
  • Commit 28c2103 added new state ACPI_STATE_D3_COLD, so the device power
    states array must be expanded by one also.

    v2: Use ACPI_D_STATE_COUNT instead of number 5 for the array size.

    Reported-by: Dan Carpenter
    Suggested-by: Oldřich Jedlička
    Signed-off-by: Lin Ming
    Signed-off-by: Len Brown

    Lin Ming
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc:
    mmc: core: Bus width testing needs to handle suspend/resume

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (21 commits)
    slip: fix wrong SLIP6 ifdef-endif placing
    natsemi: fix another dma-debug report
    sctp: ABORT if receive, reassmbly, or reodering queue is not empty while closing socket
    net: Fix default in docs for tcp_orphan_retries.
    hso: fix a use after free condition
    net/natsemi: Fix module parameter permissions
    XFRM: Fix memory leak in xfrm_state_update
    sctp: Enforce retransmission limit during shutdown
    mac80211: fix TKIP replay vulnerability
    mac80211: fix ie memory allocation for scheduled scans
    ssb: fix init regression of hostmode PCI core
    rtlwifi: rtl8192cu: Add new USB ID for Netgear WNA1000M
    ath9k: Fix tx throughput drops for AR9003 chips with AES encryption
    carl9170: add NEC WL300NU-AG usbid
    cfg80211: fix deadlock with rfkill/sched_scan by adding new mutex
    ath5k: fix incorrect use of drvdata in PCI suspend/resume code
    ath5k: fix incorrect use of drvdata in sysfs code
    Bluetooth: Fix memory leak under page timeouts
    Bluetooth: Fix regression with incoming L2CAP connections
    Bluetooth: Fix hidp disconnect deadlocks and lost wakeup
    ...

    Linus Torvalds
     
  • On reading the ext_csd for the first time (in 1 bit mode), save the
    ext_csd information needed for bus width compare.

    On every pass we make re-reading the ext_csd, compare the data
    against the saved ext_csd data.

    This fixes a regression introduced in 3.0-rc1 by 08ee80cc397ac1a3
    ("mmc: core: eMMC bus width may not work on all platforms"), which
    incorrectly assumed we would be re-reading the ext_csd at resume-
    time.

    Signed-off-by: Philip Rakity
    Tested-by: Jaehoon Chung
    Signed-off-by: Chris Ball

    Philip Rakity
     
  • All ACPICA locks are allocated by the same function,
    acpi_os_create_lock(), with the help of a local variable called
    "lock". Thus, when lockdep is enabled, it uses "lock" as the
    name of all those locks and regards them as instances of the same
    lock, which causes it to report possible locking problems with them
    when there aren't any.

    To work around this problem, define acpi_os_create_lock() as a macro
    and make it pass its argument to spin_lock_init(), so that lockdep
    uses it as the name of the new lock. Define this macron in a
    Linux-specific file, to minimize the resulting modifications of
    the OS-independent ACPICA parts.

    This change is based on an earlier patch from Andrea Righi and it
    addresses a regression from 2.6.39 tracked as
    https://bugzilla.kernel.org/show_bug.cgi?id=38152

    Signed-off-by: Rafael J. Wysocki
    Reported-and-tested-by: Borislav Petkov
    Tested-by: Andrea Righi
    Reviewed-by: Florian Mickler
    Signed-off-by: Len Brown

    Rafael J. Wysocki
     

13 Jul, 2011

2 commits


12 Jul, 2011

2 commits

  • The macro MIN_MEMORY_BLOCK_SIZE is currently defined twice in two .c
    files, and I need it in a third one to fix a powerpc bug, so let's
    first move it into a header

    Signed-off-by: Benjamin Herrenschmidt
    Acked-by: Ingo Molnar

    Benjamin Herrenschmidt
     
  • * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
    [media] msp3400: fill in v4l2_tuner based on vt->type field
    [media] tuner-core.c: don't change type field in g_tuner or g_frequency
    [media] cx18/ivtv: fix g_tuner support
    [media] tuner-core: power up tuner when called with s_power(1)
    [media] v4l2-ioctl.c: check for valid tuner type in S_HW_FREQ_SEEK
    [media] tuner-core: simplify the standard fixup
    [media] tuner-core/v4l2-subdev: document that the type field has to be filled in
    [media] v4l2-subdev.h: remove unused s_mode tuner op
    [media] feature-removal-schedule: change in how radio device nodes are handled
    [media] bttv: fix s_tuner for radio
    [media] pvrusb2: fix g/s_tuner support
    [media] v4l2-ioctl.c: prefill tuner type for g_frequency and g/s_tuner
    [media] tuner-core: fix tuner_resume: use t->mode instead of t->type
    [media] tuner-core: fix s_std and s_tuner

    Linus Torvalds
     

09 Jul, 2011

2 commits

  • This fixes a regression in 3.0 reported by Paul Parsons regarding the
    removal of the msleep(1) in the ds1wm_reset() function:

    : The linux-3.0-rc4 DS1WM 1-wire driver is logging "bus error, retrying"
    : error messages on an HP iPAQ hx4700 PDA (XScale-PXA270):
    :
    :
    : Driver for 1-wire Dallas network protocol.
    : DS1WM w1 busmaster driver - (c) 2004 Szabolcs Gyurko
    : 1-Wire driver for the DS2760 battery monitor chip - (c) 2004-2005, Szabolcs Gyurko
    : ds1wm ds1wm: pass: 1 bus error, retrying
    : ds1wm ds1wm: pass: 2 bus error, retrying
    : ds1wm ds1wm: pass: 3 bus error, retrying
    : ds1wm ds1wm: pass: 4 bus error, retrying
    : ds1wm ds1wm: pass: 5 bus error, retrying
    : ...
    :
    : The visible result is that the battery charging LED is erratic; sometimes
    : it works, mostly it doesn't.
    :
    : The linux-2.6.39 DS1WM 1-wire driver worked OK. I haven't tried 3.0-rc1,
    : 3.0-rc2, or 3.0-rc3.

    This sleep should not be required on normal circuitry provided the
    pull-ups on the bus are correctly adapted to the slaves. Unfortunately,
    this is not always the case. The sleep is restored but as a parameter to
    the probe function in the pdata.

    [akpm@linux-foundation.org: coding-style fixes]
    Reported-by: Paul Parsons
    Tested-by: Paul Parsons
    Signed-off-by: Jean-François Dagenais
    Cc: Evgeniy Polyakov
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jean-François Dagenais
     
  • Trigger user ABORT if application closes a socket which has data
    queued on the socket receive queue or chunks waiting on the
    reassembly or ordering queue as this would imply data being lost
    which defeats the point of a graceful shutdown.

    This behavior is already practiced in TCP.

    We do not check the input queue because that would mean to parse
    all chunks on it to look for unacknowledged data which seems too
    much of an effort. Control chunks or duplicated chunks may also
    be in the input queue and should not be stopping a graceful
    shutdown.

    Signed-off-by: Thomas Graf
    Acked-by: Vlad Yasevich
    Signed-off-by: David S. Miller

    Thomas Graf
     

08 Jul, 2011

8 commits

  • When initiating a graceful shutdown while having data chunks
    on the retransmission queue with a peer which is in zero
    window mode the shutdown is never completed because the
    retransmission error count is reset periodically by the
    following two rules:

    - Do not timeout association while doing zero window probe.
    - Reset overall error count when a heartbeat request has
    been acknowledged.

    The graceful shutdown will wait for all outstanding TSN to
    be acknowledged before sending the SHUTDOWN request. This
    never happens due to the peer's zero window not acknowledging
    the continuously retransmitted data chunks. Although the
    error counter is incremented for each failed retransmission,
    the receiving of the SACK announcing the zero window clears
    the error count again immediately. Also heartbeat requests
    continue to be sent periodically. The peer acknowledges these
    requests causing the error counter to be reset as well.

    This patch changes behaviour to only reset the overall error
    counter for the above rules while not in shutdown. After
    reaching the maximum number of retransmission attempts, the
    T5 shutdown guard timer is scheduled to give the receiver
    some additional time to recover. The timer is stopped as soon
    as the receiver acknowledges any data.

    The issue can be easily reproduced by establishing a sctp
    association over the loopback device, constantly queueing
    data at the sender while not reading any at the receiver.
    Wait for the window to reach zero, then initiate a shutdown
    by killing both processes simultaneously. The association
    will never be freed and the chunks on the retransmission
    queue will be retransmitted indefinitely.

    Signed-off-by: Thomas Graf
    Acked-by: Vlad Yasevich
    Signed-off-by: David S. Miller

    Thomas Graf
     
  • * 'for-linus' of git://git.kernel.dk/linux-block:
    drbd: we should write meta data updates with FLUSH FUA
    drbd: fix limit define, we support 1 PiByte now
    drbd: when receive times out on meta socket, also check last receive time on data socket
    drbd: account bitmap IO during resync as resync-(related-)-io
    drbd: don't cond_resched_lock with IRQs disabled
    drbd: add missing spinlock to bitmap receive
    drbd: Use the correct max_bio_size when creating resync requests
    cfq-iosched: make code consistent
    cfq-iosched: fix a rcu warning

    Linus Torvalds
     
  • Add an FS-Cache helper to bulk uncache pages on an inode. This will
    only work for the circumstance where the pages in the cache correspond
    1:1 with the pages attached to an inode's page cache.

    This is required for CIFS and NFS: When disabling inode cookie, we were
    returning the cookie and setting cifsi->fscache to NULL but failed to
    invalidate any previously mapped pages. This resulted in "Bad page
    state" errors and manifested in other kind of errors when running
    fsstress. Fix it by uncaching mapped pages when we disable the inode
    cookie.

    This patch should fix the following oops and "Bad page state" errors
    seen during fsstress testing.

    ------------[ cut here ]------------
    kernel BUG at fs/cachefiles/namei.c:201!
    invalid opcode: 0000 [#1] SMP
    Pid: 5, comm: kworker/u:0 Not tainted 2.6.38.7-30.fc15.x86_64 #1 Bochs Bochs
    RIP: 0010: cachefiles_walk_to_object+0x436/0x745 [cachefiles]
    RSP: 0018:ffff88002ce6dd00 EFLAGS: 00010282
    RAX: ffff88002ef165f0 RBX: ffff88001811f500 RCX: 0000000000000000
    RDX: 0000000000000000 RSI: 0000000000000100 RDI: 0000000000000282
    RBP: ffff88002ce6dda0 R08: 0000000000000100 R09: ffffffff81b3a300
    R10: 0000ffff00066c0a R11: 0000000000000003 R12: ffff88002ae54840
    R13: ffff88002ae54840 R14: ffff880029c29c00 R15: ffff88001811f4b0
    FS: 00007f394dd32720(0000) GS:ffff88002ef00000(0000) knlGS:0000000000000000
    CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b
    CR2: 00007fffcb62ddf8 CR3: 000000001825f000 CR4: 00000000000006e0
    DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
    DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
    Process kworker/u:0 (pid: 5, threadinfo ffff88002ce6c000, task ffff88002ce55cc0)
    Stack:
    0000000000000246 ffff88002ce55cc0 ffff88002ce6dd58 ffff88001815dc00
    ffff8800185246c0 ffff88001811f618 ffff880029c29d18 ffff88001811f380
    ffff88002ce6dd50 ffffffff814757e4 ffff88002ce6dda0 ffffffff8106ac56
    Call Trace:
    cachefiles_lookup_object+0x78/0xd4 [cachefiles]
    fscache_lookup_object+0x131/0x16d [fscache]
    fscache_object_work_func+0x1bc/0x669 [fscache]
    process_one_work+0x186/0x298
    worker_thread+0xda/0x15d
    kthread+0x84/0x8c
    kernel_thread_helper+0x4/0x10
    RIP cachefiles_walk_to_object+0x436/0x745 [cachefiles]
    ---[ end trace 1d481c9af1804caa ]---

    I tested the uncaching by the following means:

    (1) Create a big file on my NFS server (104857600 bytes).

    (2) Read the file into the cache with md5sum on the NFS client. Look in
    /proc/fs/fscache/stats:

    Pages : mrk=25601 unc=0

    (3) Open the file for read/write ("bash 5<>/warthog/bigfile"). Look in proc
    again:

    Pages : mrk=25601 unc=25601

    Reported-by: Jeff Layton
    Signed-off-by: David Howells
    Reviewed-and-Tested-by: Suresh Jayaraman
    cc: stable@kernel.org
    Signed-off-by: Linus Torvalds

    David Howells
     
  • …t-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

    * 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    debugobjects: Fix boot crash when kmemleak and debugobjects enabled

    * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    jump_label: Fix jump_label update for modules
    oprofile, x86: Fix race in nmi handler while starting counters

    * 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    sched: Disable (revert) SCHED_LOAD_SCALE increase
    sched, cgroups: Fix MIN_SHARES on 64-bit boxen

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (31 commits)
    sctp: fix missing send up SCTP_SENDER_DRY_EVENT when subscribe it
    net: refine {udp|tcp|sctp}_mem limits
    vmxnet3: round down # of queues to power of two
    net: sh_eth: fix the parameter for the ETHER of SH7757
    net: sh_eth: fix cannot work half-duplex mode
    net: vlan: enable soft features regardless of underlying device
    vmxnet3: fix starving rx ring whenoc_skb kb fails
    bridge: Always flood broadcast packets
    greth: greth_set_mac_add would corrupt the MAC address.
    net: bind() fix error return on wrong address family
    natsemi: silence dma-debug warnings
    net: 8139too: Initial necessary vlan_features to support vlan
    Fix call trace when interrupts are disabled while sleeping function kzalloc is called
    qlge:Version change to v1.00.00.29
    qlge: Fix printk priority so chip fatal errors are always reported.
    qlge:Fix crash caused by mailbox execution on wedged chip.
    xfrm4: Don't call icmp_send on local error
    ipv4: Don't use ufo handling on later transformed packets
    xfrm: Remove family arg from xfrm_bundle_ok
    ipv6: Don't put artificial limit on routing table size.
    ...

    Linus Torvalds
     
  • The tuner ops g_frequency, g_tuner and s_tuner require that the tuner type
    field is filled in. Document this.

    The tuner-core doc is based on a patch from Mauro Carvalho Chehab .

    Signed-off-by: Hans Verkuil
    Signed-off-by: Mauro Carvalho Chehab

    Hans Verkuil
     
  • s_mode is no longer used, so remove it.

    Signed-off-by: Hans Verkuil
    Signed-off-by: Mauro Carvalho Chehab

    Hans Verkuil
     
  • This fixes a regression introduced by e59347a "arm: orion:
    Use generic irq chip".

    Depending on the device, interrupts acknowledgement is done by setting
    or by clearing a dedicated register. Replace irq_gc_ack() with some
    {set,clr}_bit variants allows to handle both cases.

    Note that this patch affects the following SoCs: Davinci, Samsung and
    Orion. Except for this last, the change is minor: irq_gc_ack() is just
    renamed into irq_gc_ack_set_bit().

    For the Orion SoCs, the edge GPIO interrupts support is currently
    broken. irq_gc_ack() try to acknowledge a such interrupt by setting
    the corresponding cause register bit. The Orion GPIO device expect the
    opposite. To fix this issue, the irq_gc_ack_clr_bit() variant is used.

    Tested on Network Space v2.

    Reported-by: Joey Oravec
    Signed-off-by: Simon Guinot
    Signed-off-by: Arnd Bergmann

    Simon Guinot
     

07 Jul, 2011

1 commit

  • * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (46 commits)
    [media] rc: call input_sync after scancode reports
    [media] imon: allow either proto on unknown 0xffdc
    [media] imon: auto-config ffdc 7e device
    [media] saa7134: fix raw IR timeout value
    [media] rc: fix ghost keypresses with certain hw
    [media] [staging] lirc_serial: allocate irq at init time
    [media] lirc_zilog: fix spinning rx thread
    [media] keymaps: fix table for pinnacle pctv hd devices
    [media] ite-cir: 8709 needs to use pnp resource 2
    [media] V4L: mx1-camera: fix uninitialized variable
    [media] omap_vout: Added check in reqbuf & mmap for buf_size allocation
    [media] OMAP_VOUT: Change hardcoded device node number to -1
    [media] OMAP_VOUTLIB: Fix wrong resizer calculation
    [media] uvcvideo: Disable the queue when failing to start
    [media] uvcvideo: Remove buffers from the queues when freeing
    [media] uvcvideo: Ignore entities for terminals with no supported format
    [media] v4l: Don't access media entity after is has been destroyed
    [media] media: omap3isp: fix a potential NULL deref
    [media] media: vb2: fix allocation failure check
    [media] media: vb2: reset queued_count value during queue reinitialization
    ...

    Fix up trivial conflict in MAINTAINERS as per Mauro

    Linus Torvalds
     

05 Jul, 2011

2 commits

  • Alex reported that commit c8b281161df ("sched: Increase
    SCHED_LOAD_SCALE resolution") caused a power usage regression
    under light load as it increases the number of load-balance
    operations and keeps idle cpus from staying idle.

    Time has run out to find the root cause for this release so
    disable the feature for v3.0 until we can figure out what
    causes the problem.

    Reported-by: "Alex, Shi"
    Signed-off-by: Peter Zijlstra
    Cc: Nikhil Rao
    Cc: Ming Lei
    Cc: Mike Galbraith
    Cc: Linus Torvalds
    Cc: Andrew Morton
    Link: http://lkml.kernel.org/n/tip-m4onxn0sxnyn5iz9o88eskc3@git.kernel.org
    Signed-off-by: Ingo Molnar

    Peter Zijlstra
     
  • …l/git/lethal/fbdev-3.x

    * 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-3.x:
    vesafb: fix memory leak
    fbdev: amba: Link fb device to its parent
    fsl-diu-fb: remove check for pixel clock ranges
    udlfb: Correct sub-optimal resolution selection.
    hecubafb: add module_put on error path in hecubafb_probe()
    sm501fb: fix section mismatch warning
    gx1fb: Fix section mismatch warnings
    fbdev: sh_mobile_meram: Correct pointer check for YCbCr chroma plane

    Linus Torvalds
     

03 Jul, 2011

1 commit

  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
    ALSA: sb16 - Fix build errors on MIPS and others with 13bit ioctl size
    ALSA: hdspm - Fix compile warnings with PPC
    ALSA: cs5535 - Fix invalid big-endian conversions
    ALSA: HDMI - fix ELD monitor name length
    ALSA: atmel - update author email for ABDAC, AC97C and AT73C213
    ALSA: HDA: Add model=auto quirk for Acer Aspire 3830TG
    ALSA: HDA: Add a new Conexant codec ID (506c)

    Linus Torvalds
     

02 Jul, 2011

1 commit

  • IPV6, unlike IPV4, doesn't have a routing cache.

    Routing table entries, as well as clones made in response
    to route lookup requests, all live in the same table. And
    all of these things are together collected in the destination
    cache table for ipv6.

    This means that routing table entries count against the garbage
    collection limits, even though such entries cannot ever be reclaimed
    and are added explicitly by the administrator (rather than being
    created in response to lookups).

    Therefore it makes no sense to count ipv6 routing table entries
    against the GC limits.

    Add a DST_NOCOUNT destination cache entry flag, and skip the counting
    if it is set. Use this flag bit in ipv6 when adding routing table
    entries.

    Signed-off-by: David S. Miller

    David S. Miller
     

01 Jul, 2011

1 commit