1. 04 Aug, 2010 35 commits
  2. 02 Aug, 2010 2 commits
    • Michal Simek's avatar
      microblaze: Fix comment for TLB · af58ed85
      Michal Simek authored
      There is wrong comment for TLB. Early printk uartlite
      console uses TLB 63.
      Signed-off-by: default avatarMichal Simek <monstr@monstr.eu>
      af58ed85
    • Michal Simek's avatar
      microblaze: Fix __copy_to/from_user_inatomic macros · 8d7ec6ee
      Michal Simek authored
      __copy_to/from_user_inatomic should call __copy_to/from_user
      because there is not necessary to check access because of kernel function.
      
      might_sleep in copy_to/from_user macros is causing problems
      in debug sessions too (CONFIG_DEBUG_SPINLOCK_SLEEP).
      
      BUG: sleeping function called from invalid context at
      .../arch/microblaze/include/asm/uaccess.h:388
      in_atomic(): 1, irqs_disabled(): 0, pid: 1, name: swapper
      1 lock held by swapper/1:
       #0:  (&p->cred_guard_mutex){......}, at: [<c00d4b90>] prepare_bprm_creds+0x2c/0x88
      Kernel Stack:
      ...
      
      Call Trace:
      [<c0006bd4>] microblaze_unwind+0x7c/0x94
      [<c0006684>] show_stack+0xf4/0x190
      [<c0006730>] dump_stack+0x10/0x30
      [<c00103a0>] __might_sleep+0x12c/0x160
      [<c0090de4>] file_read_actor+0x1d8/0x2a8
      [<c0091568>] generic_file_aio_read+0x6b4/0xa64
      [<c00cd778>] do_sync_read+0xac/0x110
      [<c00ce254>] vfs_read+0xc8/0x160
      [<c00d585c>] kernel_read+0x38/0x64
      [<c00d5984>] prepare_binprm+0xfc/0x130
      [<c00d6430>] do_execve+0x228/0x370
      [<c000614c>] microblaze_execve+0x58/0xa4
      
      caused by file_read_actor (mm/filemap.c) which calls
      __copy_to_user_inatomic.
      Signed-off-by: default avatarMichal Simek <monstr@monstr.eu>
      8d7ec6ee
  3. 01 Aug, 2010 2 commits
  4. 31 Jul, 2010 1 commit
    • Linus Torvalds's avatar
      Merge master.kernel.org:/home/rmk/linux-2.6-arm · a63ecd83
      Linus Torvalds authored
      * master.kernel.org:/home/rmk/linux-2.6-arm:
        cyber2000fb: fix console in truecolor modes
        cyber2000fb: fix machine hang on module load
        SA1111: Eliminate use after free
        ARM: Fix Versatile/Realview/VExpress MMC card detection sense
        ARM: 6279/1: highmem: fix SMP preemption bug in kmap_high_l1_vipt
        ARM: Add barriers to io{read,write}{8,16,32} accessors as well
        ARM: 6273/1: Add barriers to the I/O accessors if ARM_DMA_MEM_BUFFERABLE
        ARM: 6272/1: Convert L2x0 to use the IO relaxed operations
        ARM: 6271/1: Introduce *_relaxed() I/O accessors
        ARM: 6275/1: ux500: don't use writeb() in uncompress.h
        ARM: 6270/1: clean files in arch/arm/boot/compressed/
        ARM: Fix csum_partial_copy_from_user()
      a63ecd83