Doug / smarc-fsl-linux-kernel

17 Jul, 2012

1 commit

23 Apr, 2012

1 commit

  • b637a6b16   m68k/mm: Port OOM changes to do_page_fault() ... Browse Code »

    Commit d065bd810b6deb67d4897a14bfe21f8eb526ba99
    (mm: retry page fault when blocking on disk transfer) and
    commit 37b23e0525d393d48a7d59f870b3bc061a30ccdb
    (x86,mm: make pagefault killable)

    The above commits introduced changes into the x86 pagefault handler
    for making the page fault handler retryable as well as killable.

    These changes reduce the mmap_sem hold time, which is crucial
    during OOM killer invocation.

    Port these changes to m68k.

    Signed-off-by: Kautuk Consul
    Signed-off-by: Geert Uytterhoeven

    Kautuk Consul
     

29 Mar, 2012

1 commit

07 Feb, 2012

1 commit

27 Jan, 2012

1 commit

22 Jan, 2012

1 commit

30 Dec, 2011

6 commits

24 Dec, 2011

1 commit

  • e87c09a89   m68k: print memory layout info in boot log ... Browse Code »

    Output a table of the kernel memory regions at boot time.
    This is taken directly from the ARM architecture code that does this.
    The table looks like this:

    Virtual kernel memory layout:
    vector : 0x00000000 - 0x00000400 ( 0 KiB)
    kmap : 0xd0000000 - 0xe0000000 ( 256 MiB)
    vmalloc : 0xc0000000 - 0xcfffffff ( 255 MiB)
    lowmem : 0x00000000 - 0x02000000 ( 32 MiB)
    .init : 0x00128000 - 0x00134000 ( 48 KiB)
    .text : 0x00020000 - 0x00118d54 ( 996 KiB)
    .data : 0x00118d60 - 0x00126000 ( 53 KiB)
    .bss : 0x00134000 - 0x001413e0 ( 53 KiB)

    This has been very useful while debugging the ColdFire virtual memory
    support code. But in general I think it is nice to know extacly where
    the kernel has layed everything out on boot.

    Signed-off-by: Greg Ungerer

    Greg Ungerer
     

18 Oct, 2011

3 commits

01 Aug, 2011

1 commit

  • 968e75fc1   Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k ... Browse Code »

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
    m68k/math-emu: Remove unnecessary code
    m68k/math-emu: Remove commented out old code
    m68k: Kill warning in setup_arch() when compiling for Sun3
    m68k/atari: Prefix GPIO_{IN,OUT} with CODEC_
    sparc: iounmap() and *_free_coherent() - Use lookup_resource()
    m68k/atari: Reserve some ST-RAM early on for device buffer use
    m68k/amiga: Chip RAM - Use lookup_resource()
    resources: Add lookup_resource()
    sparc: _sparc_find_resource() should check for exact matches
    m68k/amiga: Chip RAM - Offset resource end by CHIP_PHYSADDR
    m68k/amiga: Chip RAM - Use resource_size() to fix off-by-one error
    m68k/amiga: Chip RAM - Change chipavail to an atomic_t
    m68k/amiga: Chip RAM - Always allocate from the start of memory
    m68k/amiga: Chip RAM - Convert from printk() to pr_*()
    m68k/amiga: Chip RAM - Use tabs for indentation

    Linus Torvalds
     

31 Jul, 2011

1 commit

  • 217bbd818   m68k/atari: Reserve some ST-RAM early on for device buffer use ... Browse Code »

    Based on an original patch from Michael Schmitz:

    Because mem_init() is now called before device init, devices that rely on
    ST-RAM may find all ST-RAM already allocated to other users by the time
    device init happens. In particular, a large initrd RAM disk may use up
    enough of ST-RAM to cause atari_stram_alloc() to resort to
    __get_dma_pages() allocation.

    In the current state of Atari memory management, all of RAM is marked
    DMA capable, so __get_dma_pages() may well return RAM that is not in actual
    fact DMA capable. Using this for frame buffer or SCSI DMA buffer causes
    subtle failure.

    The ST-RAM allocator has been changed to allocate memory from a pool of
    reserved ST-RAM of configurable size, set aside on ST-RAM init (i.e.
    before mem_init()). As long as this pool is not exhausted, allocation of
    real ST-RAM can be guaranteed.

    Other changes:
    - Replace the custom allocator in the ST-RAM pool by the existing allocator
    in the resource subsystem,
    - Remove mem_init_done and its hook, as memory init is now done before
    device init,
    - Remove /proc/stram, as ST-RAM usage now shows up under /proc/iomem, e.g.

    005f2000-006f1fff : ST-RAM Pool
    005f2000-0063dfff : atafb
    0063e000-00641fff : ataflop
    00642000-00642fff : SCSI

    Signed-off-by: Michael Schmitz
    [Andreas Schwab : Use memparse()]
    [Geert: Use the resource subsystem instead of a custom allocator]
    Signed-off-by: Geert Uytterhoeven

    Michael Schmitz
     

