Eric Lee / smarc-fsl-linux-kernel

08 Aug, 2010

1 commit

22 Jul, 2010

1 commit

  • 95977d0ef   Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 ... Browse Code »

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
    math-emu: correct test for downshifting fraction in _FP_FROM_INT()
    perf: Add DWARF register lookup for sparc
    MAINTAINERS: Add SBUS driver path to sparc entry.
    drivers/sbus: Remove unnecessary casts of private_data
    sparc: remove homegrown L1_CACHE_ALIGN macro
    sparc64: fix the build error due to smp_kgdb_capture_client()
    sparc64: Fix maybe_change_configuration() PCR setting.
    arch/sparc/kernel: Eliminate what looks like a NULL pointer dereference
    sparc64: Update defconfig.
    sunsu: Fix use after free in su_remove().
    sunserial: Don't call add_preferred_console() when console= is specified.
    sparc32: Kill none_mask, it's bogus.

    Linus Torvalds
     

14 Jul, 2010

1 commit

  • 95f72d1ed   lmb: rename to memblock ... Browse Code »

    via following scripts

    FILES=$(find * -type f | grep -vE 'oprofile|[^K]config')

    sed -i \
    -e 's/lmb/memblock/g' \
    -e 's/LMB/MEMBLOCK/g' \
    $FILES

    for N in $(find . -name lmb.[ch]); do
    M=$(echo $N | sed 's/lmb/memblock/g')
    mv $N $M
    done

    and remove some wrong change like lmbench and dlmb etc.

    also move memblock.c from lib/ to mm/

    Suggested-by: Ingo Molnar
    Acked-by: "H. Peter Anvin"
    Acked-by: Benjamin Herrenschmidt
    Acked-by: Linus Torvalds
    Signed-off-by: Yinghai Lu
    Signed-off-by: Benjamin Herrenschmidt

    Yinghai Lu
     

29 Jun, 2010

1 commit

27 Jun, 2010

1 commit

26 Jun, 2010

1 commit

24 Jun, 2010

1 commit

05 Jun, 2010

