Skip to content
Commits on Sep 30, 2009
  1. @torvalds

    Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/…

    …linux/kernel/git/tip/linux-2.6-tip
    
    * 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      sched_clock: Fix atomicity/continuity bug by using cmpxchg64()
      x86: Provide an alternative() based cmpxchg64()
    torvalds committed Sep 30, 2009
  2. sched_clock: Fix atomicity/continuity bug by using cmpxchg64()

    Commit def0a9b (sched_clock: Make it NMI safe) assumed
    cmpxchg() of 64bit values was available on X86_32.
    
    That is not so - and causes some subtle scheduler misbehavior due
    to incorrect timestamps off to up by ~4 seconds.
    
    Two symptoms are known right now:
    
     - interactivity problems seen by Arjan: up to 600 msecs
       latencies instead of the expected 20-40 msecs. These
       latencies are very visible on the desktop.
    
     - incorrect CPU stats: occasionally too high percentages in 'top',
       and crazy CPU usage stats.
    
    Reported-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
    Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
    Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
    Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
    Cc: John Stultz <johnstul@us.ibm.com>
    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
    LKML-Reference: <20090930170754.0886ff2e@infradead.org>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Eric Dumazet committed with Ingo Molnar Sep 30, 2009
  3. x86: Provide an alternative() based cmpxchg64()

    cmpxchg64() today generates, to quote Linus, "barf bag" code.
    
    cmpxchg64() is about to get used in the scheduler to fix a bug there,
    but it's a prerequisite that cmpxchg64() first be made non-sucking.
    
    This patch turns cmpxchg64() into an efficient implementation that
    uses the alternative() mechanism to just use the raw instruction on
    all modern systems.
    
    Note: the fallback is NOT smp safe, just like the current fallback
    is not SMP safe. (Interested parties with i486 based SMP systems
    are welcome to submit fix patches for that.)
    
    Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
    Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
    [ fixed asm constraint bug ]
    Fixed-by: Eric Dumazet <eric.dumazet@gmail.com>
    Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
    Cc: John Stultz <johnstul@us.ibm.com>
    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
    LKML-Reference: <20090930170754.0886ff2e@infradead.org>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Arjan van de Ven committed with Ingo Molnar Sep 30, 2009
  4. @torvalds

    Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-…

    …linus
    
    * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
      MIPS: Avoid spurious make includecheck message
      MIPS: VPE: Get rid of BKL.
      MIPS: VPE: Fix build after the credential changes a while ago.
      MIPS: Excite: Get rid of BKL.
      MIPS: Sibyte: Get rid of BKL.
      MIPS: BCM63xx: Add PCMCIA & Cardbus support.
      MIPS: MSP71xx: request_irq() failure ignored in msp_pcibios_config_access()
      MIPS: Decrease size of au1xxx_dbdma_pm_regs[][]
      MIPS: SMP: Inline arch_send_call_function_{single_ipi,ipi_mask}
      MIPS: SMP: Fix build.
      MIPS: MIPSxx SC: Avoid destructive invalidation on partial L2 cachelines.
      MIPS: Sibyte: Fix compilation error.
      MIPS: BCM1480: Re-apply patch lost due to bad resolution of merge conflict.
      MIPS: BCM63xx: Add serial driver for bcm63xx integrated UART.
      MIPS: Loongson2: Fix typo "enalbe" -> "enable"
      MIPS: SMTC: Remove duplicate structure field initialization
      MIPS: Remove duplicated #include
      MIPS: BCM63xx: Remove duplicated #include
    torvalds committed Sep 30, 2009
  5. @ralfbaechle

    MIPS: Avoid spurious make includecheck message

    arch/mips/include/asm/unaligned.h: linux/unaligned/generic.h is included more than once.
    
    Entirely legitimate but just noise.
    
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    ralfbaechle committed Sep 29, 2009
  6. @ralfbaechle

    MIPS: VPE: Get rid of BKL.

    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    ralfbaechle committed Sep 29, 2009
  7. @ralfbaechle

    MIPS: VPE: Fix build after the credential changes a while ago.

    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    ralfbaechle committed Sep 29, 2009
  8. @ralfbaechle

    MIPS: Excite: Get rid of BKL.

    It's not obvious what good it was supposed to do here anyway.
    
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    ralfbaechle committed Sep 28, 2009
  9. @ralfbaechle

    MIPS: Sibyte: Get rid of BKL.

    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    ralfbaechle committed Sep 28, 2009
  10. @ralfbaechle

    MIPS: BCM63xx: Add PCMCIA & Cardbus support.

    Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
    Reviewed-by: Wolfram Sang <w.sang@pengutronix.de>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    Maxime Bizon committed with ralfbaechle Sep 28, 2009
  11. @RoelKluin @ralfbaechle

    MIPS: MSP71xx: request_irq() failure ignored in msp_pcibios_config_ac…

    …cess()
    
    Produce an error if request_irq() fails.
    
    Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
    Cc: "Ithamar R. Adema" <ithamar.adema@team-embedded.nl>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    RoelKluin committed with ralfbaechle Sep 18, 2009
  12. @RoelKluin @ralfbaechle

    MIPS: Decrease size of au1xxx_dbdma_pm_regs[][]

    There are 16 individual channels (NUM_DBDMA_CHANS) to save/restore plus the
    global ddma block config (the +1).  The last register in a channel can be
    skipped since it's read-only (at offset 0x18).
    
    Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
    Cc: Manuel Lauss <manuel.lauss@googlemail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    RoelKluin committed with ralfbaechle Sep 18, 2009
  13. @ralfbaechle

    MIPS: SMP: Inline arch_send_call_function_{single_ipi,ipi_mask}

    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    ralfbaechle committed Sep 25, 2009
  14. @ralfbaechle

    MIPS: SMP: Fix build.

    commit 48a048f
    Author: Rusty Russell <rusty@rustcorp.com.au>
    Date:   Thu Sep 24 09:34:44 2009 -0600
    
    apparently only passed the "looks good" level of QA ;-)
    
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    ralfbaechle committed Sep 25, 2009
  15. @cernekee @ralfbaechle

    MIPS: MIPSxx SC: Avoid destructive invalidation on partial L2 cacheli…

    …nes.
    
    This extends commit a8ca8b6 to cover
    MIPSxx-style board cache code.
    
    Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    cernekee committed with ralfbaechle Sep 18, 2009
  16. @ralfbaechle

    MIPS: Sibyte: Fix compilation error.

    Build error introduced by d4f587c.
    
    Signed-off-by: Mark Mason <mmason@upwardaccess.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    Mark Mason committed with ralfbaechle Sep 23, 2009
  17. @ralfbaechle

    MIPS: BCM1480: Re-apply patch lost due to bad resolution of merge con…

    …flict.
    
    Patch 14275ccdb1e4b487cca745aba994699c426a31ee and
    d5dedd4 are conflicting and the
    conflict was resolved badly in merge
    92241940be501f798cb21db344bbb3d1ec3c4f1c resulting in the BCM1480 changes
    of 14275ccdb1e4b487cca745aba994699c426a31ee getting lost.  Sort out the
    damage.
    
    Reported and initial patch by Mark Mason <mmason@upwardaccess.com>.
    
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    ralfbaechle committed Sep 23, 2009
  18. @ralfbaechle

    MIPS: BCM63xx: Add serial driver for bcm63xx integrated UART.

    Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
    Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    Maxime Bizon committed with ralfbaechle Sep 18, 2009
  19. @ralfbaechle

    MIPS: Loongson2: Fix typo "enalbe" -> "enable"

    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
    Cc: Yanhua <yanh@lemote.com>
    Cc: Robert Richter <robert.richter@amd.com>
    Acked-by: Wu Zhangjin <wuzj@lemote.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    Uwe Kleine-König committed with ralfbaechle Sep 21, 2009
  20. @JuliaLawall @ralfbaechle

    MIPS: SMTC: Remove duplicate structure field initialization

    The definition of the irq_ipi structure has two initializations of the
    flags field.  This combines them.
    
    [Ralf: The issue was originally introduced by commit
    be4894196d79455f420dd7bb78be7dc73bec115c (linux-mips.org) rsp.
    033890b (kernel.org).  The original
    intention of the code was to initialize .flags with both flags ored together.
    The broken C code as actually implemented will be compiled by an equally
    broken gcc to use only the last initialization, that is IRQF_PERCPU
    which means this turned into an SMTC bug for 2.6.23 and newer.]
    
    The semantic match that finds this problem is as follows:
    (http://coccinelle.lip6.fr/)
    
    // <smpl>
    @r@
    identifier I, s, fld;
    position p0,p;
    expression E;
    @@
    
    struct I s =@p0 { ... .fld@p = E, ...};
    
    @s@
    identifier I, s, r.fld;
    position r.p0,p;
    expression E;
    @@
    
    struct I s =@p0 { ... .fld@p = E, ...};
    
    @script:python@
    p0 << r.p0;
    fld << r.fld;
    ps << s.p;
    pr << r.p;
    @@
    
    if int(ps[0].line)!=int(pr[0].line) or int(ps[0].column)!=int(pr[0].column):
      cocci.print_main(fld,p0)
    // </smpl>
    
    Signed-off-by: Julia Lawall <julia@diku.dk>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    JuliaLawall committed with ralfbaechle Sep 21, 2009
  21. @ralfbaechle

    MIPS: Remove duplicated #include

    Remove duplicated #include in arch/mips/kernel/smp.c.
    
    Signed-off-by: Huang Weiyi <weiyi.huang@gmail.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    Huang Weiyi committed with ralfbaechle Sep 18, 2009
  22. @ralfbaechle

    MIPS: BCM63xx: Remove duplicated #include

    Remove duplicated #include in arch/mips/bcm63xx/boards/board_bcm963xx.c.
    
    Signed-off-by: Huang Weiyi <weiyi.huang@gmail.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    Huang Weiyi committed with ralfbaechle Sep 18, 2009
  23. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/ryusuke/nilfs2
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2:
      nilfs2: fix missing initialization of i_dir_start_lookup member
      nilfs2: fix missing zero-fill initialization of btree node cache
    torvalds committed Sep 30, 2009
  24. @torvalds

    Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/tytso/ext4
    
    * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
      ext4: Fix time encoding with extra epoch bits
      ext4: Add a stub for mpage_da_data in the trace header
      jbd2: Use tracepoints for history file
      ext4: Use tracepoints for mb_history trace file
      ext4, jbd2: Drop unneeded printks at mount and unmount time
      ext4: Handle nested ext4_journal_start/stop calls without a journal
      ext4: Make sure ext4_dirty_inode() updates the inode in no journal mode
      ext4: Avoid updating the inode table bh twice in no journal mode
      ext4: EXT4_IOC_MOVE_EXT: Check for different original and donor inodes first
      ext4: async direct IO for holes and fallocate support
      ext4: Use end_io callback to avoid direct I/O fallback to buffered I/O
      ext4: Split uninitialized extents for direct I/O
      ext4: release reserved quota when block reservation for delalloc retry
      ext4: Adjust ext4_da_writepages() to write out larger contiguous chunks
      ext4: Fix hueristic which avoids group preallocation for closed files
      ext4: Use ext4_msg() for ext4_da_writepage() errors
      ext4: Update documentation about quota mount options
    torvalds committed Sep 30, 2009
  25. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6

    * git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6:
      fat: Check s_dirt in fat_sync_fs()
      vfat: change the default from shortname=lower to shortname=mixed
      fat/nls: Fix handling of utf8 invalid char
    torvalds committed Sep 30, 2009
  26. @torvalds

    Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/…

    …git/rafael/suspend-2.6
    
    * 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
      PM / yenta: Fix cardbus suspend/resume regression
      PM / PCMCIA: Drop second argument of pcmcia_socket_dev_suspend()
    torvalds committed Sep 30, 2009
  27. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (33 commits)
      sony-laptop: re-read the rfkill state when resuming from suspend
      sony-laptop: check for rfkill hard block at load time
      wext: add back wireless/ dir in sysfs for cfg80211 interfaces
      wext: Add bound checks for copy_from_user
      mac80211: improve/fix mlme messages
      cfg80211: always get BSS
      iwlwifi: fix 3945 ucode info retrieval after failure
      iwlwifi: fix memory leak in command queue handling
      iwlwifi: fix debugfs buffer handling
      cfg80211: don't set privacy w/o key
      cfg80211: wext: don't display BSSID unless associated
      net: Add explicit bound checks in net/socket.c
      bridge: Fix double-free in br_add_if.
      isdn: fix netjet/isdnhdlc build errors
      atm: dereference of he_dev->rbps_virt in he_init_group()
      ax25: Add missing dev_put in ax25_setsockopt
      Revert "sit: stateless autoconf for isatap"
      net: fix double skb free in dcbnl
      net: fix nlmsg len size for skb when error bit is set.
      net: fix vlan_get_size to include vlan_flags size
      ...
    torvalds committed Sep 30, 2009
  28. @torvalds

    Merge branch 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/…

    …git/airlied/drm-2.6
    
    * 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (25 commits)
      drm/radeon/kms: Convert R520 to new init path and associated cleanup
      drm/radeon/kms: Convert RV515 to new init path and associated cleanup
      drm: fix radeon DRM warnings when !CONFIG_DEBUG_FS
      drm: fix drm_fb_helper warning when !CONFIG_MAGIC_SYSRQ
      drm/r600: fix memory leak introduced with 64k malloc avoidance fix.
      drm/kms: make fb helper work for all drivers.
      drm/radeon/r600: fix offset handling in CS parser
      drm/radeon/kms/r600: fix forcing pci mode on agp cards
      drm/radeon/kms: fix for the extra pages copying.
      drm/radeon/kms/r600: add support for vline relocs
      drm/radeon/kms: fix some bugs in vline reloc
      drm/radeon/kms/r600: clamp vram to aperture size
      drm/kms: protect against fb helper not being created.
      drm/r600: get values from the passed in IB not the copy.
      drm: create gitignore file for radeon
      drm/radeon/kms: remove unneeded master create/destroy functions.
      drm/kms: start adding command line interface using fb.
      fb: change rules for global rules match.
      drm/radeon/kms: don't require up to 64k allocations. (v2)
      drm/radeon/kms: enable dac load detection by default.
      ...
    
    Trivial conflicts in drivers/gpu/drm/radeon/radeon_asic.h due to adding
    '->vga_set_state' function pointers.
    torvalds committed Sep 30, 2009
  29. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/tj/percpu
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
      percpu: make allocation failures more verbose
      percpu: make pcpu_setup_first_chunk() failures more verbose
      percpu: make embedding first chunk allocator check vmalloc space size
      sparc64: implement page mapping percpu first chunk allocator
      percpu: make pcpu_build_alloc_info() clear static buffers
      percpu: fix unit_map[] verification in pcpu_setup_first_chunk()
    torvalds committed Sep 30, 2009
  30. @torvalds

    Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/l…

    …inux/kernel/git/tmlind/linux-omap-2.6
    
    * 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
      omap: Fix wrong condition check in while loop for mailbox and iommu2
      omap: rng: Use resource_size instead of manual calculation
      omap: Fix MMC gpio_wp for BeagleBoard C2 and above
      omap: Fix matrix_keymap_data usage
      omap: Fix a OMAP_MPUIO_VBASE typo for 850
      omap: Fix wrong jtag_id for 850
      omap: iovmm: Fix compiler warning
      omap: mailbox: Flush posted write when acking mailbox irq
      omap: mailbox: Execute softreset at startup
      omap: Add missing mux pin for EHCI phy reset line
      omap: Fix 44xx compile
      omap: Fix mcspi compile for 2420
      omap: Fix compile for arch/arm/mach-omap2
    torvalds committed Sep 30, 2009
  31. @torvalds

    pty: reconnect the BSD TIOCSPTLCK handling to legacy ptys

    David Howells noticed (due to the compiler warning about an unused
    'pty_ops_bsd' variable) that we haven't actually been using the code
    that implements TIOCSPTLCK for legacy pty handling.  It's been that way
    since 2.6.26, commit 3e8e88c to be
    exact ("pty: prepare for tty->ops changes").
    
    DavidH initially submitted a patch just removing the dead code entirely,
    and since nobody has apparently ever complained, I'm not entirely sure
    that wouldn't be the right thing to do.  But since the whole and only
    point of the legacy pty code is to be compatible with legacy distros
    that don't use the new unix98 pty model, let's just wire it up again.
    
    And clean it up a bit while we're at it.
    
    Acked-by: David Howells <dhowells@redhat.com>
    Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    torvalds committed Sep 30, 2009
  32. @torvalds

    Revert "x86, mce: do not compile mcelog message on AMD"

    This reverts commit 22223c9, as
    requested by Andi Kleen:
    
      "Obviously kernels compiled with AMD support can still run on non AMD
       systems, so messages like this can never be removed at compile time."
    
    Requsted-by: Andi Kleen <andi@firstfloor.org>
    Cc: Borislav Petkov <borislav.petkov@amd.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    torvalds committed Sep 30, 2009
  33. @tytso

    ext4: Fix time encoding with extra epoch bits

    "Looking at ext4.h, I think the setting of extra time fields forgets to
    mask the epoch bits so the epoch part overwrites nsec part. The second
    change is only for coherency (2 -> EXT4_EPOCH_BITS)."
    
    Thanks to Damien Guibouret for pointing out this problem.
    
    Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
    tytso committed Sep 30, 2009
  34. @cuviper @tytso

    ext4: Add a stub for mpage_da_data in the trace header

    The tracepoint ext4_da_write_pages has a struct mpage_da_data*
    parameter, but that struct is only defined in fs/ext4/ext4.h.  This
    patch adds a forward declaration for that struct, so this tracepoint
    header can still be used by tools like SystemTap.
    
    This is a continuation of the fix in commit 3661d28.
    
    http://sourceware.org/bugzilla/show_bug.cgi?id=10703
    
    Signed-off-by: Josh Stone <jistone@redhat.com>
    Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
    cuviper committed with tytso Sep 30, 2009
  35. @tytso

    jbd2: Use tracepoints for history file

    The /proc/fs/jbd2/<dev>/history was maintained manually; by using
    tracepoints, we can get all of the existing functionality of the /proc
    file plus extra capabilities thanks to the ftrace infrastructure.  We
    save memory as a bonus.
    
    Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
    tytso committed Sep 30, 2009
Something went wrong with that request. Please try again.