Eric Lee / smarc-fsl-linux-kernel

14 Aug, 2010

5 commits

  • 2be1f3a73   Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 ... Browse Code »

    * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
    [S390] partitions: fix build error in ibm partition detection code
    [S390] appldata: fix dev_get_stats 64 bit conversion
    [S390] wire up prlimit64 and fanotify* syscalls
    [S390] zcrypt: fix Kconfig dependencies
    [S390] sys_personality: follow u_long to unsigned int conversion
    [S390] dasd: fix format string types

    Linus Torvalds
     
  • 4b17cafaa   Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel… ... Browse Code »

    …/git/tip/linux-2.6-tip

    * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (30 commits)
    perf: Add back list_head data types
    perf ui hist browser: Fixup key bindings
    perf ui browser: Add ui_browser__show counterpart: __hide
    perf annotate: Cycle thru sorted lines with samples
    perf ui: Make SPACE work as PGDN in all browsers
    perf annotate: Sort by hottest lines in the TUI
    perf ui: Complete the breakdown of util/newt.c
    perf ui: Move hists browser to util/ui/browsers/
    perf symbols: Ignore mapping symbols on ARM
    perf ui: Move map browser to util/ui/browsers/
    perf ui: Move annotate browser to util/ui/browsers/
    perf ui: Move ui_progress routines to separate file in util/ui/
    perf ui: Move ui_helpline routines to separate file in util/ui/
    perf ui: Shorten ui_browser member names
    perf, x86: P4 PMU -- update nmi irq statistics and unmask lvt entry properly
    perf ui: Start breaking down newt.c into multiple files
    perf tui: Introduce list_head based generic ui_browser refresh routine
    perf probe: Fix memory leaks in add_perf_probe_events
    perf probe: Fix to copy the type for raw parameters
    perf report: Speed up exit path
    ...

    Linus Torvalds
     
  • 36450e9c9   Merge branch 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip ... Browse Code »

    * 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86, UV: Initialize BAU MMRs only on hubs with cpus
    x86, UV: Modularize BAU send and wait
    x86, UV: BAU broadcast to the local hub
    x86, UV: Correct BAU regular message type
    x86, UV: Remove BAU check for stay-busy
    x86, UV: Correct BAU discovery of hubs and sockets
    x86, UV: Correct BAU software acknowledge
    x86, UV: BAU structure rearranging
    x86, UV: Shorten access to BAU statistics structure
    x86, UV: Disable BAU on network congestion
    x86, UV: BAU tunables into a debugfs file
    x86, UV: Calculate BAU destination timeout

    Linus Torvalds
     
  • c029b55af   Merge branch 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip ... Browse Code »

    * 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86, asm: Use a lower case name for the end macro in atomic64_386_32.S
    x86, asm: Refactor atomic64_386_32.S to support old binutils and be cleaner
    x86: Document __phys_reloc_hide() usage in __pa_symbol()
    x86, apic: Map the local apic when parsing the MP table.

    Linus Torvalds
     
  • 960545691   x86: don't send SIGBUS for kernel page faults ... Browse Code »

    It's wrong for several reasons, but the most direct one is that the
    fault may be for the stack accesses to set up a previous SIGBUS. When
    we have a kernel exception, the kernel exception handler does all the
    fixups, not some user-level signal handler.

    Even apart from the nested SIGBUS issue, it's also wrong to give out
    kernel fault addresses in the signal handler info block, or to send a
    SIGBUS when a system call already returns EFAULT.

    Signed-off-by: Linus Torvalds

    Linus Torvalds
     

13 Aug, 2010

19 commits

12 Aug, 2010