1 commit

  • 0d0659c78   arch/sparc/kernel: Eliminate what looks like a NULL pointer dereference ... Browse Code »

    At the point of the test, action cannot be NULL, as it has been dereferenced
    in the code just above.

    A simplified version of the semantic match that finds this problem is as
    follows: (http://coccinelle.lip6.fr/)

    //
    @r exists@
    expression E,E1;
    identifier f;
    statement S1,S2,S3;
    @@

    if ((E == NULL && ...) || ...)
    {
    ... when != if (...) S1 else S2
    when != E = E1
    * E->f
    ... when any
    }
    else S3
    //

    Signed-off-by: Julia Lawall
    Signed-off-by: David S. Miller

    Julia Lawall
     

01 Jun, 2010

1 commit

  • 1f7389786   Merge branch 'for-35' of git://repo.or.cz/linux-kbuild ... Browse Code »

    * 'for-35' of git://repo.or.cz/linux-kbuild: (81 commits)
    kbuild: Revert part of e8d400a to resolve a conflict
    kbuild: Fix checking of scm-identifier variable
    gconfig: add support to show hidden options that have prompts
    menuconfig: add support to show hidden options which have prompts
    gconfig: remove show_debug option
    gconfig: remove dbg_print_ptype() and dbg_print_stype()
    kconfig: fix zconfdump()
    kconfig: some small fixes
    add random binaries to .gitignore
    kbuild: Include gen_initramfs_list.sh and the file list in the .d file
    kconfig: recalc symbol value before showing search results
    .gitignore: ignore *.lzo files
    headerdep: perlcritic warning
    scripts/Makefile.lib: Align the output of LZO
    kbuild: Generate modules.builtin in make modules_install
    Revert "kbuild: specify absolute paths for cscope"
    kbuild: Do not unnecessarily regenerate modules.builtin
    headers_install: use local file handles
    headers_check: fix perl warnings
    export_report: fix perl warnings
    ...

    Linus Torvalds
     

28 May, 2010

4 commits

  • c5617b200   Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/… ... Browse Code »

    …git/tip/linux-2.6-tip

    * 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (61 commits)
    tracing: Add __used annotation to event variable
    perf, trace: Fix !x86 build bug
    perf report: Support multiple events on the TUI
    perf annotate: Fix up usage of the build id cache
    x86/mmiotrace: Remove redundant instruction prefix checks
    perf annotate: Add TUI interface
    perf tui: Remove annotate from popup menu after failure
    perf report: Don't start the TUI if -D is used
    perf: Fix getline undeclared
    perf: Optimize perf_tp_event_match()
    perf: Remove more code from the fastpath
    perf: Optimize the !vmalloc backed buffer
    perf: Optimize perf_output_copy()
    perf: Fix wakeup storm for RO mmap()s
    perf-record: Share per-cpu buffers
    perf-record: Remove -M
    perf: Ensure that IOC_OUTPUT isn't used to create multi-writer buffers
    perf, trace: Optimize tracepoints by using per-tracepoint-per-cpu hlist to track events
    perf, trace: Optimize tracepoints by removing IRQ-disable from perf/tracepoint interaction
    perf tui: Allow disabling the TUI on a per command basis in ~/.perfconfig
    ...

    Linus Torvalds
     
  • 1ef04370d   asm-generic: remove ARCH_HAS_SG_CHAIN in scatterlist.h ... Browse Code »

    There are more architectures that don't support ARCH_HAS_SG_CHAIN than
    those that support it. This removes removes ARCH_HAS_SG_CHAIN in
    asm-generic/scatterlist.h and lets arhictectures to define it.

    It's clearer than defining ARCH_HAS_SG_CHAIN asm-generic/scatterlist.h and
    undefing it in arhictectures that don't support it.

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

    FUJITA Tomonori
     
  • 18e98307d   asm-generic: add NEED_SG_DMA_LENGTH to define sg_dma_len() ... Browse Code »

    There are only two ways to define sg_dma_len(); use sg->dma_length or
    sg->length. This patch introduces NEED_SG_DMA_LENGTH that enables
    architectures to choose sg->dma_length or sg->length.

    Signed-off-by: FUJITA Tomonori
    Cc: Arnd Bergmann
    Cc: Richard Henderson
    Cc: Ivan Kokshaysky
    Cc: Matt Turner
    Cc: Russell King
    Cc: Benjamin Herrenschmidt
    Cc: Paul Mackerras
    Cc: Ingo Molnar
    Cc: Thomas Gleixner
    Cc: "H. Peter Anvin"
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    FUJITA Tomonori
     
  • 204f3a044   asm-generic: remove ISA_DMA_THRESHOLD in scatterlist.h ... Browse Code »

    This is the first half of the attempt to use asm-generic/scatterlist.h
    on every architecture.

    There are only two ways to define scatterlist structure. So it's easy
    to convert every architecture to use asm-generic/scatterlist.h.

    This patch:

    The trick for ISA_DMA_THRESHOLD in asm-generic/scatterlist.h doesn't work
    for powerpc. This lets architectures defin ISA_DMA_THRESHOLD.

    Hopefully, we can remove ISA_DMA_THRESHOLD in the future; we can do better
    to decide if the bouncing is necessary or not.

    Signed-off-by: FUJITA Tomonori
    Cc: Arnd Bergmann
    Cc: Richard Henderson
    Cc: Ivan Kokshaysky
    Cc: Matt Turner
    Cc: Russell King
    Cc: Benjamin Herrenschmidt
    Cc: Paul Mackerras
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    FUJITA Tomonori
     

27 May, 2010

1 commit

26 May, 2010

2 commits

  • 13da9e200   Revert "endian: #define __BYTE_ORDER" ... Browse Code »

    This reverts commit b3b77c8caef1750ebeea1054e39e358550ea9f55, which was
    also totally broken (see commit 0d2daf5cc858 that reverted the crc32
    version of it). As reported by Stephen Rothwell, it causes problems on
    big-endian machines:

    > In file included from fs/jfs/jfs_types.h:33,
    > from fs/jfs/jfs_incore.h:26,
    > from fs/jfs/file.c:22:
    > fs/jfs/endian24.h:36:101: warning: "__LITTLE_ENDIAN" is not defined

    The kernel has never had that crazy "__BYTE_ORDER == __LITTLE_ENDIAN"
    model. It's not how we do things, and it isn't how we _should_ do
    things. So don't go there.

    Requested-by: Stephen Rothwell
    Signed-off-by: Linus Torvalds

    Linus Torvalds
     
  • c87fe1c05   sparc32: Kill none_mask, it's bogus. ... Browse Code »

    For some reason, the pte_none() calculation for srmmu sparc32
    chips was masking out the top 4 bits. That doesn't make any
    sense, as those are just some of the physical bits of the PTE
    encoding.

    Furthermore, this mistake breaks things when the offset of of a swap
    entry has a large enough offset as reported by Тхай Кирилл.

    Sun4c always set it to zero, so it's really completely useless,
    kill it.

    Reported-by: Тхай Кирилл
    Signed-off-by: David S. Miller

    David S. Miller
     

25 May, 2010

1 commit

  • b3b77c8ca   endian: #define __BYTE_ORDER ... Browse Code »

    Linux does not define __BYTE_ORDER in its endian header files which makes
    some header files bend backwards to get at the current endian. Lets
    #define __BYTE_ORDER in big_endian.h/litte_endian.h to make it easier for
    header files that are used in user space too.

    In userspace the convention is that

    1. _both_ __LITTLE_ENDIAN and __BIG_ENDIAN are defined,
    2. you have to test for e.g. __BYTE_ORDER == __BIG_ENDIAN.

    Signed-off-by: Joakim Tjernlund
    Cc: Geert Uytterhoeven
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Joakim Tjernlund
     

22 May, 2010

2 commits

  • cf9b59e9d   Merge remote branch 'origin' into secretlab/next-devicetree ... Browse Code »

    Merging in current state of Linus' tree to deal with merge conflicts and
    build failures in vio.c after merge.

    Conflicts:
    drivers/i2c/busses/i2c-cpm.c
    drivers/i2c/busses/i2c-mpc.c
    drivers/net/gianfar.c

    Also fixed up one line in arch/powerpc/kernel/vio.c to use the
    correct node pointer.

    Signed-off-by: Grant Likely

    Grant Likely
     
  • 4018294b5   of: Remove duplicate fields from of_platform_driver ... Browse Code »

    .name, .match_table and .owner are duplicated in both of_platform_driver
    and device_driver. This patch is a removes the extra copies from struct
    of_platform_driver and converts all users to the device_driver members.

    This patch is a pretty mechanical change. The usage model doesn't change
    and if any drivers have been missed, or if anything has been fixed up
    incorrectly, then it will fail with a compile time error, and the fixup
    will be trivial. This patch looks big and scary because it touches so
    many files, but it should be pretty safe.

    Signed-off-by: Grant Likely
    Acked-by: Sean MacLennan

    Grant Likely
     

21 May, 2010

2 commits

  • c75fbb05b   kgdb,sparc: Add in kgdb_arch_set_pc for sparc ... Browse Code »

    The new debug core api requires all architectures that use to debug
    core to implement a function to set the program counter.

    Signed-off-by: Jason Wessel
    Acked-by: David S. Miller

    Jason Wessel
     
  • f39d01be4   Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial ... Browse Code »

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (44 commits)
    vlynq: make whole Kconfig-menu dependant on architecture
    add descriptive comment for TIF_MEMDIE task flag declaration.
    EEPROM: max6875: Header file cleanup
    EEPROM: 93cx6: Header file cleanup
    EEPROM: Header file cleanup
    agp: use NULL instead of 0 when pointer is needed
    rtc-v3020: make bitfield unsigned
    PCI: make bitfield unsigned
    jbd2: use NULL instead of 0 when pointer is needed
    cciss: fix shadows sparse warning
    doc: inode uses a mutex instead of a semaphore.
    uml: i386: Avoid redefinition of NR_syscalls
    fix "seperate" typos in comments
    cocbalt_lcdfb: correct sections
    doc: Change urls for sparse
    Powerpc: wii: Fix typo in comment
    i2o: cleanup some exit paths
    Documentation/: it's -> its where appropriate
    UML: Fix compiler warning due to missing task_struct declaration
    UML: add kernel.h include to signal.c
    ...

    Linus Torvalds
     

20 May, 2010

3 commits

  • dfacc4d6c   Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/fred… ... Browse Code »

    …eric/random-tracing into perf/core

    Ingo Molnar
     
  • 7d02093e2   Merge branch 'timers-for-linus-cleanups' of git://git.kernel.org/pub/scm/linux/k… ... Browse Code »

    …ernel/git/tip/linux-2.6-tip

    * 'timers-for-linus-cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    avr32: Fix typo in read_persistent_clock()
    sparc: Convert sparc to use read/update_persistent_clock
    cris: Convert cris to use read/update_persistent_clock
    m68k: Convert m68k to use read/update_persistent_clock
    m32r: Convert m32r to use read/update_peristent_clock
    blackfin: Convert blackfin to use read/update_persistent_clock
    ia64: Convert ia64 to use read/update_persistent_clock
    avr32: Convert avr32 to use read/update_persistent_clock
    h8300: Convert h8300 to use read/update_persistent_clock
    frv: Convert frv to use read/update_persistent_clock
    mn10300: Convert mn10300 to use read/update_persistent_clock
    alpha: Convert alpha to use read/update_persistent_clock
    xtensa: Fix unnecessary setting of xtime
    time: Clean up direct xtime usage in xen

    Linus Torvalds
     
  • 711f77f53   Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 ... Browse Code »

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
    sparc: Define ARCH_SLAB_MINALIGN
    drivers/sbus/char/flash.c: flash_read should update ppos instead of file->f_pos
    sparc64: Fix stack dumping and tracing when function graph is enabled.
    sparc64: Show stack backtrace from show_regs() just like other platforms.

    Linus Torvalds
     

19 May, 2010

5 commits

  • 273fca0ec   sparc: Define ARCH_SLAB_MINALIGN ... Browse Code »

    Because SLOB fancies being different, the default minimum alignment is
    only "unsigned long" instead of SLAB/SLUB where the default is
    "unsigned long long"

    The inconsistency makes no sense and is asking for trouble, but define
    ARCH_SLAB_MINALIGN to get it right in all cases even after they fix
    the inconsistency.

    Signed-off-by: David S. Miller

    David S. Miller
     
  • 58f9b0b02   of: eliminate of_device->node and dev_archdata->{of,prom}_node ... Browse Code »

    This patch eliminates the node pointer from struct of_device and the
    of_node (or prom_node) pointer from struct dev_archdata since the node
    pointer is now part of struct device proper when CONFIG_OF is set, and
    all users of the old pointer locations have already been converted over
    to use device->of_node.

    Also remove dev_archdata_{get,set}_node() as it is no longer used by
    anything.

    Signed-off-by: Grant Likely

    Grant Likely
     
  • 61c7a080a   of: Always use 'struct device.of_node' to get device node pointer. ... Browse Code »

    The following structure elements duplicate the information in
    'struct device.of_node' and so are being eliminated. This patch
    makes all readers of these elements use device.of_node instead.

    (struct of_device *)->node
    (struct dev_archdata *)->prom_node (sparc)
    (struct dev_archdata *)->of_node (powerpc & microblaze)

    Signed-off-by: Grant Likely

    Grant Likely
     
  • a13c3afd9   perf, sparc: Implement group scheduling transactional APIs ... Browse Code »

    Convert to the transactional PMU API and remove the duplication of
    group_sched_in().

    [cross build only]

    Signed-off-by: Lin Ming
    Acked-by: David Miller
    Cc: Paul Mackerras
    Signed-off-by: Peter Zijlstra
    LKML-Reference:
    Signed-off-by: Ingo Molnar

    Lin Ming
     
  • cb41838bb   Merge branch 'core-hweight-for-linus' of git://git.kernel.org/pub/scm/linux/kern… ... Browse Code »

    …el/git/tip/linux-2.6-tip

    * 'core-hweight-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86, hweight: Use a 32-bit popcnt for __arch_hweight32()
    arch, hweight: Fix compilation errors
    x86: Add optimized popcnt variants
    bitops: Optimize hweight() by making use of compile-time evaluation

    Linus Torvalds
     

17 May, 2010

1 commit

14 May, 2010

1 commit

29 Apr, 2010

1 commit

  • d706c1b05   driver-core: Add device node pointer to struct device ... Browse Code »

    Currently, platforms using CONFIG_OF add a 'struct device_node *of_node'
    to dev->archdata. However, with CONFIG_OF becoming generic for all
    architectures, it makes sense for commonality to move it out of archdata
    and into struct device proper.

    This patch adds a struct device_node *of_node member to struct device
    and updates all locations which currently write the device_node pointer
    into archdata to also update dev->of_node. Subsequent patches will
    modify callers to use the archdata location and ultimately remove
    the archdata member entirely.

    Signed-off-by: Grant Likely
    Acked-by: Greg Kroah-Hartman
    CC: Michal Simek
    CC: Greg Kroah-Hartman
    CC: Benjamin Herrenschmidt
    CC: "David S. Miller"
    CC: Stephen Rothwell
    CC: Jeremy Kerr
    CC: microblaze-uclinux@itee.uq.edu.au
    CC: linux-kernel@vger.kernel.org
    CC: linuxppc-dev@ozlabs.org
    CC: sparclinux@vger.kernel.org

    Grant Likely
     

21 Apr, 2010

2 commits

20 Apr, 2010

2 commits

19 Apr, 2010

1 commit

14 Apr, 2010

3 commits