Commits on Jul 7, 2010
  1. @torvalds

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

    …/git/airlied/drm-2.6
    
    * 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
      drm: correctly update connector DPMS status in drm_fb_helper
      drm/radeon/kms: fix shared ddc handling
      drm/ttm: Allocate the page pool manager in the heap.
    torvalds committed Jul 7, 2010
  2. @jbarnes993

    drm: correctly update connector DPMS status in drm_fb_helper

    We don't currently update the DPMS status of the connector (both in the
    connector itself and the connector's DPMS property) in the fb helper
    code.  This means that if the kernel FB core has blanked the screen,
    sysfs will still show a DPMS status of "on".  It also means that when X
    starts, it will try to light up the connectors, but the drm_crtc_helper
    code will ignore the DPMS change since according to the connector, the
    DPMS status is already on.
    
    Fixes https://bugs.freedesktop.org/show_bug.cgi?id=28436 (the annoying
    "my screen was blanked when I started X and now it won't light up" bug).
    
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    jbarnes993 committed with Dave Airlie Jul 2, 2010
  3. drm/radeon/kms: fix shared ddc handling

    Connectors with a shared ddc line can be connected to different
    encoders.
    
    Reported by Pasi Kärkkäinen <pasik@iki.fi> on dri-devel
    
    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
    Cc: stable@kernel.org
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Alex Deucher committed with Dave Airlie Jul 1, 2010
  4. @curro

    drm/ttm: Allocate the page pool manager in the heap.

    Repeated ttm_page_alloc_init/fini fails noisily because the pool
    manager kobj isn't zeroed out between uses (we could do just that but
    statically allocated kobjects are generally considered a bad thing).
    Move it to kzalloc'ed memory.
    
    Note that this patch drops the refcounting behavior of the pool
    allocator init/fini functions: it would have led to a race condition
    in its current form, and anyway it was never exploited.
    
    This fixes a regression with reloading kms modules at runtime, since
    page allocator was introduced.
    
    Signed-off-by: Francisco Jerez <currojerez@riseup.net>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    curro committed with Dave Airlie Jul 4, 2010
  5. @torvalds

    VFS: introduce s_dirty accessors

    This patch introduces 3 VFS accessors: 'sb_mark_dirty()',
    'sb_mark_clean()', and 'sb_is_dirty()'. They simply
    set 'sb->s_dirt' or test 'sb->s_dirt'. The plan is to make
    every FS use these accessors later instead of manipulating
    the 'sb->s_dirt' flag directly.
    
    Ultimately, this change is a preparation for the periodic
    superblock synchronization optimization which is about
    preventing the "sync_supers" kernel thread from waking up
    even if there is nothing to synchronize.
    
    This patch does not do any functional change, just adds
    accessor functions.
    
    Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Artem Bityutskiy committed with torvalds Jun 10, 2010
  6. @torvalds

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

    …nux/kernel/git/tip/linux-2.6-tip
    
    * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      rbtree: Undo augmented trees performance damage and regression
      x86, Calgary: Limit the max PHB number to 256
    torvalds committed Jul 6, 2010
  7. @torvalds

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

    …/git/sage/ceph-client
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
      ceph: fix crush device 'out' threshold to 1.0, not 0.1
      ceph: fix caps usage accounting for import (non-reserved) case
      ceph: only release clean, unused caps with mds requests
      ceph: fix crush CHOOSE_LEAF when type is already a leaf
      ceph: fix crush recursion
      ceph: fix caps debugfs entry
      ceph: delay umount until all mds requests drop inode+dentry refs
      ceph: handle splice_dentry/d_materialize_unique error in readdir_prepopulate
      ceph: fix crush map update decoding
      ceph: fix message memory leak, uninitialized variable
      ceph: fix map handler error path
      ceph: some endianity fixes
    torvalds committed Jul 6, 2010
  8. @torvalds

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

    …t/brodo/pcmcia-2.6
    
    * 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
      pcmcia: do not initialize the present flag too late.
    torvalds committed Jul 6, 2010
  9. @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: (22 commits)
      MIPS: Return after handling coprocessor 2 exception
      MIPS: BCM47xx: Add NVRAM support devices
      MIPS: Loongson: Define rtc device on MC146818-equipped systems
      MIPS: MT: Fix FPU affinity.
      MIPS: Oprofile: Fixup of loongson2_exit()
      MIPS: Alchemy: sleepcode without compile-time cputype dependencies
      MIPS: Tracing: Cleanup of address space checking
      MIPS: Tracing: Cleanup of function graph tracer
      MIPS: Tracing: Reduce the overhead of dynamic Function Tracer
      MIPS: Tracing: Cleanup of instructions used
      MIPS: Tracing: Fix 32-bit support with -mmcount-ra-address
      MIPS: Tracing: Fix argument passing of the 32bit support with gcc 4.5
      MIPS: Tracing: Cleanup comments
      MIPS: Tracing: Cleanup the arguments passing of prepare_ftrace_return
      MIPS: Tracing: Merge adjacent #ifdefs with same condition.
      MIPS: AR7, BCM63xx: fix gpio_to_irq() return value
      MIPS: Restore signalling NaN behaviour for abs.[sd]
      MIPS: Loongson: CS5536: Fix ISA support
      MIPS: Loongson: Add a missing break statement in CS5536 IDE code
      MIPS: Loongson: CS5536: Add missing RDMSRs for IDE and USB
      ...
    torvalds committed Jul 6, 2010
  10. @michal42 @torvalds

    kbuild: Fix path to scripts/setlocalversion

    Commit 0a564b2 broke LOCALVERSION for O=... builds. Ouch.
    
    Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
    Reported-and-tested-by: Rafael J. Wysocki <rjw@sisk.pl>
    Reported-by: Peter Anvin <hpa@zytor.com>
    Signed-off-by: Michal Marek <mmarek@suse.cz>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    michal42 committed with torvalds Jul 5, 2010
