Permalink
Switch branches/tags
Commits on Apr 3, 2010
  1. Merge master.kernel.org:/home/rmk/linux-2.6-arm

    torvalds committed Apr 3, 2010
    * master.kernel.org:/home/rmk/linux-2.6-arm:
      ARM: 5965/1: Fix soft lockup in at91 udc driver
      ARM: 6006/1: ARM: Use the correct NOP size in memmove for Thumb-2 kernel builds
      ARM: 6005/1: arm: kprobes: fix register corruption with jprobes
      ARM: 6003/1: removing compilation warning from pl061.h
      ARM: 6001/1: removing compilation warning comming from clkdev.h
      ARM: 6000/1: removing compilation warning comming from <asm/irq.h>
      ARM: 5999/1: Including device.h and resource.h header files in linux/amba/bus.h
      ARM: 5997/1: ARM: Correct the VFPv3 detection
      ARM: 5996/1: ARM: Change the mandatory barriers implementation (4/4)
      ARM: 5995/1: ARM: Add L2x0 outer_sync() support (3/4)
      ARM: 5994/1: ARM: Add outer_cache_fns.sync function pointer (2/4)
      ARM: 5993/1: ARM: Move the outer_cache definitions into a separate file (1/4)
  2. Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6

    torvalds committed Apr 3, 2010
    * 'merge' of git://git.secretlab.ca/git/linux-2.6:
      powerpc/5200: in lpbfifo, flag DMA irqs as enabled after requesting them
      powerpc/fsl: add device tree binding for QE firmware
      of/flattree: Fix unhandled OF_DT_NOP tag when unflattening the device tree
  3. Merge branch 'reiserfs/kill-bkl' of git://git.kernel.org/pub/scm/linu…

    torvalds committed Apr 3, 2010
    …x/kernel/git/frederic/random-tracing
    
    * 'reiserfs/kill-bkl' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing:
      reiserfs: Fix locking BUG during mount failure
  4. PCI quirk: RS780/RS880: disable MSI behind the PCI bridge

    cladisch authored and torvalds committed Apr 2, 2010
    The missing initialization of the nb_cntl.strap_msi_enable does not
    seem to be the only problem that prevents MSI, so that quirk is not
    sufficient to enable MSI on all machines.  To be safe, disable MSI
    unconditionally for the internal graphics and HDMI audio on these
    chipsets.
    
    [rjw: Added the PCI_VENDOR_ID_AI quirk.]
    
    Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  5. Merge branch 'kgdb-fixes' of git://git.kernel.org/pub/scm/linux/kerne…

    torvalds committed Apr 3, 2010
    …l/git/jwessel/linux-2.6-kgdb
    
    * 'kgdb-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb:
      kgdb: Turn off tracing while in the debugger
      kgdb: use atomic_inc and atomic_dec instead of atomic_set
      kgdb: eliminate kgdb_wait(), all cpus enter the same way
      kgdbts,sh: Add in breakpoint pc offset for superh
      kgdb: have ebin2mem call probe_kernel_write once
  6. Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/…

    torvalds committed Apr 3, 2010
    …git/rafael/suspend-2.6
    
    * 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
      Freezer: Fix buggy resume test for tasks frozen with cgroup freezer
      Freezer: Only show the state of tasks refusing to freeze
  7. tty: release_one_tty() forgets to put pids

    utrace authored and torvalds committed Apr 2, 2010
    release_one_tty(tty) can be called when tty still has a reference
    to pgrp/session. In this case we leak the pid.
    
    Signed-off-by: Oleg Nesterov <oleg@redhat.com>
    Reported-by: Catalin Marinas <catalin.marinas@arm.com>
    Reported-and-tested-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
    Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
    Acked-by: Eric W. Biederman <ebiederm@xmission.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Commits on Apr 2, 2010
  1. kgdb: Turn off tracing while in the debugger

    jwessel committed Apr 2, 2010
    The kernel debugger should turn off kernel tracing any time the
    debugger is active and restore it on resume.
    
    Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
    Reviewed-by: Steven Rostedt <rostedt@goodmis.org>
  2. kgdb: use atomic_inc and atomic_dec instead of atomic_set

    jwessel committed Apr 2, 2010
    Memory barriers should be used for the kgdb cpu synchronization.  The
    atomic_set() does not imply a memory barrier.
    
    Reported-by: Will Deacon <will.deacon@arm.com>
    Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
  3. kgdb: eliminate kgdb_wait(), all cpus enter the same way

    jwessel committed Apr 2, 2010
    This is a kgdb architectural change to have all the cpus (master or
    slave) enter the same function.
    
    A cpu that hits an exception (wants to be the master cpu) will call
    kgdb_handle_exception() from the trap handler and then invoke a
    kgdb_roundup_cpu() to synchronize the other cpus and bring them into
    the kgdb_handle_exception() as well.
    
    A slave cpu will enter kgdb_handle_exception() from the
    kgdb_nmicallback() and set the exception state to note that the
    processor is a slave.
    
    Previously the salve cpu would have called kgdb_wait().  This change
    allows the debug core to change cpus without resuming the system in
    order to inspect arch specific cpu information.
    
    Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
  4. kgdbts,sh: Add in breakpoint pc offset for superh

    jwessel committed Apr 2, 2010
    The kgdb test suite mimics the behavior of gdb.  For the sh
    architecture the pc must be decremented by 2 for software breakpoint.
    
    Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
    Acked-by: Paul Mundt <lethal@linux-sh.org>
  5. kgdb: have ebin2mem call probe_kernel_write once

    jwessel committed Apr 2, 2010
    Rather than call probe_kernel_write() one byte at a time, process the
    whole buffer locally and pass the entire result in one go.  This way,
    architectures that need to do special handling based on the length can
    do so, or we only end up calling memcpy() once.
    
    [sonic.zhang@analog.com: Reported original problem and preliminary patch]
    
    Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
    Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
    Signed-off-by: Mike Frysinger <vapier@gentoo.org>
  6. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds committed Apr 2, 2010
    …/git/jikos/hid
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
      HID: Add NOGET quirk for Quanta Pixart touchscreen
      HID: fix oops in gyration_event()
  7. Merge branch 'sh/for-2.6.34' of git://git.kernel.org/pub/scm/linux/ke…

    torvalds committed Apr 2, 2010
    …rnel/git/lethal/sh-2.6
    
    * 'sh/for-2.6.34' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
      sh: Fix up the SH-3 build for recent TLB changes.
      sh: export return_address() symbol.
      sh: Enable the mmu in start_secondary()
      sh: Fix FDPIC binary loader
      arch/sh/kernel: Use set_cpus_allowed_ptr
      sh: Update ecovec_defconfig
      USB gadget r8a66597-udc.c: duplicated include
      sh: update the TLB replacement counter for entry wiring.
  8. sh: Fix up the SH-3 build for recent TLB changes.

    Paul Mundt
    Paul Mundt committed Apr 2, 2010
    While the MMUCR.URB and ITLB/UTLB differentiation works fine for all SH-4
    and later TLBs, these features are absent on SH-3. This splits out
    local_flush_tlb_all() in to SH-4 and PTEAEX copies while restoring the
    old SH-3 one, subsequently fixing up the build.
    
    This will probably want some further reordering and tidying in the
    future, but that's out of scope at present.
    
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  9. sh: export return_address() symbol.

    Paul Mundt
    Paul Mundt committed Apr 2, 2010
    This is needed with some of the tracing code built as modules, so provide
    the export.
    
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Commits on Apr 1, 2010
  1. Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds committed Apr 1, 2010
    …/git/airlied/drm-2.6
    
    * 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (76 commits)
      drm/radeon/kms: enable ACPI powermanagement mode on radeon gpus.
      drm/radeon/kms: rs400/480 should set common registers.
      drm/radeon/kms: add sanity check to wptr.
      drm/radeon/kms/evergreen: get DP working
      drm/radeon/kms: add hw_i2c module option
      drm/radeon/kms: use new pre/post_xfer i2c bit algo hooks
      drm/radeon/kms: disable MSI on IGP chips
      drm/radeon/kms: display watermark updates (v2)
      drm/radeon/kms/dp: disable training pattern on the sink at the end of link training
      drm/radeon/kms: minor fixes for eDP with LCD* device tags (v2)
      drm/radeon/kms/dp: remove extraneous training complete call
      drm/radeon/kms/atom: minor fixes to transmitter setup
      drm/radeon/kms: Only restrict BO to visible VRAM size when pinning to VRAM.
      drm: fix build error when SYSRQ is disabled
      drm/radeon/kms: fix macbookpro connector quirk
      drm/radeon/r6xx/r7xx: further safe reg clean up
      drm/radeon: bump the UMS driver version for r6xx/r7xx const buffer support
      drm/radeon/kms: bump the version for r6xx/r7xx const buffer support
      drm/radeon/r6xx/r7xx: CS parser fixes
      drm/radeon/kms: fix some typos in r6xx/r7xx hpd setup
      ...
    
    Fix up MSI-related conflicts in drivers/gpu/drm/radeon/radeon_irq_kms.c
  2. Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze

    torvalds committed Apr 1, 2010
    * 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze: (35 commits)
      microblaze: Support word copying in copy_tofrom_user
      microblaze: Print early printk information to log buffer
      microblaze: head.S typo fix
      microblaze: Use MICROBLAZE_TLB_SIZE in asm code
      microblaze: Kconfig Fix - pci
      microblaze: Adding likely macros
      microblaze: Add .type and .size to ASM functions
      microblaze: Fix TLB macros
      microblaze: Use instruction with delay slot
      microblaze: Remove additional resr and rear loading
      microblaze: Change register usage for ESR and EAR
      microblaze: Prepare work for optimization in exception code
      microblaze: Add DEBUG option
      microblaze: Support systems without lmb bram
      microblaze: uaccess: Sync strlen, strnlen, copy_to/from_user
      microblaze: uaccess: Unify __copy_tofrom_user
      microblaze: uaccess: Move functions to generic location
      microblaze: uaccess: Fix put_user for noMMU
      microblaze: uaccess: Fix get_user macro for noMMU
      microblaze: uaccess: fix clear_user for noMMU kernel
      ...
  3. Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds committed Apr 1, 2010
    …/git/mjg59/platform-drivers-x86
    
    * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86:
      eeepc-wmi: new driver for WMI based hotkeys on Eee PC laptops
      asus-laptop: fix warning in asus_handle_init
  4. oom: fix the unsafe usage of badness() in proc_oom_score()

    utrace authored and torvalds committed Apr 1, 2010
    proc_oom_score(task) has a reference to task_struct, but that is all.
    If this task was already released before we take tasklist_lock
    
    	- we can't use task->group_leader, it points to nowhere
    
    	- it is not safe to call badness() even if this task is
    	  ->group_leader, has_intersects_mems_allowed() assumes
    	  it is safe to iterate over ->thread_group list.
    
    	- even worse, badness() can hit ->signal == NULL
    
    Add the pid_alive() check to ensure __unhash_process() was not called.
    
    Also, use "task" instead of task->group_leader. badness() should return
    the same result for any sub-thread. Currently this is not true, but
    this should be changed anyway.
    
    Signed-off-by: Oleg Nesterov <oleg@redhat.com>
    Cc: stable@kernel.org
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  5. microblaze: Support word copying in copy_tofrom_user

    michalsimek committed Mar 22, 2010
    Word copying is used only for aligned addresses.
    Here is space for improving to use any better copying technique.
    Look at memcpy implementation.
    
    Signed-off-by: Michal Simek <monstr@monstr.eu>
  6. microblaze: Print early printk information to log buffer

    michalsimek committed Mar 24, 2010
    If early printk console is not enabled then all messages
    are written to log buffer.
    
    Signed-off-by: Michal Simek <monstr@monstr.eu>
  7. microblaze: head.S typo fix

    michalsimek committed Mar 24, 2010
    I forget to change register name in comments.
    
    Signed-off-by: Michal Simek <monstr@monstr.eu>
  8. microblaze: Use MICROBLAZE_TLB_SIZE in asm code

    michalsimek committed Mar 24, 2010
    TLB size was hardcoded in asm code. This patch brings ability
    to change TLB size only in one place. (mmu.h).
    
    Signed-off-by: Michal Simek <monstr@monstr.eu>
  9. microblaze: Kconfig Fix - pci

    michalsimek committed Mar 23, 2010
    I forget to remove pci Kconfig option.
    
    Signed-off-by: Michal Simek <monstr@monstr.eu>
  10. microblaze: Adding likely macros

    michalsimek committed Mar 23, 2010
    On the base on GCOV analytics is helpful to add likely/unlikely
    macros.
    
    Signed-off-by: Michal Simek <monstr@monstr.eu>
  11. microblaze: Add .type and .size to ASM functions

    michalsimek committed Mar 23, 2010
    Cachegrind analysis need this fix to be able to log asm functions.
    
    Signed-off-by: Michal Simek <monstr@monstr.eu>
  12. microblaze: Fix TLB macros

    michalsimek committed Mar 22, 2010
    To be able to do trace TLB operations.
    
    Signed-off-by: Michal Simek <monstr@monstr.eu>
  13. microblaze: Use instruction with delay slot

    michalsimek committed Mar 22, 2010
    Sync labels.
    
    Signed-off-by: Michal Simek <monstr@monstr.eu>
  14. microblaze: Remove additional resr and rear loading

    michalsimek committed Mar 19, 2010
    RESR and REAR uses the same regs in whole file.
    
    Signed-off-by: Michal Simek <monstr@monstr.eu>
  15. microblaze: Change register usage for ESR and EAR

    michalsimek committed Mar 19, 2010
    This change synchronize register usage in code.
    ESR = R4
    EAR = R3
    
    Signed-off-by: Michal Simek <monstr@monstr.eu>
  16. microblaze: Prepare work for optimization in exception code

    michalsimek committed Mar 22, 2010
    Any sync branch must follow mts instructions not mfs.
    
    Signed-off-by: Michal Simek <monstr@monstr.eu>
  17. microblaze: Add DEBUG option

    michalsimek committed Mar 18, 2010
    Disable debug option in asm code.
    
    Signed-off-by: Michal Simek <monstr@monstr.eu>
  18. microblaze: Support systems without lmb bram

    michalsimek committed Mar 15, 2010
    When the system has no lmb bram, main memory should be start from
    zero because of microblaze vectors.
    
    DTS fragment could look like:
    	DDR2_SDRAM: memory@0 {
    		device_type = "memory";
    		reg = < 0x0 0x10000000 >;
    	} ;
    
    Then you have to setup CONFIG_KERNEL_BASE_ADDR=0 which caused
    that kernel physical start address will be zero. On reset vector place
    will be jump to 0x100 and on 0x100 starts kernel text.
    
    You have to solve how to load the kernel before cpu starts.
    Tested with XMD.
    
    Signed-off-by: Michal Simek <monstr@monstr.eu>
  19. microblaze: uaccess: Sync strlen, strnlen, copy_to/from_user

    michalsimek committed Mar 22, 2010
    Last sync.
    
    Signed-off-by: Michal Simek <monstr@monstr.eu>