25 Jul, 2011

2 commits

25 May, 2011

1 commit

  • 1c3951769   mm: now that all old mmu_gather code is gone, remove the storage ... Browse Code »

    Fold all the mmu_gather rework patches into one for submission

    Signed-off-by: Peter Zijlstra
    Reported-by: Hugh Dickins
    Cc: Benjamin Herrenschmidt
    Cc: David Miller
    Cc: Martin Schwidefsky
    Cc: Russell King
    Cc: Paul Mundt
    Cc: Jeff Dike
    Cc: Richard Weinberger
    Cc: Tony Luck
    Cc: KAMEZAWA Hiroyuki
    Cc: Mel Gorman
    Cc: KOSAKI Motohiro
    Cc: Nick Piggin
    Cc: Namhyung Kim
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Peter Zijlstra
     

24 May, 2011

5 commits

27 Apr, 2011

1 commit

  • 4aac0b481   m68k/mm: Set all online nodes in N_NORMAL_MEMORY ... Browse Code »

    For m68k, N_NORMAL_MEMORY represents all nodes that have present memory
    since it does not support HIGHMEM. This patch sets the bit at the time
    node_present_pages has been set by free_area_init_node.
    At the time the node is brought online, the node state would have to be
    done unconditionally since information about present memory has not yet
    been recorded.

    If N_NORMAL_MEMORY is not accurate, slub may encounter errors since it
    uses this nodemask to setup per-cache kmem_cache_node data structures.

    This pach is an alternative to the one proposed by David Rientjes
    attempting to set node state immediately when
    bringing the node online.

    Signed-off-by: Michael Schmitz
    Tested-by: Thorsten Glaser
    Signed-off-by: Geert Uytterhoeven
    CC: stable@kernel.org

    Michael Schmitz
     

25 Mar, 2011

1 commit

  • 66d857b08   m68k: merge m68k and m68knommu arch directories ... Browse Code »

    There is a lot of common code that could be shared between the m68k
    and m68knommu arch branches. It makes sense to merge the two branches
    into a single directory structure so that we can more easily share
    that common code.

    This is a brute force merge, based on a script from Stephen King
    , which was originally written by Arnd Bergmann
    .

    > The script was inspired by the script Sam Ravnborg used to merge the
    > includes from m68knommu. For those files common to both arches but
    > differing in content, the m68k version of the file is renamed to
    > _mm. and the m68knommu version of the file is moved into the
    > corresponding m68k directory and renamed _no. and a small
    > wrapper file . is used to select between the two version. Files
    > that are common to both but don't differ are removed from the m68knommu
    > tree and files and directories that are unique to the m68knommu tree are
    > moved to the m68k tree. Finally, the arch/m68knommu tree is removed.
    >
    > To select between the the versions of the files, the wrapper uses
    >
    > #ifdef CONFIG_MMU
    > #include _mm.
    > #else
    > #include _no.
    > #endif

    On top of this file merge I have done a simplistic merge of m68k and
    m68knommu Kconfig, which primarily attempts to keep existing options and
    menus in place. Other than a handful of options being moved it produces
    identical .config outputs on m68k and m68knommu targets I tested it on.

    With this in place there is now quite a bit of scope for merge cleanups
    in future patches.

    Signed-off-by: Greg Ungerer

    Greg Ungerer
     

17 Mar, 2011

1 commit

18 May, 2010

1 commit

  • adbf6e695   m68k: invoke oom-killer from page fault ... Browse Code »

    As explained in commit 1c0fe6e3bd, we want to call the architecture independent
    oom killer when getting an unexplained OOM from handle_mm_fault, rather than
    simply killing current.

    Cc: linux-m68k@lists.linux-m68k.org
    Cc: Geert Uytterhoeven
    Cc: linux-arch@vger.kernel.org
    Signed-off-by: Nick Piggin
    Acked-by: David Rientjes
    [Geert] Kill 2 introduced compiler warnings
    Signed-off-by: Geert Uytterhoeven

    Nick Piggin
     