Commits on Jul 5, 2010
  1. @liewegas

    ceph: fix crush device 'out' threshold to 1.0, not 0.1

    Fix a typo that made any OSD weighted between 0.1 and 1.0 effectively
    weighted as 1.0 (fully in).
    
    Signed-off-by: Sage Weil <sage@newdream.net>
    liewegas committed Jul 5, 2010
  2. @ralfbaechle

    MIPS: Return after handling coprocessor 2 exception

    Breaking here dropped us to the default code which always sends a SIGILL
    to the current process, no matter what the CU2 notifier says.
    
    [Ralf: Currently this only hurts on Cavium and possibly some out of tree
    platforms.]
    
    Signed-off-by: Jesper Nilsson <jesper@jni.nu>
    To: linux-mips@linux-mips.org
    To: linux-kernel@vger.kernel.org
    Patchwork: http://patchwork.linux-mips.org/patch/1391/
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    Jesper Nilsson committed with ralfbaechle Jun 17, 2010
  3. @ralfbaechle

    MIPS: BCM47xx: Add NVRAM support devices

    When trying to netboot a Linksys WRT54GS WLAN router, the bootup fails,
    because of following error message:
    
    ...
    [    0.424000] b44: b44.c:v2.0
    [    0.424000] b44: Invalid MAC address found in EEPROM
    [    0.432000] b44 ssb0:1: Problem fetching invariants of chip,aborting
    [    0.436000] b44: probe of ssb0:1 failed with error -22
    ...
    
    The router uses a CFE bootloader, but most of the needed environment
    variables for network card initialization, are not available from CFE
    via printenv and even though not via cfe_getenv().
    The required environment variables are saved in a special partition
    in flash memory. The attached patch implement nvram_getenv and enables
    bootup via NFS root on my router.
    
    Most of the patch is extracted from the OpenWrt subversion repository and
    stripped down and cleaned up to just fix this issue.
    
    [Ralf: sorted out header file inclusions.  Lots of unneded headers and such
    that should have been included.]
    
    Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
    Reviewed-by: Phil Sutter <phil@nwl.cc>
    To: linux-mips@linux-mips.org
    Cc: Hauke Mehrtens <hauke@hauke-m.de>
    Patchwork: http://patchwork.linux-mips.org/patch/1359/
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    Waldemar Brodkorb committed with ralfbaechle Jun 8, 2010
  4. @ralfbaechle

    MIPS: Loongson: Define rtc device on MC146818-equipped systems

    This patch declare the rtc device present on systems with clock compatible
    with the mc146818 and handled by rtc-cmos.  Introduce a new Kconfig entry
    because there are some systems without rtc_cmos compatible clock.
    
    Signed-off-by: Arnaud Patard <apatard@mandriva.com>
    To: linux-mips@linux-mips.org
    Cc: aba@not.so.argh.org
    Patchwork: http://patchwork.linux-mips.org/patch/1320/
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    Arnaud Patard committed with ralfbaechle Jun 2, 2010
  5. @ralfbaechle

    MIPS: MT: Fix FPU affinity.

    The fragile MT sys_sched_setaffinity wrapper needs its regular dose of
    fixes.
    
    Nose-poked-at-pile-o-crap-by: Julia Lawall <julia@diku.dk>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    ralfbaechle committed May 29, 2010
  6. @lzufalcon @ralfbaechle

    MIPS: Oprofile: Fixup of loongson2_exit()

    When exiting from loongson2_exit(), we need to reset the counter
    register too, this patch adds a function reset_counters() to do it, by
    the way, this function will be shared by Perf.
    
    Signed-off-by: Wu Zhangjin <wuzhangjin@gmail.com>
    Cc: linux-mips@linux-mips.org
    Patchwork: http://patchwork.linux-mips.org/patch/1199/
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    lzufalcon committed with ralfbaechle May 7, 2010
  7. @ralfbaechle

    MIPS: Alchemy: sleepcode without compile-time cputype dependencies

    Split the low-level sleepcode into per-cpu functions instead of
    relying on compile-time-defined cpu type.
    
    Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com>
    To: Linux-MIPS <linux-mips@linux-mips.org>
    Patchwork: http://patchwork.linux-mips.org/patch/1281/
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    Manuel Lauss committed with ralfbaechle May 24, 2010
  8. @lzufalcon @ralfbaechle

    MIPS: Tracing: Cleanup of address space checking

    This patch adds an inline function in_module() to check which space the
    instruction pointer in, kernel space or module space.
    
    Note:  This will not work when the kernel space and module space are the
    same. If they are the same, we need to modify scripts/recordmcount.pl,
    ftrace_make_nop/call() and the other related parts to ensure the
    enabling/disabling of the calling site to _mcount is right for both
    kernel and module.
    
    [Ralf: It also is still incorrect for some 64-bit kernels.]
    
    Signed-off-by: Wu Zhangjin <wuzhangjin@gmail.com>
    Cc: linux-mips <linux-mips@linux-mips.org>
    Cc: David Daney <david.s.daney@gmail.com>
    Patchwork: http://patchwork.linux-mips.org/patch/1232/
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    lzufalcon committed with ralfbaechle May 14, 2010
  9. @lzufalcon @ralfbaechle

    MIPS: Tracing: Cleanup of function graph tracer

    Cleans up comments and ftrace_get_parent_addr() of function graph tracer.
    
    Signed-off-by: Wu Zhangjin <wuzhangjin@gmail.com>
    Cc: linux-mips <linux-mips@linux-mips.org>
    Cc: David Daney <david.s.daney@gmail.com>
    Patchwork: http://patchwork.linux-mips.org/patch/1231/
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    lzufalcon committed with ralfbaechle May 14, 2010
  10. @lzufalcon @ralfbaechle

    MIPS: Tracing: Reduce the overhead of dynamic Function Tracer

    With the help of uasm this patch encodes the instructions of the dynamic
    function tracer in ftrace_dyn_arch_init() when initializing it.
    
    As a result we can remove the dynamic encoding of instructions in
    ftrace_make_nop()/call(), ftrace_enable_ftrace_graph_caller() and remove
    the macro jump_insn_encode() and at last this reduce the overhead of
    dynamic Function Tracer.  This also is cleaner.
    
    Signed-off-by: Wu Zhangjin <wuzhangjin@gmail.com>
    Cc: linux-mips <linux-mips@linux-mips.org>
    Cc: David Daney <david.s.daney@gmail.com>
    Patchwork: http://patchwork.linux-mips.org/patch/1230/
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    lzufalcon committed with ralfbaechle May 14, 2010
  11. @lzufalcon @ralfbaechle

    MIPS: Tracing: Cleanup of instructions used

    This patch adds some cleanups of the instructions:
      o use macros instead of magic numbers
      o use macros instead of variables to reduce some overhead
      o add new macro for the jal instruction
    
    Signed-off-by: Wu Zhangjin <wuzhangjin@gmail.com>
    Cc: linux-mips <linux-mips@linux-mips.org>
    Cc: David Daney <david.s.daney@gmail.com>
    Patchwork: http://patchwork.linux-mips.org/patch/1229/
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    lzufalcon committed with ralfbaechle May 14, 2010
  12. @lzufalcon @ralfbaechle

    MIPS: Tracing: Fix 32-bit support with -mmcount-ra-address

    For 32-bit kernel the -mmcount-ra-address option of gcc 4.5 emits one
    extra instruction before calling to _mcount so we need to use a different
    "b 1f" for it.
    
    Signed-off-by: Wu Zhangjin <wuzhangjin@gmail.com>
    Cc: linux-mips <linux-mips@linux-mips.org>
    Cc: David Daney <david.s.daney@gmail.com>
    Patchwork: http://patchwork.linux-mips.org/patch/1228/
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    lzufalcon committed with ralfbaechle May 14, 2010
  13. @lzufalcon @ralfbaechle

    MIPS: Tracing: Fix argument passing of the 32bit support with gcc 4.5

    As documented in the GCC 4.5 docs [1] -mmcount-ra-address uses register
    $12 to pass the stack offset of the return address to the _mcount function.
    On 64-bit kernels $12 is t0 but in 32-bit kernels it is t4 so we need to
    use $12 instead of t0 here to be correct for both kernel types.
    
    [1] GCC documentation: MIPS Options
    http://gcc.gnu.org/onlinedocs/gcc/MIPS-Options.html
    
    Signed-off-by: Wu Zhangjin <wuzhangjin@gmail.com>
    Cc: linux-mips <linux-mips@linux-mips.org>
    Cc: David Daney <david.s.daney@gmail.com>
    Patchwork: http://patchwork.linux-mips.org/patch/1227/
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    lzufalcon committed with ralfbaechle May 14, 2010
  14. @lzufalcon @ralfbaechle

    MIPS: Tracing: Cleanup comments

    Signed-off-by: Wu Zhangjin <wuzhangjin@gmail.com>
    Cc: linux-mips <linux-mips@linux-mips.org>
    Cc: David Daney <david.s.daney@gmail.com>
    Patchwork: http://patchwork.linux-mips.org/patch/1225/
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    lzufalcon committed with ralfbaechle May 14, 2010
  15. @lzufalcon @ralfbaechle

    MIPS: Tracing: Cleanup the arguments passing of prepare_ftrace_return

    Signed-off-by: Wu Zhangjin <wuzhangjin@gmail.com>
    Cc: linux-mips <linux-mips@linux-mips.org>
    Cc: David Daney <david.s.daney@gmail.com>
    Patchwork: http://patchwork.linux-mips.org/patch/1226/
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    lzufalcon committed with ralfbaechle May 14, 2010
  16. @lzufalcon @ralfbaechle

    MIPS: Tracing: Merge adjacent #ifdefs with same condition.

    Signed-off-by: Wu Zhangjin <wuzhangjin@gmail.com>
    Cc: linux-mips <linux-mips@linux-mips.org>
    Cc: David Daney <david.s.daney@gmail.com>
    Patchwork: http://patchwork.linux-mips.org/patch/1224/
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    lzufalcon committed with ralfbaechle May 14, 2010
  17. @ralfbaechle

    MIPS: AR7, BCM63xx: fix gpio_to_irq() return value

    The return value of gpio_to_irq() is not a pointer but an integer.
    
    Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org>
    Cc: linux-mips <linux-mips@linux-mips.org>
    Patchwork: http://patchwork.linux-mips.org/patch/1280/
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    Yoichi Yuasa committed with ralfbaechle May 24, 2010
  18. @chrisdearman @ralfbaechle

    MIPS: Restore signalling NaN behaviour for abs.[sd]

    Atsushi Nemoto <anemo@mba.ocn.ne.jp> spotted that this had been incorrectly
    removed in a previous patch
    
    Signed-off-by: Chris Dearman <chris@mips.com>
    To: linux-mips@linux-mips.org
    Patchwork: http://patchwork.linux-mips.org/patch/1213/
    Tested-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    chrisdearman committed with ralfbaechle May 11, 2010
  19. @lzufalcon @ralfbaechle

    MIPS: Loongson: CS5536: Fix ISA support

    The function _wrmsr() called by divil_lbar_disable()/enable() should be
    called with the offset as the argument.
    
    Signed-off-by: Wu Zhangjin <wuzhangjin@gmail.com>
    Cc: linux-mips@linux-mips.org
    Cc: Zhang Le <r0bertz@gentoo.org>
    Patchwork: http://patchwork.linux-mips.org/patch/1252/
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    lzufalcon committed with ralfbaechle May 19, 2010
  20. @lzufalcon @ralfbaechle

    MIPS: Loongson: Add a missing break statement in CS5536 IDE code

    Signed-off-by: Wu Zhangjin <wuzhangjin@gmail.com>
    Cc: linux-mips@linux-mips.org
    Cc: Zhang Le <r0bertz@gentoo.org>
    Cc: Hu Hongbing <huhb@lemote.com>
    Patchwork: http://patchwork.linux-mips.org/patch/1251/
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    lzufalcon committed with ralfbaechle May 19, 2010
  21. @lzufalcon @ralfbaechle

    MIPS: Loongson: CS5536: Add missing RDMSRs for IDE and USB

    Add several missing RDMSRs for IDE and USB are missing to avoid the
    agressive modification of the high 32 bits of the MSR.
    
    Without this patch some usb devices may fail after printing "reset ehci
    host ....." when reading the partition information.
    
    Signed-off-by: Hu Hongbing <huhb@lemote.com>
    Signed-off-by: Wu Zhangjin <wuzhangjin@gmail.com>
    Cc: linux-mips@linux-mips.org
    Cc: Zhang Le <r0bertz@gentoo.org>
    Cc: Hu Hongbing <huhb@lemote.com>
    Patchwork: http://patchwork.linux-mips.org/patch/1250/
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    lzufalcon committed with ralfbaechle May 19, 2010
  22. @ffainelli @ralfbaechle

    MIPS: AR7: Fix typo in ar7.h

    This fixes a typo on the AR7_RESET_PERIPHERAL define.
    
    Signed-off-by: Florian Fainelli <florian@openwrt.org>
    To: linux-mips@linux-mips.org
    Patchwork: http://patchwork.linux-mips.org/patch/1247/
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    ffainelli committed with ralfbaechle May 16, 2010
  23. @ffainelli @ralfbaechle

    MIPS: AR7: Use correct UART port type

    PORT_AR7 has the correct TRIG flag (UART_FCR_R_TRIG_00) as well as
    UART_CAP_AFE being set. This fixes UART on TNETD7300 revision 0x02,
    which would otherwise mangle some characters, no side effects on
    other revisions.
    
    Signed-off-by: Florian Fainelli <florian@openwrt.org>
    To: linux-mips@linux-mips.org
    Patchwork: http://patchwork.linux-mips.org/patch/1246/
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    ffainelli committed with ralfbaechle May 16, 2010
  24. rbtree: Undo augmented trees performance damage and regression

    Reimplement augmented RB-trees without sprinkling extra branches
    all over the RB-tree code (which lives in the scheduler hot path).
    
    This approach is 'borrowed' from Fabio's BFQ implementation and
    relies on traversing the rebalance path after the RB-tree-op to
    correct the heap property for insertion/removal and make up for
    the damage done by the tree rotations.
    
    For insertion the rebalance path is trivially that from the new
    node upwards to the root, for removal it is that from the deepest
    node in the path from the to be removed node that will still
    be around after the removal.
    
    [ This patch also fixes a video driver regression reported by
      Ali Gholami Rudi - the memtype->subtree_max_end was updated
      incorrectly. ]
    
    Acked-by: Suresh Siddha <suresh.b.siddha@intel.com>
    Acked-by: Venkatesh Pallipadi <venki@google.com>
    Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Tested-by: Ali Gholami Rudi <ali@rudi.ir>
    Cc: Fabio Checconi <fabio@gandalf.sssup.it>
    Cc: "H. Peter Anvin" <hpa@zytor.com>
    Cc: Andrew Morton <akpm@linux-foundation.org>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    LKML-Reference: <1275414172.27810.27961.camel@twins>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Peter Zijlstra committed with Ingo Molnar May 29, 2010
  25. pcmcia: do not initialize the present flag too late.

    The "present" flag was initialized too late -- possibly, a card
    was already registered at this time, so re-setting the flag to 0
    caused pcmcia_dev_present() to fail.
    
    Reported-by: Mikulas Patocka <mpatocka@redhat.com>
    Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
    Dominik Brodowski committed Jun 19, 2010