Doug / smarc-fsl-linux-kernel

01 May, 2011

9 commits

16 Apr, 2011

6 commits

15 Apr, 2011

25 commits

  • 5853b4f06   Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block ... Browse Code »

    * 'for-linus' of git://git.kernel.dk/linux-2.6-block:
    block: only force kblockd unplugging from the schedule() path
    block: cleanup the block plug helper functions
    block, blk-sysfs: Use the variable directly instead of a function call
    block: move queue run on unplug to kblockd
    block: kill queue_sync_plugs()
    block: readd plug trace event
    block: add callback function for unplug notification
    block: add comment on why we save and disable interrupts in flush_plug_list()
    block: fixup block IO unplug trace call
    block: remove block_unplug_timer() trace point
    block: splice plug list to local context

    Linus Torvalds
     
  • a970f5d51   Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6 ... Browse Code »

    * 'linux-next' of git://git.infradead.org/ubifs-2.6:
    UBIFS: fix compilation warnings when compiling with gcc 4.5
    UBIFS: fix oops when R/O file-system is fsync'ed

    Linus Torvalds
     
  • 7ebfa57f6   vfs: fix incorrect dentry_update_name_case() BUG_ON() test ... Browse Code »

    The case we should be verifying when updating the dentry name is that
    the _parent_ inode (the directory) semaphore is held, not the semaphore
    for the dentry itself. It's the directory locking that rename and
    readdir() etc all care about.

    The comment just above even says so - but then the BUG_ON() still
    checked the dentry inode itself.

    Very few people noticed, because this helper function really isn't used
    for very much, so you had to be using ncpfs to ever hit it.

    I think I should just remove the BUG_ON (the function really has just
    one user), but let's run with it fixed for a while before getting rid of
    it entirely.

    Reported-and-tested-by: Bongani Hlope
    Reported-and-tested-by: Bernd Feige
    Cc: Petr Vandrovec ,
    Cc: Arnd Bergmann
    Cc: Christoph Hellwig
    Cc: Nick Piggin
    Signed-off-by: Linus Torvalds

    Linus Torvalds
     
  • f6603783f   block: only force kblockd unplugging from the schedule() path ... Browse Code »

    For the explicit unplugging, we'd prefer to kick things off
    immediately and not pay the penalty of the latency to switch
    to kblockd. So let blk_finish_plug() do the run inline, while
    the implicit-on-schedule-out unplug will punt to kblockd.

    Signed-off-by: Jens Axboe

    Jens Axboe
     
  • 88b996cd0   block: cleanup the block plug helper functions ... Browse Code »

    It's a bit of a mess currently. task->plug is being cleared
    and reset in __blk_finish_plug(), and blk_finish_plug() is
    testing for a NULL plug which cannot happen even from schedule()
    anymore since it uses blk_needs_flush_plug() to determine
    whether to call into this function at all.

    So get rid of some of the cruft.

    Signed-off-by: Jens Axboe

    Christoph Hellwig
     
  • e38f5b745   Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin ... Browse Code »

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin:
    Blackfin: SMP: fix cache flush loop
    Blackfin: time-ts: ack gptimer sooner to avoid missing short ints
    Blackfin: gptimers: fix thinko when disabling timers
    Blackfin: SMP: make all barriers handle cache issues

    Linus Torvalds
     
  • e6d283183   Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client ... Browse Code »

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
    libceph: fix linger request requeueing

    Linus Torvalds
     
  • e27e6151b   mm/thp: use conventional format for boolean attributes ... Browse Code »

    The conventional format for boolean attributes in sysfs is numeric ("0" or
    "1" followed by new-line). Any boolean attribute can then be read and
    written using a generic function. Using the strings "yes [no]", "[yes]
    no" (read), "yes" and "no" (write) will frustrate this.

    [akpm@linux-foundation.org: use kstrtoul()]
    [akpm@linux-foundation.org: test_bit() doesn't return 1/0, per Neil]
    Signed-off-by: Ben Hutchings
    Cc: Andrea Arcangeli
    Cc: Mel Gorman
    Cc: Johannes Weiner
    Cc: Rik van Riel
    Cc: Hugh Dickins
    Tested-by: David Rientjes
    Cc: NeilBrown
    Cc: [2.6.38.x]
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Ben Hutchings
     
  • b836aec53   ramfs: fix memleak on no-mmu arch ... Browse Code »

    On no-mmu arch, there is a memleak during shmem test. The cause of this
    memleak is ramfs_nommu_expand_for_mapping() added page refcount to 2
    which makes iput() can't free that pages.

    The simple test file is like this:

    int main(void)
    {
    int i;
    key_t k = ftok("/etc", 42);

    for ( i=0; i free
    total used free shared buffers
    Mem: 60320 17912 42408 0 0
    -/+ buffers: 17912 42408
    root:/> shmem
    run ok...
    root:/> free
    total used free shared buffers
    Mem: 60320 19096 41224 0 0
    -/+ buffers: 19096 41224
    root:/> shmem
    run ok...
    root:/> free
    total used free shared buffers
    Mem: 60320 20296 40024 0 0
    -/+ buffers: 20296 40024
    ...

    After this patch the test result is:(no memleak anymore)

    root:/> free
    total used free shared buffers
    Mem: 60320 16668 43652 0 0
    -/+ buffers: 16668 43652
    root:/> shmem
    run ok...
    root:/> free
    total used free shared buffers
    Mem: 60320 16668 43652 0 0
    -/+ buffers: 16668 43652

    Signed-off-by: Bob Liu
    Acked-by: Hugh Dickins
    Signed-off-by: David Howells
    Cc:
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Bob Liu
     
  • 084189a88   um: disable CONFIG_CMPXCHG_LOCAL ... Browse Code »

    Commit 8a5ec0ba "Lockless (and preemptless) fastpaths for slub" makes use
    of this_cpu_cmpxchg_double() which needs this_cpu_cmpxchg16b_emu() on
    x86_64. Implementing cmpxchg16b emulation for UML would introduce too
    much complexity. So just disable it.

    Signed-off-by: Richard Weinberger
    Reported-by: Sergei Trofimovich
    Acked-by: Pekka Enberg
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Richard Weinberger
     
  • 6d56dad3a   um: fix call tracer and bug handler ... Browse Code »

    Commit 1de1502c ("x86, um: now we can get rid of trivial uml headers")
    removed accidentally bug.h which broke UML's call tracer and bug
    handler.

    Without asm-generic/bug.h UML uses BUG() from arch/x86/ which makes use
    of ud2. UML cannot use ud2, it raises SIGILL in user mode. As UML has
    a different stack for handling signals the call trace will be cut off.

    Signed-off-by: Richard Weinberger
    Reported-by: Sergei Trofimovich
    Tested-by: Sergei Trofimovich
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Richard Weinberger
     
  • ed5afeaf4   fs/fhandle.c: add <linux/personality.h> for ia64 ... Browse Code »

    force_o_largefile() on ia64 is defined in and requires
    .

    Signed-off-by: Jeff Mahoney
    Cc: Aneesh Kumar K.V
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jeff Mahoney
     
  • 6a534c9d2   MAINTAINERS: change mail adress of Hans J. Koch ... Browse Code »

    My old mail address doesn't exist anymore. This patch changes all
    occurences in MAINTAINERS to my new address.

    Signed-off-by: Hans J. Koch
    Cc: Joe Perches
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Hans J. Koch
     
  • 59f999655   RapidIO/mpc85xx: fix possible mport registration problems ... Browse Code »

    Fix a possible problem with mport registration left non-cleared after
    fsl_rio_setup() exits on link error. Abort mport initialization if
    registration failed.

    This patch is applicable to 2.6.39-rc1 only. The problem does not exist
    for earlier versions.

    Signed-off-by: Alexandre Bounine
    Cc: Kumar Gala
    Cc: Matt Porter
    Cc: Li Yang
    Cc: Thomas Moll
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Alexandre Bounine
     
  • 13209c2a5   RapidIO: add IDT CPS-1432 switch definitions ... Browse Code »

    Signed-off-by: Alexandre Bounine
    Cc: Matt Porter
    Cc: Kumar Gala
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Alexandre Bounine
     
  • 341aea2bc   oom-kill: remove boost_dying_task_prio() ... Browse Code »

    This is an almost-revert of commit 93b43fa ("oom: give the dying task a
    higher priority").

    That commit dramatically improved oom killer logic when a fork-bomb
    occurs. But I've found that it has nasty corner case. Now cpu cgroup has
    strange default RT runtime. It's 0! That said, if a process under cpu
    cgroup promote RT scheduling class, the process never run at all.

    If an admin inserts a !RT process into a cpu cgroup by setting
    rtruntime=0, usually it runs perfectly because a !RT task isn't affected
    by the rtruntime knob. But if it promotes an RT task via an explicit
    setscheduler() syscall or an OOM, the task can't run at all. In short,
    the oom killer doesn't work at all if admins are using cpu cgroup and don't
    touch the rtruntime knob.

    Eventually, kernel may hang up when oom kill occur. I and the original
    author Luis agreed to disable this logic.

    Signed-off-by: KOSAKI Motohiro
    Acked-by: Luis Claudio R. Goncalves
    Acked-by: KAMEZAWA Hiroyuki
    Reviewed-by: Minchan Kim
    Acked-by: David Rientjes
    Cc:
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    KOSAKI Motohiro
     
  • 929bea7c7   vmscan: all_unreclaimable() use zone->all_unreclaimable as a name ... Browse Code »

    all_unreclaimable check in direct reclaim has been introduced at 2.6.19
    by following commit.

    2006 Sep 25; commit 408d8544; oom: use unreclaimable info

    And it went through strange history. firstly, following commit broke
    the logic unintentionally.

    2008 Apr 29; commit a41f24ea; page allocator: smarter retry of
    costly-order allocations

    Two years later, I've found obvious meaningless code fragment and
    restored original intention by following commit.

    2010 Jun 04; commit bb21c7ce; vmscan: fix do_try_to_free_pages()
    return value when priority==0

    But, the logic didn't works when 32bit highmem system goes hibernation
    and Minchan slightly changed the algorithm and fixed it .

    2010 Sep 22: commit d1908362: vmscan: check all_unreclaimable
    in direct reclaim path

    But, recently, Andrey Vagin found the new corner case. Look,

    struct zone {
    ..
    int all_unreclaimable;
    ..
    unsigned long pages_scanned;
    ..
    }

    zone->all_unreclaimable and zone->pages_scanned are neigher atomic
    variables nor protected by lock. Therefore zones can become a state of
    zone->page_scanned=0 and zone->all_unreclaimable=1. In this case, current
    all_unreclaimable() return false even though zone->all_unreclaimabe=1.

    This resulted in the kernel hanging up when executing a loop of the form

    1. fork
    2. mmap
    3. touch memory
    4. read memory
    5. munmmap

    as described in
    http://www.gossamer-threads.com/lists/linux/kernel/1348725#1348725

    Is this ignorable minor issue? No. Unfortunately, x86 has very small dma
    zone and it become zone->all_unreclamble=1 easily. and if it become
    all_unreclaimable=1, it never restore all_unreclaimable=0. Why? if
    all_unreclaimable=1, vmscan only try DEF_PRIORITY reclaim and
    a-few-lru-pages>>DEF_PRIORITY always makes 0. that mean no page scan at
    all!

    Eventually, oom-killer never works on such systems. That said, we can't
    use zone->pages_scanned for this purpose. This patch restore
    all_unreclaimable() use zone->all_unreclaimable as old. and in addition,
    to add oom_killer_disabled check to avoid reintroduce the issue of commit
    d1908362 ("vmscan: check all_unreclaimable in direct reclaim path").

    Reported-by: Andrey Vagin
    Signed-off-by: KOSAKI Motohiro
    Cc: Nick Piggin
    Reviewed-by: Minchan Kim
    Reviewed-by: KAMEZAWA Hiroyuki
    Acked-by: David Rientjes
    Cc:
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    KOSAKI Motohiro
     
  • fe936dfc2   mm: check that we have the right vma in __access_remote_vm() ... Browse Code »

    In __access_remote_vm() we need to check that we have found the right
    vma, not the following vma before we try to access it. Otherwise we
    might call the vma's access routine with an address which does not fall
    inside the vma.

    It was discovered on a current kernel but with an unreleased driver,
    from memory it was strace leading to a kernel bad access, but it
    obviously depends on what the access implementation does.

    Looking at other access implementations I only see:

    $ git grep -A 5 vm_operations|grep access
    arch/powerpc/platforms/cell/spufs/file.c- .access = spufs_mem_mmap_access,
    arch/x86/pci/i386.c- .access = generic_access_phys,
    drivers/char/mem.c- .access = generic_access_phys
    fs/sysfs/bin.c- .access = bin_access,

    The spufs one looks like it might behave badly given the wrong vma, it
    assumes vma->vm_file->private_data is a spu_context, and looks like it
    would probably blow up pretty quickly if it wasn't.

    generic_access_phys() only uses the vma to check vm_flags and get the
    mm, and then walks page tables using the address. So it should bail on
    the vm_flags check, or at worst let you access some other VM_IO mapping.

    And bin_access() just proxies to another access implementation.

    Signed-off-by: Michael Ellerman
    Reviewed-by: KOSAKI Motohiro
    Cc: Hugh Dickins
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Michael Ellerman
     
  • 4471a675d   brk: COMPAT_BRK: fix detection of randomized brk ... Browse Code »

    5520e89 ("brk: fix min_brk lower bound computation for COMPAT_BRK")
    tried to get the whole logic of brk randomization for legacy
    (libc5-based) applications finally right.

    It turns out that the way to detect whether brk has actually been
    randomized in the end or not introduced by that patch still doesn't work
    for those binaries, as reported by Geert:

    : /sbin/init from my old m68k ramdisk exists prematurely.
    :
    : Before the patch:
    :
    : | brk(0x80005c8e) = 0x80006000
    :
    : After the patch:
    :
    : | brk(0x80005c8e) = 0x80005c8e
    :
    : Old libc5 considers brk() to have failed if the return value is not
    : identical to the requested value.

    I don't like it, but currently see no better option than a bit flag in
    task_struct to catch the CONFIG_COMPAT_BRK && randomize_va_space == 2
    case.

    Signed-off-by: Jiri Kosina
    Tested-by: Geert Uytterhoeven
    Reported-by: Geert Uytterhoeven
    Cc:
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jiri Kosina
     
  • 5de1743e2   drivers/misc/sgi-gru/grufile.c: fix the wrong members of gru_chip ... Browse Code »

    Fix the wrong members and the wrong function's definition, since the
    irq_chip had changed.

    Signed-off-by: Wanlong Gao
    Cc: Jack Steiner
    Cc: Thomas Gleixner
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Wanlong Gao
     
  • fc5da22ae   tmpfs: fix off-by-one in max_blocks checks ... Browse Code »

    If you fill up a tmpfs, df was showing

    tmpfs 460800 - - - /tmp

    because of an off-by-one in the max_blocks checks. Fix it so df shows

    tmpfs 460800 460800 0 100% /tmp

    Signed-off-by: Hugh Dickins
    Cc: Tim Chen
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Hugh Dickins
     
  • d00ebeac5   MAINTAINERS: update STABLE BRANCH info ... Browse Code »

    Drop Chris Wright from STABLE maintainers. He hasn't done STABLE release
    work for quite some time.

    Signed-off-by: Randy Dunlap
    Acked-by: Chris Wright
    Cc: Greg KH
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Randy Dunlap
     
  • 81ab4201f   mm: add VM counters for transparent hugepages ... Browse Code »

    I found it difficult to make sense of transparent huge pages without
    having any counters for its actions. Add some counters to vmstat for
    allocation of transparent hugepages and fallback to smaller pages.

    Optional patch, but useful for development and understanding the system.

    Contains improvements from Andrea Arcangeli and Johannes Weiner

    [akpm@linux-foundation.org: coding-style fixes]
    [hannes@cmpxchg.org: fix vmstat_text[] entries]
    Signed-off-by: Andi Kleen
    Acked-by: Andrea Arcangeli
    Reviewed-by: KAMEZAWA Hiroyuki
    Signed-off-by: Johannes Weiner
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Andi Kleen
     
  • c897401ba   MAINTAINERS: update various tty patterns ... Browse Code »

    Commits 4a6514e6d0 ("tty: move obsolete and broken tty drivers to
    drivers/staging/tty/") and a6afd9f3e8 ("tty: move a number of tty drivers
    from drivers/char/ to drivers/tty/") moved files around.

    Update patterns and orphan some files that were moved to staging.

    Signed-off-by: Joe Perches
    Cc: Greg Kroah-Hartman
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Joe Perches
     
  • 61bc02bb2   MAINTAINERS: update m68knommu patterns ... Browse Code »

    Commit 66d857b08b ("m68k: merge m68k and m68knommu arch directories")
    moved the files around.

    Signed-off-by: Joe Perches
    Acked-by: Greg Ungerer
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Joe Perches