30 Mar, 2010

1 commit

  • 5a0e3ad6a   include cleanup: Update gfp.h and slab.h includes to prepare for breaking implic… ... Browse Code »

    …it slab.h inclusion from percpu.h

    percpu.h is included by sched.h and module.h and thus ends up being
    included when building most .c files. percpu.h includes slab.h which
    in turn includes gfp.h making everything defined by the two files
    universally available and complicating inclusion dependencies.

    percpu.h -> slab.h dependency is about to be removed. Prepare for
    this change by updating users of gfp and slab facilities include those
    headers directly instead of assuming availability. As this conversion
    needs to touch large number of source files, the following script is
    used as the basis of conversion.

    http://userweb.kernel.org/~tj/misc/slabh-sweep.py

    The script does the followings.

    * Scan files for gfp and slab usages and update includes such that
    only the necessary includes are there. ie. if only gfp is used,
    gfp.h, if slab is used, slab.h.

    * When the script inserts a new include, it looks at the include
    blocks and try to put the new include such that its order conforms
    to its surrounding. It's put in the include block which contains
    core kernel includes, in the same order that the rest are ordered -
    alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
    doesn't seem to be any matching order.

    * If the script can't find a place to put a new include (mostly
    because the file doesn't have fitting include block), it prints out
    an error message indicating which .h file needs to be added to the
    file.

    The conversion was done in the following steps.

    1. The initial automatic conversion of all .c files updated slightly
    over 4000 files, deleting around 700 includes and adding ~480 gfp.h
    and ~3000 slab.h inclusions. The script emitted errors for ~400
    files.

    2. Each error was manually checked. Some didn't need the inclusion,
    some needed manual addition while adding it to implementation .h or
    embedding .c file was more appropriate for others. This step added
    inclusions to around 150 files.

    3. The script was run again and the output was compared to the edits
    from #2 to make sure no file was left behind.

    4. Several build tests were done and a couple of problems were fixed.
    e.g. lib/decompress_*.c used malloc/free() wrappers around slab
    APIs requiring slab.h to be added manually.

    5. The script was run on all .h files but without automatically
    editing them as sprinkling gfp.h and slab.h inclusions around .h
    files could easily lead to inclusion dependency hell. Most gfp.h
    inclusion directives were ignored as stuff from gfp.h was usually
    wildly available and often used in preprocessor macros. Each
    slab.h inclusion directive was examined and added manually as
    necessary.

    6. percpu.h was updated not to include slab.h.

    7. Build test were done on the following configurations and failures
    were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
    distributed build env didn't work with gcov compiles) and a few
    more options had to be turned off depending on archs to make things
    build (like ipr on powerpc/64 which failed due to missing writeq).

    * x86 and x86_64 UP and SMP allmodconfig and a custom test config.
    * powerpc and powerpc64 SMP allmodconfig
    * sparc and sparc64 SMP allmodconfig
    * ia64 SMP allmodconfig
    * s390 SMP allmodconfig
    * alpha SMP allmodconfig
    * um on x86_64 SMP allmodconfig

    8. percpu.h modifications were reverted so that it could be applied as
    a separate patch and serve as bisection point.

    Given the fact that I had only a couple of failures from tests on step
    6, I'm fairly confident about the coverage of this conversion patch.
    If there is a breakage, it's likely to be something in one of the arch
    headers which should be easily discoverable easily on most builds of
    the specific arch.

    Signed-off-by: Tejun Heo <tj@kernel.org>
    Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
    Cc: Ingo Molnar <mingo@redhat.com>
    Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>

    Tejun Heo
     

28 Feb, 2010

2 commits

22 Sep, 2009