8 commits

  • a292dfa01   parisc: fix wrong page aligned size calculation in ioremapping code ... Browse Code »

    parisc __ioremap(): fix off-by-one error in page alignment of allocation
    size for sizes where size%PAGE_SIZE==1.

    Signed-off-by: Florian Zumbiehl
    Cc: Kyle McMartin
    Acked-by: Helge Deller
    Tested-by: Helge Deller
    Cc: "James E.J. Bottomley"
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Florian Zumbiehl
     
  • 17e465034   score: fix dereference of NULL pointer in local_flush_tlb_page() ... Browse Code »

    Don't dereference vma if it's NULL.

    Signed-off-by: Roel Kluin
    Cc: Chen Liqin
    Cc: Lennox Wu
    Cc: Arnd Bergmann
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Roel Kluin
     
  • 417484d47   x86, asm: Use a lower case name for the end macro in atomic64_386_32.S ... Browse Code »

    Use a lowercase name for the end macro, which somehow fixes a binutils 2.16
    problem.

    Signed-off-by: Luca Barbieri
    LKML-Reference:
    Signed-off-by: H. Peter Anvin

    Luca Barbieri
     
  • 5272a7534   CRIS: Define io_remap_pfn_range as remap_pfn_range ... Browse Code »

    CRIS don't need any special mapping for io, but didn't define this,
    meaning that all uses of io_remap_pfn_range lead to compile errors.

    This fixes a compile error introduced in CRIS when drivers/mtd/mtdchar.c
    mmap handling was changed in commit dd02b67d5e9e7896891fa27eb5db65f55a290998

    Signed-off-by: Jesper Nilsson

    Jesper Nilsson
     
  • 30246557a   x86, asm: Refactor atomic64_386_32.S to support old binutils and be cleaner ... Browse Code »

    The old code didn't work on binutils 2.12 because setting a symbol to
    a register apparently requires a fairly recent version.

    This commit refactors the code to use the C preprocessor instead, and
    in the process makes the whole code a bit easier to understand.

    The object code produced is unchanged as expected.

    This fixes kernel bugzilla 16506.

    Reported-by: Dieter Stussy
    Signed-off-by: Luca Barbieri
    Signed-off-by: H. Peter Anvin
    Cc: 2.6.35
    LKML-Reference:

    Luca Barbieri
     
  • 5af568cbd   Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 ... Browse Code »

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
    isofs: Fix lseek() to position beyond 4 GB
    vfs: remove unused MNT_STRICTATIME
    vfs: show unreachable paths in getcwd and proc
    vfs: only add " (deleted)" where necessary
    vfs: add prepend_path() helper
    vfs: __d_path: dont prepend the name of the root dentry
    ia64: perfmon: add d_dname method
    vfs: add helpers to get root and pwd
    cachefiles: use path_get instead of lone dget
    fs/sysv/super.c: add support for non-PDP11 v7 filesystems
    V7: Adjust sanity checks for some volumes
    Add v7 alias
    v9fs: fixup for inode_setattr being removed

    Manual merge to take Al's version of the fs/sysv/super.c file: it merged
    cleanly, but Al had removed an unnecessary header include, so his side
    was better.

    Linus Torvalds
     
  • 946880fa2   Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6 ... Browse Code »

    * '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
     
  • 636d17427   Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm ... Browse Code »

    * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (226 commits)
    ARM: 6323/1: cam60: don't use __init for cam60_spi_{flash_platform_data,partitions}
    ARM: 6324/1: cam60: move cam60_spi_devices to .init.data
    ARM: 6322/1: imx/pca100: Fix name of spi platform data
    ARM: 6321/1: fix syntax error in main Kconfig file
    ARM: 6297/1: move U300 timer to dynamic clock lookup
    ARM: 6296/1: clock U300 intcon and timer properly
    ARM: 6295/1: fix U300 apb_pclk split
    ARM: 6306/1: fix inverted MMC card detect in U300
    ARM: 6299/1: errata: TLBIASIDIS and TLBIMVAIS operations can broadcast a faulty ASID
    ARM: 6294/1: etm: do a dummy read from OSSRR during initialization
    ARM: 6292/1: coresight: add ETM management registers
    ARM: 6288/1: ftrace: document mcount formats
    ARM: 6287/1: ftrace: clean up mcount assembly indentation
    ARM: 6286/1: fix Thumb-2 decompressor broken by "Auto calculate ZRELADDR"
    ARM: 6281/1: video/imxfb.c: allow usage without BACKLIGHT_CLASS_DEVICE
    ARM: 6280/1: imx: Fix build failure when including without
    ARM: S5PV210: Fix on missing s3c-sdhci card detection method for hsmmc3
    ARM: S5P: Fix on missing S5P_DEV_FIMC in plat-s5p/Kconfig
    ARM: S5PV210: Override FIMC driver name on Aquila board
    ARM: S5PC100: enable FIMC on SMDKC100
    ...

    Fix up conflicts in arch/arm/mach-{s5pc100,s5pv210}/cpu.c due to
    different subsystem 'setname' calls, and trivial port types in
    include/linux/serial_core.h

    Linus Torvalds
     

11 Aug, 2010

