Permalink
Switch branches/tags
Commits on Apr 1, 2010
  1. Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/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
    torvalds committed Apr 1, 2010
  2. Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze

    * '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
      ...
    torvalds committed Apr 1, 2010
  3. Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/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
    torvalds committed Apr 1, 2010
  4. oom: fix the unsafe usage of badness() in proc_oom_score()

    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>
    utrace committed with torvalds Apr 1, 2010
  5. microblaze: Support word copying in copy_tofrom_user

    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>
    michalsimek committed Mar 22, 2010
  6. microblaze: Print early printk information to log buffer

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

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

    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>
    michalsimek committed Mar 24, 2010
  9. microblaze: Kconfig Fix - pci

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

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

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

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

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

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

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

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

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

    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>
    michalsimek committed Mar 15, 2010
  19. microblaze: uaccess: Sync strlen, strnlen, copy_to/from_user

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

    Move to generic location.
    
    Signed-off-by: Michal Simek <monstr@monstr.eu>
    michalsimek committed Mar 22, 2010
  21. microblaze: uaccess: Move functions to generic location

    noMMU and MMU use them.
    
    Signed-off-by: Michal Simek <monstr@monstr.eu>
    michalsimek committed Mar 22, 2010
  22. microblaze: uaccess: Fix put_user for noMMU

    Here is small regression on dhrystone tests and I think
    that on all benchmarking tests. It is due to better checking
    mechanism in put_user macro
    
    Signed-off-by: Michal Simek <monstr@monstr.eu>
    michalsimek committed Mar 22, 2010
  23. microblaze: uaccess: Fix get_user macro for noMMU

    Use unified version.
    
    Signed-off-by: Michal Simek <monstr@monstr.eu>
    michalsimek committed Mar 8, 2010
  24. microblaze: uaccess: fix clear_user for noMMU kernel

    Previous patches fixed only MMU version and this is the first
    patch for noMMU kernel
    
    Signed-off-by: Michal Simek <monstr@monstr.eu>
    michalsimek committed Mar 22, 2010
  25. microblaze: uaccess: Fix strncpy_from_user function

    Generic implementation for noMMU and MMU version
    
    Signed-off-by: Michal Simek <monstr@monstr.eu>
    michalsimek committed Mar 8, 2010
  26. microblaze: uaccess: fix copy_from_user macro

    copy_from_user macro also use copy_tofrom_user function
    
    Signed-off-by: Michal Simek <monstr@monstr.eu>
    michalsimek committed Mar 22, 2010
  27. microblaze: uaccess: copy_to_user unification

    noMMU and MMU kernel will use copy copy_tofrom_user
    asm implementation.
    
    Signed-off-by: Michal Simek <monstr@monstr.eu>
    michalsimek committed Mar 22, 2010
  28. microblaze: uaccess: sync put/get/clear_user macros

    Add macro description and resort.
    
    Signed-off-by: Michal Simek <monstr@monstr.eu>
    michalsimek committed Mar 22, 2010
  29. microblaze: uaccess: fix put_user and get_user macros

    Use FIXUP macros and resort them.
    
    Signed-off-by: Michal Simek <monstr@monstr.eu>
    michalsimek committed Mar 22, 2010
  30. microblaze: uaccess: fix __get_user_asm macro

    It is used __FIXUP_SECTION and __EX_TABLE_SECTION macros.
    
    Signed-off-by: Michal Simek <monstr@monstr.eu>
    michalsimek committed Mar 5, 2010
  31. microblaze: uaccess: fix clean user macro

    This is the first patch which does uaccess unification.
    I choosed to do several patches to be able to use bisect
    in future if any fault happens.
    
    Signed-off-by: Michal Simek <monstr@monstr.eu>
    michalsimek committed Mar 5, 2010
  32. microblaze: move noMMU __range_ok function to uaccess.h

    The same noMMU and MMU functions should be placed in
    one file.
    
    Signed-off-by: Michal Simek <monstr@monstr.eu>
    michalsimek committed Mar 5, 2010
  33. microblaze: Move exception_table_entry upward

    Just sort to be able remove whole block.
    
    Signed-off-by: Michal Simek <monstr@monstr.eu>
    michalsimek committed Mar 5, 2010
  34. microblaze: Remove segment.h

    I would like to use asm-generic uaccess.h where are segment
    macros defined. This is just first step.
    
    Signed-off-by: Michal Simek <monstr@monstr.eu>
    michalsimek committed Mar 5, 2010
  35. microblaze: Remove memset in free_init_pages

    We don't need to do it.
    
    Signed-off-by: Michal Simek <monstr@monstr.eu>
    michalsimek committed Mar 3, 2010