1 commit

  • cc013a889   arches: drop superfluous casts in nr_free_pages() callers ... Browse Code »

    Commit 96177299416dbccb73b54e6b344260154a445375 ("Drop free_pages()")
    modified nr_free_pages() to return 'unsigned long' instead of 'unsigned
    int'. This made the casts to 'unsigned long' in most callers superfluous,
    so remove them.

    [akpm@linux-foundation.org: coding-style fixes]
    Signed-off-by: Geert Uytterhoeven
    Reviewed-by: Christoph Lameter
    Acked-by: Ingo Molnar
    Acked-by: Russell King
    Acked-by: David S. Miller
    Acked-by: Kyle McMartin
    Acked-by: WANG Cong
    Cc: Richard Henderson
    Cc: Ivan Kokshaysky
    Cc: Haavard Skinnemoen
    Cc: Mikael Starvik
    Cc: "Luck, Tony"
    Cc: Hirokazu Takata
    Cc: Ralf Baechle
    Cc: David Howells
    Acked-by: Benjamin Herrenschmidt
    Cc: Martin Schwidefsky
    Cc: Paul Mundt
    Cc: Chris Zankel
    Cc: Michal Simek
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Geert Uytterhoeven
     

22 Jun, 2009

1 commit

  • d06063cc2   Move FAULT_FLAG_xyz into handle_mm_fault() callers ... Browse Code »

    This allows the callers to now pass down the full set of FAULT_FLAG_xyz
    flags to handle_mm_fault(). All callers have been (mechanically)
    converted to the new calling convention, there's almost certainly room
    for architectures to clean up their code and then add FAULT_FLAG_RETRY
    when that support is added.

    Signed-off-by: Linus Torvalds

    Linus Torvalds
     

13 Jan, 2009

1 commit

15 Oct, 2008

1 commit

  • 79aa79bac   arch/m68k/mm/kmap.c: introduce missing kfree ... Browse Code »

    Error handling code following a kmalloc should free the allocated data.

    The semantic match that finds the problem is as follows:
    (http://www.emn.fr/x-info/coccinelle/)

    //
    @r exists@
    local idexpression x;
    statement S;
    expression E;
    identifier f,l;
    position p1,p2;
    expression *ptr != NULL;
    @@

    (
    if ((x@p1 = \(kmalloc\|kzalloc\|kcalloc\)(...)) == NULL) S
    |
    x@p1 = \(kmalloc\|kzalloc\|kcalloc\)(...);
    ..
    if (x == NULL) S
    )
    }
    x->f = E
    ..>
    (
    return \(0\|\|ptr\);
    |
    return@p2 ...;
    )

    @script:python@
    p1 << r.p1;
    p2 << r.p2;
    @@

    print "* file: %s kmalloc %s return %s" % (p1[0].file,p1[0].line,p2[0].line)
    //

    Signed-off-by: Julia Lawall
    Signed-off-by: Geert Uytterhoeven
    Signed-off-by: Linus Torvalds

    Julia Lawall
     

27 Jul, 2008

1 commit

  • 969eefb51   m68k: use generic show_mem() ... Browse Code »

    Remove arch-specific show_mem() in favor of the generic version.

    This also removes the following redundant information display:

    - free pages, printed by show_free_areas()
    - pages in swapcache, printed by show_swap_cache_info()

    where show_mem() calls show_free_areas(), which calls
    show_swap_cache_info().

    Signed-off-by: Johannes Weiner
    Acked-by: Geert Uytterhoeven
    Cc: Roman Zippel
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Johannes Weiner
     

25 Jul, 2008

2 commits

  • 9109fb7b3   mm: drop unneeded pgdat argument from free_area_init_node() ... Browse Code »

    free_area_init_node() gets passed in the node id as well as the node
    descriptor. This is redundant as the function can trivially get the node
    descriptor itself by means of NODE_DATA() and the node's id.

    I checked all the users and NODE_DATA() seems to be usable everywhere
    from where this function is called.

    Signed-off-by: Johannes Weiner
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Johannes Weiner
     
  • b61bfa3c4   mm: move bootmem descriptors definition to a single place ... Browse Code »

    There are a lot of places that define either a single bootmem descriptor or an
    array of them. Use only one central array with MAX_NUMNODES items instead.

    Signed-off-by: Johannes Weiner
    Acked-by: Ralf Baechle
    Cc: Ingo Molnar
    Cc: Richard Henderson
    Cc: Russell King
    Cc: Tony Luck
    Cc: Hirokazu Takata
    Cc: Geert Uytterhoeven
    Cc: Kyle McMartin
    Cc: Paul Mackerras
    Cc: Paul Mundt
    Cc: David S. Miller
    Cc: Yinghai Lu
    Cc: Christoph Lameter
    Cc: Mel Gorman
    Cc: Andy Whitcroft
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Johannes Weiner