23 Sep, 2010

1 commit

  • This fixes the regression caused by the commit 6fee48cd330c68
    ("dma-mapping: arm: use generic pci_set_dma_mask and
    pci_set_consistent_dma_mask").

    ARM needs to clip the dma coherent mask for dmabounce devices. This
    restores the old trick.

    Note that strictly speaking, the DMA API doesn't allow architectures to do
    such but I'm not sure it's worth adding the new API to set the dma mask
    that allows architectures to clip it.

    Reported-by: Krzysztof Halasa
    Signed-off-by: FUJITA Tomonori
    Acked-by: Russell King
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    FUJITA Tomonori
     

16 Aug, 2010

1 commit

  • * git://git.infradead.org/mtd-2.6:
    mtd/nand_ids: Fix buswidth
    mtd/m25p80: fix test for end of loop
    mtd/m25p80: retlen is never NULL
    MIPS: Fix gen_nand probe structures contents
    gen_nand: Test if nr_chips field is valid
    BFIN: Fix gen_nand probe structures contents
    nand/denali: move all hardware initialization work to denali_hw_init
    nand/denali: Add a page check in denali_read_page & denali_read_page_raw
    nand/denali: use cpu_relax() while waiting for hardware interrupt
    nand/denali: change read_status function method
    nand/denali: Fixed check patch warnings
    ARM: Fix gen_nand probe structures contents
    mtd/nand_base: fix kernel-doc warnings & typos
    nand/denali: use dev_xx debug function to replace nand_dbg_print and some printk
    nand/denali: Fixed handle ECC error bugs
    nand/denali: use iowrite32() to replace denali_write32()
    nand/denali: Fixed probe function bugs

    Linus Torvalds
     

12 Aug, 2010

2 commits

  • These three platforms didn't properly fill nr_chips in gen_nand
    registration and therefore depended on gen_nand bug fixed by commit
    81cbb0b17796d81cbd92defe113cf2a7c7a21fbb ("mtd: gen_nand: fix support for
    multiple chips")

    Signed-off-by: Marek Vasut
    Signed-off-by: David Woodhouse

    Marek Vasut
     
  • * 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6:
    IXP4xx: Fix LL debugging on little-endian CPU.
    IXP4xx: Fix sparse warnings in I/O primitives.
    IXP4xx: Make mdio_bus struct static in the Ethernet driver.
    IXP4xx: Fix ixp4xx_crypto little-endian operation.
    IXP4xx: Prevent HSS transmitter lockup by disabling FRaMe signals.
    ixp4xx/vulcan: add PCI support
    ixp4xx: base support for Arcom Vulcan

    Linus Torvalds
     

31 Jul, 2010

1 commit


27 Jul, 2010

1 commit


16 Jul, 2010

1 commit


27 May, 2010

4 commits


18 May, 2010

1 commit


15 May, 2010

1 commit


30 Mar, 2010

1 commit

  • …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
     

13 Mar, 2010

1 commit


26 Feb, 2010

2 commits


16 Feb, 2010

1 commit


13 Feb, 2010

1 commit

  • Otherwise more complicated uart configuration won't be possible.
    We can use r1 for tmp register for both head.S and debug.S.

    NOTE: This patch depends on another patch to add the the tmp register
    into all debug-macro.S files. That can be done with:

    $ sed -i -e "s/addruart,rx|addruart, rx/addruart, rx, tmp/"
    arch/arm/*/include/*/debug-macro.S

    Signed-off-by: Tony Lindgren
    Signed-off-by: Russell King

    Tony Lindgren
     

28 Jan, 2010

1 commit


05 Dec, 2009

18 commits


22 Sep, 2009

2 commits

  • The body of the mach-ixp4xx arch_idle() is mysteriously
    disabled by an #if 0 .. #endif. Normally one would expect
    to find a call to cpu_do_idle() there, but that call is
    disabled, even though cpu_do_idle() is implemented for
    XScale cores (and ixp4xx is one).

    The explanation can be found in the ixp42x developer's manual
    which states that the XScale core clock and power management
    registers aren't implemented on ixp42x [3.5.2.2].

    Also, the disabled code has suffered from bit rot:
    - it checks hlt_counter which is obsolete, as that variable
    and all related code now is private to kernel/process.c
    - it passes too many parameters to cpu_do_idle()

    So this patch:
    - adds a comment before the #if 0 to explain why
    cpu_do_idle() mustn't be called on ixp4xx
    - removes the obsolete test of hlt_counter and the
    obsolete parameter to cpu_do_idle()

    This is purely a documentation fixup and changes no
    generated code. Even so, it has been tested on an
    ixp420 machine (ds101).

    Signed-off-by: Mikael Pettersson
    Signed-off-by: Krzysztof Hałasa

    Mikael Pettersson
     
  • This patch does a few simple cleanups of the ixp4xx timer
    and clocksource/clockevent code in mach-ixp4xx/common.c:

    - ixp4xx_clocksource_init() is static and always returns 0,
    which is ignored by its only caller: make it return void
    - ixp4xx_clockevent_init(): ditto
    - ixp4xx_get_cycles() is only referenced locally: make it static
    - use the ixp4xx_timer_irq.dev_id field to pass &clockevent_ixp4xx
    to ixp4xx_timer_interrupt() via its dev_id parameter, allowing
    the code in ixp4xx_timer_interrupt() to be smaller and faster

    Tested on an ixp420 machine (ds101).

    Signed-off-by: Mikael Pettersson
    Signed-off-by: Krzysztof Hałasa

    Mikael Pettersson