8 commits

  • c7ff0d9c9   panic: keep blinking in spite of long spin timer mode ... Browse Code »

    To keep panic_timeout accuracy when running under a hypervisor, the
    current implementation only spins on long time (1 second) calls to mdelay.
    That brings a good effect, but the problem is the keyboard LEDs don't
    blink at all on that situation.

    This patch changes to call to panic_blink_enter() between every mdelay and
    keeps blinking in spite of long spin timer mode.

    The time to call to mdelay is now 100ms. Even this change will keep
    panic_timeout accuracy enough when running under a hypervisor.

    Signed-off-by: TAMUKI Shoichi
    Cc: Ben Dooks
    Cc: Russell King
    Acked-by: Dmitry Torokhov
    Cc: Anton Blanchard
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    TAMUKI Shoichi
     
  • 3b9c6c11f   dma-mapping: remove dma_is_consistent API ... Browse Code »

    Architectures implement dma_is_consistent() in different ways (some
    misinterpret the definition of API in DMA-API.txt). So it hasn't been so
    useful for drivers. We have only one user of the API in tree. Unlikely
    out-of-tree drivers use the API.

    Even if we fix dma_is_consistent() in some architectures, it doesn't look
    useful at all. It was invented long ago for some old systems that can't
    allocate coherent memory at all. It's better to export only APIs that are
    definitely necessary for drivers.

    Let's remove this API.

    Signed-off-by: FUJITA Tomonori
    Cc: James Bottomley
    Reviewed-by: Konrad Rzeszutek Wilk
    Cc:
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    FUJITA Tomonori
     
  • 7896bfa45   dma-mapping: parisc: set ARCH_DMA_MINALIGN ... Browse Code »

    Architectures that handle DMA-non-coherent memory need to set
    ARCH_DMA_MINALIGN to make sure that kmalloc'ed buffer is DMA-safe: the
    buffer doesn't share a cache with the others.

    Signed-off-by: FUJITA Tomonori
    Cc: Kyle McMartin
    Cc: Helge Deller
    Cc: James E.J. Bottomley
    Cc:
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    FUJITA Tomonori
     
  • 4565f0170   dma-mapping: unify dma_get_cache_alignment implementations ... Browse Code »

    dma_get_cache_alignment returns the minimum DMA alignment. Architectures
    defines it as ARCH_DMA_MINALIGN (formally ARCH_KMALLOC_MINALIGN). So we
    can unify dma_get_cache_alignment implementations.

    Note that some architectures implement dma_get_cache_alignment wrongly.
    dma_get_cache_alignment() should return the minimum DMA alignment. So
    fully-coherent architectures should return 1. This patch also fixes this
    issue.

    Signed-off-by: FUJITA Tomonori
    Cc:
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    FUJITA Tomonori
     
  • a6eb9fe10   dma-mapping: rename ARCH_KMALLOC_MINALIGN to ARCH_DMA_MINALIGN ... Browse Code »

    Now each architecture has the own dma_get_cache_alignment implementation.

    dma_get_cache_alignment returns the minimum DMA alignment. Architectures
    define it as ARCH_KMALLOC_MINALIGN (it's used to make sure that malloc'ed
    buffer is DMA-safe; the buffer doesn't share a cache with the others). So
    we can unify dma_get_cache_alignment implementations.

    This patch:

    dma_get_cache_alignment() needs to know if an architecture defines
    ARCH_KMALLOC_MINALIGN or not (needs to know if architecture has DMA
    alignment restriction). However, slab.h define ARCH_KMALLOC_MINALIGN if
    architectures doesn't define it.

    Let's rename ARCH_KMALLOC_MINALIGN to ARCH_DMA_MINALIGN.
    ARCH_KMALLOC_MINALIGN is used only in the internals of slab/slob/slub
    (except for crypto).

    Signed-off-by: FUJITA Tomonori
    Cc:
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    FUJITA Tomonori
     
  • daf695fca   arm: samsung: remove pixclock from several boards ... Browse Code »

    Since "s3c-fb: Automatically calculate pixel clock when none is given",
    there's no need for manually calculating the pixel clock anymore so remove
    these lines and add the correct refresh rate where appropriately.

    Signed-off-by: Maurus Cuelenaere
    Cc: Pawel Osciak
    Cc: Marek Szyprowski
    Cc: Kyungmin Park
    Cc: InKi Dae
    Cc: Ben Dooks
    Cc: Russell King
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Maurus Cuelenaere
     
  • 04ab9ef97   s3c-fb: add support for DMA channel control on S5PV210 ... Browse Code »

    S5PV210 SoCs allow enabling/disabling DMA channels per window. For a
    window to display data from framebuffer memory, its channel has to be
    enabled.

    Signed-off-by: Pawel Osciak
    Signed-off-by: Marek Szyprowski
    Signed-off-by: Kyungmin Park
    Cc: InKi Dae
    Cc: Ben Dooks
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Pawel Osciak
     
  • f5ec546f1   s3c-fb: add SHADOWCON shadow register locking support for S5PV210 ... Browse Code »

    S5PV210 allows per-window locking of register value updates from shadow
    registers.

    Signed-off-by: Pawel Osciak
    Signed-off-by: Kyungmin Park
    Cc: InKi Dae
    Cc: Ben Dooks
    Cc: Marek Szyprowski
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Pawel Osciak