Eric Lee / smarc-fsl-linux-kernel

06 Dec, 2010

1 commit

25 Nov, 2010

1 commit

  • 27af03849   scripts: fix gfp-translate for recent changes to gfp.h ... Browse Code »

    The recent changes to gfp.h to satisfy sparse broke scripts/gfp-translate.
    This patch fixes it up to work with old and new versions of gfp.h .

    [akpm@linux-foundation.org: use `grep -q', per WANG Cong]
    Signed-off-by: Mel Gorman
    Cc: Namhyung Kim
    Reviewed-by: WANG Cong
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Mel Gorman
     

22 Nov, 2010

2 commits

19 Nov, 2010

1 commit

  • 2b35f4d9c   kernel-doc: escape xml for structs ... Browse Code »

    scripts/kernel-doc was leaving unescaped '', and '&' in
    generated xml output for structs. This causes xml parser errors.
    Convert these characters to "<", ">", and "&" as needed
    to prevent errors.

    Most of the conversion was already done; complete it just before
    output.

    Documentation/DocBook/device-drivers.xml:41883: parser error : StartTag: invalid element name
    #define INPUT_KEYMAP_BY_INDEX (1 << 0)

    Signed-off-by: Randy Dunlap
    Signed-off-by: Linus Torvalds

    Randy Dunlap
     

02 Nov, 2010

1 commit

01 Nov, 2010

1 commit

  • 82279e6bd   Merge branches 'irq-core-for-linus' and 'core-locking-for-linus' of git://git.ke… ... Browse Code »

    …rnel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

    * 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    genirq: Fix up irq_node() for irq_data changes.
    genirq: Add single IRQ reservation helper
    genirq: Warn if enable_irq is called before irq is set up

    * 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    semaphore: Remove mutex emulation
    staging: Final semaphore cleanup
    jbd2: Convert jbd2_slab_create_sem to mutex
    hpfs: Convert sbi->hpfs_creation_de to mutex

    Fix up trivial change/delete conflicts with deleted 'dream' drivers
    (drivers/staging/dream/camera/{mt9d112.c,mt9p012_fox.c,mt9t013.c,s5k3e2fx.c})

    Linus Torvalds
     

30 Oct, 2010

4 commits

  • 4882720b2   semaphore: Remove mutex emulation ... Browse Code »

    Semaphores used as mutexes have been deprecated for years. Now that
    all users are either converted to real semaphores or to mutexes remove
    the cruft.

    Signed-off-by: Thomas Gleixner
    Cc: Peter Zijlstra
    Cc: Christoph Hellwig
    LKML-Reference:

    Thomas Gleixner
     
  • b7bdcc471   Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-kconfig ... Browse Code »

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-kconfig:
    kconfig: Have streamline_config process menuconfigs too
    kconfig: Fix streamline_config to read multi line deps in Kconfig files
    kconfig: Fix missing declaration of variable $dir in streamline_config.pl
    kconfig: Fix variable name typo %prompts in streamline_config.pl
    kconfig: Make localmodconfig handle environment variables

    Linus Torvalds
     
  • 412910cd0   ftrace/MIPS: Add module support for C version of recordmcount ... Browse Code »

    Since MIPS modules' address space differs from the core kernel space, to access
    the _mcount in the core kernel, the kernel functions in modules must use long
    call (-mlong-calls): load the _mcount address into one register and jump to the
    address stored by the register:

    c: 3c030000 lui v1,0x0 b label
    c: R_MIPS_HI16 _mcount
    c: R_MIPS_NONE *ABS*
    c: R_MIPS_NONE *ABS*
    10: 64630000 daddiu v1,v1,0
    10: R_MIPS_LO16 _mcount
    10: R_MIPS_NONE *ABS*
    10: R_MIPS_NONE *ABS*
    14: 03e0082d move at,ra
    18: 0060f809 jalr v1
    label:

    In the old Perl version of recordmcount, we only need to record the position of
    the 1st R_MIPS_HI16 type of _mcount, and later, in ftrace_make_nop(), replace
    the instruction in this position by a "b label" and in ftrace_make_call(),
    replace it back.

    But, the default C version of recordmcount records all of the _mcount symbols,
    so, we must filter the 2nd _mcount like the Perl version of recordmcount does.

    The C version of recordmcount copes with the symbols before they are linked, So
    It doesn't know the type of the symbols and therefore can not filter the
    symbols as the Perl version of recordmcount does. But as we can see above, the
    2nd _mcount symbols of the long call alawys follows the 1st _mcount symbol of
    the same long call, which means the offset from the 1st to the 2nd is fixed, it
    is 0x10-0xc = 4 here, 4 is the length of the 1st load instruciton, for MIPS has
    fixed length of instructions, this offset is always 4.

    And as we know, the _mcount is inserted into the entry of every kernel
    function, the offset between the other _mcount's is expected to be always
    bigger than 4. So, to filter the 2ns _mcount symbol of the long call, we can
    simply check the offset between two _mcount symbols, If it is 4, then, filter
    the 2nd _mcount symbol.

    To avoid touching too much code, an 'empty' function fn_is_fake_mcount() is
    added for all of the archs, and the specific archs can override it via chaning
    the function pointer: is_fake_mcount in do_file() with the e_machine. e.g. This
    patch adds MIPS_is_fake_mcount() to override the default fn_is_fake_mcount()
    pointed by is_fake_mcount.

    This fn_is_fake_mcount() checks if the _mcount symbol is fake, e.g. the 2nd
    _mcount symbol of the long call is fake, for there are 2 _mcount symbols mapped
    to one real mcount call, so, one of them is fake and must be filtered.

    This fn_is_fake_mcount() is called in sift_rel_mcount() after finding the
    _mcount symbols and before adding the _mcount symbol into mrelp, so, it can
    prevent the fake mcount symbol going into the last __mcount_loc table.

    Signed-off-by: Wu Zhangjin
    LKML-Reference:
    Signed-off-by: Steven Rostedt
    Signed-off-by: Ralf Baechle

    Wu Zhangjin
     
  • a2d49358b   ftrace/MIPS: Add MIPS64 support for C version of recordmcount ... Browse Code »

    MIPS64 has 'weird' Elf64_Rel.r_info[1,2], which must be used instead of
    the generic Elf64_Rel.r_info, otherwise, the C version of recordmcount
    will not work for "segmentation fault".

    Usage of "union mips_r_info" and the functions MIPS64_r_sym() and
    MIPS64_r_info() written by Maciej W. Rozycki

    ----
    [1] http://techpubs.sgi.com/library/manuals/4000/007-4658-001/pdf/007-4658-001.pdf
    [2] arch/mips/include/asm/module.h

    Tested-by: Wu Zhangjin
    Signed-off-by: John Reiser
    Signed-off-by: Maciej W. Rozycki
    LKML-Reference:
    LKML-Reference:
    Signed-off-by: Steven Rostedt
    Signed-off-by: Ralf Baechle

    John Reiser
     

29 Oct, 2010

10 commits

  • 8ef17fa2e   kconfig: Have streamline_config process menuconfigs too ... Browse Code »

    Some menuconfigs in the Kconfig files have prompts and dependencies.
    Currently, streamline_config misses these, and this can cause
    streamline_config to keep modules enabled that should not be, and
    even worse, not enable those that should.

    This patch makes streamline_config process menuconfigs just like it
    would process a config.

    Reported-by: member graysky
    Signed-off-by: Steven Rostedt

    Steven Rostedt
     
  • 20d190473   kconfig: Fix streamline_config to read multi line deps in Kconfig files ... Browse Code »

    I noticed that some Kconfig files have multi line dependencies
    that continue with a backslash. Those dependencies on the next
    line will be missed by streamline_config.

    For example:

    config CS89x0
    tristate "CS89x0 support"
    depends on NET_ETHERNET && (ISA || EISA || MACH_IXDP2351 \
    || ARCH_IXDP2X01 || MACH_MX31ADS)

    The "|| ARCH_IXDP2X01 || MACH_MX31ADS)" will not be processed.

    This patch adds code to handle this case.

    Signed-off-by: Steven Rostedt

    Steven Rostedt
     
  • cf5a189d4   kconfig: Fix missing declaration of variable $dir in streamline_config.pl ... Browse Code »

    On Fri, Aug 17, 2010 at 01:43PM +0800, Américo Wang wrote:
    > Acked-by: WANG Cong
    >
    > BTW, I think we should add "use strict;" too.

    Then I added "use strict;" to streamline_config.pl, I saw another
    warning.

    > Global symbol "$dir" requires explicit package name at
    scripts/kconfig/streamline_config.pl line 286.
    > Global symbol "$dir" requires explicit package name at
    scripts/kconfig/streamline_config.pl line 287.
    > Global symbol "$dir" requires explicit package name at
    scripts/kconfig/streamline_config.pl line 288.

    Then I added "my $dir;" to line 285.

    Cc: Américo Wang
    Cc: Toralf Foerster
    Cc: KAMEZAWA Hiroyuki
    Cc: YOSHIFUJI Hideaki
    Signed-off-by: Hiromu Yakura
    LKML-Reference:

    [ changed to just add my in front of $dir instead of new line ]

    Signed-off-by: Steven Rostedt

    hiromu
     
  • ccece60ac   kconfig: Fix variable name typo %prompts in streamline_config.pl ... Browse Code »

    When I added "use strict;" to streamline_config.pl, I saw the following
    warnings:

    > Global symbol "%prompt" requires explicit package name at
    scripts/kconfig/streamline_config.pl line 183.
    > Global symbol "%prompt" requires explicit package name at
    scripts/kconfig/streamline_config.pl line 368.

    The declaration of %prompt was incorrect, and should have been %prompts.

    Cc: Toralf Foerster
    Cc: KAMEZAWA Hiroyuki
    Cc: YOSHIFUJI Hideaki
    Signed-off-by: Hiromu Yakura
    LKML-Reference:
    Signed-off-by: Steven Rostedt

    hiromu yagura
     
  • 4908980b2   kconfig: Make localmodconfig handle environment variables ... Browse Code »

    The commit 838a2e55e6a4e9e8a10451ed2ef0f7a08dabdb04
    kbuild: migrate all arch to the kconfig mainmenu upgrade

    Broke make localmodconfig. The reason was that it added a
    environment variable to the kconfig source, which the
    streamline_config.pl could not handle.

    This patch changes streamline_config.pl to handle kconfig sources
    using environment variables in their names.

    Cc: Arnaud Lacombe
    Cc: Sam Ravnborg
    Cc: Michal Marek
    Signed-off-by: Steven Rostedt

    Steven Rostedt
     
  • 2301b65b8   Merge branch 'packaging' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 ... Browse Code »

    * 'packaging' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
    scripts/package: don't break if %{_smp_mflags} isn't set
    kbuild, deb-pkg: Check if KBUILD_IMAGE exists before copying it

    Linus Torvalds
     
  • e596c7905   Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 ... Browse Code »

    * 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: (39 commits)
    Revert "namespace: add source file location exceptions"
    Coccinelle: Add contextual message
    Coccinelle: Fix documentation
    Coccinelle: Find doubled arguments to boolean or bit operators.
    Coccinelle: Find nested lock+irqsave functions that use the same flags variables.
    namespace: add source file location exceptions
    scripts/extract-ikconfig: add support for bzip2, lzma and lzo
    kbuild: check return value of asprintf()
    scripts/namespace.pl: improve to get more correct results
    scripts/namespace.pl: some bug fixes
    scripts/namespace.pl: update file exclusion list
    scripts/namespace.pl: fix wrong source path
    Coccinelle: Use the -no_show_diff option for org and report mode
    Coccinelle: Add a new mode named 'chain'
    Coccinelle: Use new comment format to explain kfree.cocci
    Coccinelle: Improve user information with a new kind of comment
    Coccinelle: Update documentation
    MAINTAINERS: Coccinelle: Update email address
    Documentation/kbuild: modules.txt cleanup
    Documentation/kbuild: major edit of modules.txt sections 5-8
    ...

    Linus Torvalds
     
  • 51399a391   Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 ... Browse Code »

    * 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: (38 commits)
    kbuild: convert `arch/tile' to the kconfig mainmenu upgrade
    README: cite nconfig
    Revert "kconfig: Temporarily disable dependency warnings"
    kconfig: Use PATH_MAX instead of 128 for path buffer sizes.
    kconfig: Fix realloc usage()
    kconfig: Propagate const
    kconfig: Don't go out from read config loop when you read new symbol
    kconfig: fix menuconfig on debian lenny
    kbuild: migrate all arch to the kconfig mainmenu upgrade
    kconfig: expand file names
    kconfig: use the file's name of sourced file
    kconfig: constify file name
    kconfig: don't emit warning upon rootmenu's prompt redefinition
    kconfig: replace KERNELVERSION usage by the mainmenu's prompt
    kconfig: delay gconf window initialization
    kconfig: expand by default the rootmenu's prompt
    kconfig: add a symbol string expansion helper
    kconfig: regen parser
    kconfig: implement the `mainmenu' directive
    kconfig: allow PACKAGE to be defined on the compiler's command-line
    ...

    Fix up trivial conflict in arch/mn10300/Kconfig

    Linus Torvalds
     
  • c9e2a72ff   Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 ... Browse Code »

    * 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
    initramfs: Fix build break on symbol-prefixed archs
    initramfs: fix initramfs size calculation
    initramfs: generalize initramfs_data.xxx.S variants
    scripts/kallsyms: Enable error messages while hush up unnecessary warnings
    scripts/setlocalversion: update comment
    kbuild: Use a single clean rule for kernel and external modules
    kbuild: Do not run make clean in $(srctree)
    scripts/mod/modpost.c: fix commentary accordingly to last changes
    kbuild: Really don't clean bounds.h and asm-offsets.h

    Linus Torvalds
     
  • d63f6d1b4   initramfs: Fix build break on symbol-prefixed archs ... Browse Code »

    Signed-off-by: Mike Frysinger
    Signed-off-by: Michal Marek

    Mike Frysinger
     

28 Oct, 2010

13 commits

27 Oct, 2010

6 commits