Eric Lee / smarc-fsl-linux-kernel

18 Dec, 2012

12 commits

14 Dec, 2012

1 commit

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

    Pull trivial branch from Jiri Kosina:
    "Usual stuff -- comment/printk typo fixes, documentation updates, dead
    code elimination."

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
    HOWTO: fix double words typo
    x86 mtrr: fix comment typo in mtrr_bp_init
    propagate name change to comments in kernel source
    doc: Update the name of profiling based on sysfs
    treewide: Fix typos in various drivers
    treewide: Fix typos in various Kconfig
    wireless: mwifiex: Fix typo in wireless/mwifiex driver
    messages: i2o: Fix typo in messages/i2o
    scripts/kernel-doc: check that non-void fcts describe their return value
    Kernel-doc: Convention: Use a "Return" section to describe return values
    radeon: Fix typo and copy/paste error in comments
    doc: Remove unnecessary declarations from Documentation/accounting/getdelays.c
    various: Fix spelling of "asynchronous" in comments.
    Fix misspellings of "whether" in comments.
    eisa: Fix spelling of "asynchronous".
    various: Fix spelling of "registered" in comments.
    doc: fix quite a few typos within Documentation
    target: iscsi: fix comment typos in target/iscsi drivers
    treewide: fix typo of "suport" in various comments and Kconfig
    treewide: fix typo of "suppport" in various comments
    ...

    Linus Torvalds
     

13 Dec, 2012

1 commit

  • b1286f4e9   Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm ... Browse Code »

    Pull ARM updates from Russell King:
    "Here's the updates for ARM for this merge window, which cover quite a
    variety of areas.

    There's a bunch of patch series from Will tackling various bugs like
    the PROT_NONE handling, ASID allocation, cluster boot protocol and
    ASID TLB tagging updates.

    We move to a build-time sorted exception table rather than doing the
    sorting at run-time, add support for the secure computing filter, and
    some updates to the perf code. We also have sorted out the placement
    of some headers, fixed some build warnings, fixed some hotplug
    problems with the per-cpu TWD code."

    * 'for-linus' of git://git.linaro.org/people/rmk/linux-arm: (73 commits)
    ARM: 7594/1: Add .smp entry for REALVIEW_EB
    ARM: 7599/1: head: Remove boot-time HYP mode check for v5 and below
    ARM: 7598/1: net: bpf_jit_32: fix sp-relative load/stores offsets.
    ARM: 7595/1: syscall: rework ordering in syscall_trace_exit
    ARM: 7596/1: mmci: replace readsl/writesl with ioread32_rep/iowrite32_rep
    ARM: 7597/1: net: bpf_jit_32: fix kzalloc gfp/size mismatch.
    ARM: 7593/1: nommu: do not enable DCACHE_WORD_ACCESS when !CONFIG_MMU
    ARM: 7592/1: nommu: prevent generation of kernel unaligned memory accesses
    ARM: 7591/1: nommu: Enable the strict alignment (CR_A) bit only if ARCH < v6
    ARM: 7590/1: /proc/interrupts: limit the display of IPIs to online CPUs only
    ARM: 7587/1: implement optimized percpu variable access
    ARM: 7589/1: integrator: pass the lm resource to amba
    ARM: 7588/1: amba: create a resource parent registrator
    ARM: 7582/2: rename kvm_seq to vmalloc_seq so to avoid confusion with KVM
    ARM: 7585/1: kernel: fix nr_cpu_ids check in DT logical map init
    ARM: 7584/1: perf: fix link error when CONFIG_HW_PERF_EVENTS is not selected
    ARM: gic: use a private mapping for CPU target interfaces
    ARM: kernel: add logical mappings look-up
    ARM: kernel: add cpu logical map DT init in setup_arch
    ARM: kernel: add device tree init map function
    ...

    Linus Torvalds
     

12 Dec, 2012

2 commits

  • cff2f741b   Merge tag 'driver-core-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core ... Browse Code »

    Pull driver core updates from Greg Kroah-Hartman:
    "Here's the large driver core updates for 3.8-rc1.

    The biggest thing here is the various __dev* marking removals. This
    is going to be a pain for the merge with different subsystem trees, I
    know, but all of the patches included here have been ACKed by their
    various subsystem maintainers, as they wanted them to go through here.

    If this is too much of a pain, I can pull all of them out of this tree
    and just send you one with the other fixes/updates and then, after
    3.8-rc1 is out, do the rest of the removals to ensure we catch them
    all, it's up to you. The merges should all be trivial, and Stephen
    has been doing them all in linux-next for a few weeks now quite
    easily.

    Other than the __dev* marking removals, there's nothing major here,
    some firmware loading updates and other minor things in the driver
    core.

    All of these have (much to Stephen's annoyance), been in linux-next
    for a while.

    Signed-off-by: Greg Kroah-Hartman "

    Fixed up trivial conflicts in drivers/gpio/gpio-{em,stmpe}.c due to gpio
    update.

    * tag 'driver-core-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (93 commits)
    modpost.c: Stop checking __dev* section mismatches
    init.h: Remove __dev* sections from the kernel
    acpi: remove use of __devinit
    PCI: Remove __dev* markings
    PCI: Always build setup-bus when PCI is enabled
    PCI: Move pci_uevent into pci-driver.c
    PCI: Remove CONFIG_HOTPLUG ifdefs
    unicore32/PCI: Remove CONFIG_HOTPLUG ifdefs
    sh/PCI: Remove CONFIG_HOTPLUG ifdefs
    powerpc/PCI: Remove CONFIG_HOTPLUG ifdefs
    mips/PCI: Remove CONFIG_HOTPLUG ifdefs
    microblaze/PCI: Remove CONFIG_HOTPLUG ifdefs
    dma: remove use of __devinit
    dma: remove use of __devexit_p
    firewire: remove use of __devinitdata
    firewire: remove use of __devinit
    leds: remove use of __devexit
    leds: remove use of __devinit
    leds: remove use of __devexit_p
    mmc: remove use of __devexit
    ...

    Linus Torvalds
     
  • b58ed041a   Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux-2.6 ... Browse Code »

    Pull device tree changes from Grant Likely:
    "Here are the DT changes I've got queued up for v3.8. As described
    below, there are a lot of bug fixes here and documentation updates but
    nothing major:

    Bug fixes, little cleanups, and documentation changes. The most
    invasive thing here touches a bunch of the arch directories to use a
    common build rule for .dtb files. There are no major changes to
    functionality here other than a few new helper functions."

    * tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux-2.6: (34 commits)
    arm64: Fix the dtbs target building
    mtd: nand: davinci: fix the binding documentation
    rtc: rtc-mv: Add the device tree binding documentation
    devicetree/bindings: Move gpio-leds binding into leds directory
    of/vendor-prefixes: add Imagination Technologies
    microblaze: use new common dtc rule
    c6x: use new common dtc rule
    openrisc: use new common dtc rule
    arm64: Add dtbs target for building all the enabled dtb files
    arm64: use new common dtc rule
    ARM: dt: change .dtb build rules to build in dts directory
    kbuild: centralize .dts->.dtb rule
    Fix build when CONFIG_W1_MASTER_GPIO=m b exporting "allnodes"
    of/spi: Honour "status=disabled" property of device
    of_mdio: Honour "status=disabled" property of device
    of_i2c: Honour "status=disabled" property of device
    powerpc: Fix fallout from device_node->name constification
    of: add 'const' for of_parse_phandle parameter *np
    Documentation: correct of_platform_populate() argument list
    script: dtc: clean generated files
    ...

    Linus Torvalds
     

11 Dec, 2012

1 commit

01 Dec, 2012

2 commits

  • 92e9e6d1f   modpost.c: Stop checking __dev* section mismatches ... Browse Code »

    Now that the __dev* sections are not being generated, we don't need to
    check for them in modpost.c.

    Acked-by: Sam Ravnborg
    Signed-off-by: Greg Kroah-Hartman

    Greg Kroah-Hartman
     
  • 90b335fbb   kbuild: centralize .dts->.dtb rule ... Browse Code »

    All architectures that use cmd_dtc do so in almost the same way. Create
    a central build rule to avoid duplication. The one difference is that
    most current uses of dtc build $(obj)/%.dtb from $(src)/dts/%.dts rather
    than building the .dtb in the same directory as the .dts file. This
    difference will be eliminated arch-by-arch in future patches.

    MIPS is the exception here; it already uses the exact same rule as the
    new common rule, so the duplicate is removed in this patch to avoid any
    conflict. arch/mips changes courtesy of Ralf Baechle.

    Update Documentation/kbuild to remove the explicit call to cmd_dtc from
    the example, now that the rule exists in a centralized location.

    Cc: Arnd Bergmann
    Cc: linux-arm-kernel@lists.infradead.org
    Cc: Olof Johansson
    Cc: Russell King
    Acked-by: Catalin Marinas
    Cc: Jonas Bonn
    Cc: linux@lists.openrisc.net
    Cc: Aurelien Jacquiot
    Cc: linux-c6x-dev@linux-c6x.org
    Cc: Mark Salter
    Cc: Michal Simek
    Cc: microblaze-uclinux@itee.uq.edu.au
    Cc: Chris Zankel
    Cc: linux-xtensa@linux-xtensa.org
    Cc: Max Filippov
    Signed-off-by: Ralf Baechle
    Signed-off-by: Stephen Warren
    Signed-off-by: Rob Herring

    Stephen Warren
     

28 Nov, 2012

1 commit

  • 4092bac77   scripts/kernel-doc: check that non-void fcts describe their return value ... Browse Code »

    If a function has a return value, but its kernel-doc comment doesn't contain a
    "Return" section, then emit the following warning:

    Warning(file.h:129): No description found for return value of 'fct'

    Note: This check emits a lot of warnings at the moment, because many functions
    don't have a 'Return' doc section. So until the number of warnings goes
    sufficiently down, the check is only performed in verbose mode.

    Signed-off-by: Yacine Belkadi
    Signed-off-by: Rob Landley
    Signed-off-by: Jiri Kosina

    Yacine Belkadi
     

27 Nov, 2012

1 commit

  • 56c176c9c   UAPI: strip the _UAPI prefix from header guards during header installation ... Browse Code »

    Strip the _UAPI prefix from header guards during header installation so
    that any userspace dependencies aren't affected. glibc, for example,
    checks for linux/types.h, linux/kernel.h, linux/compiler.h and
    linux/list.h by their guards - though the last two aren't actually
    exported.

    libtool: compile: gcc -std=gnu99 -DHAVE_CONFIG_H -I. -Wall -Werror -Wformat -Wformat-security -D_FORTIFY_SOURCE=2 -fno-delete-null-pointer-checks -fstack-protector -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m32 -march=i686 -mtune=atom -fasynchronous-unwind-tables -c child.c -fPIC -DPIC -o .libs/child.o
    In file included from cli.c:20:0:
    common.h:152:8: error: redefinition of 'struct sysinfo'
    In file included from /usr/include/linux/kernel.h:4:0,
    from /usr/include/linux/sysctl.h:25,
    from /usr/include/sys/sysctl.h:43,
    from common.h:50,
    from cli.c:20:
    /usr/include/linux/sysinfo.h:7:8: note: originally defined here

    Reported-by: Tomasz Torcz
    Signed-off-by: David Howells
    Acked-by: Josh Boyer
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    David Howells
     

22 Nov, 2012

1 commit

  • 916492b1e   sign-file: fix the perl warning message when extracting ASN.1 ... Browse Code »

    There have the following warning message when running modules install
    for sign ko files:

    # make modules_install
    ...
    INSTALL drivers/input/touchscreen/pcap_ts.ko
    Found = in conditional, should be == at scripts/sign-file line 164.
    Found = in conditional, should be == at scripts/sign-file line 161.
    Found = in conditional, should be == at scripts/sign-file line 159.

    This patch change replace '=' by '==' in elsif conditions for avoid the
    above warning messages.

    Signed-off-by: Chun-Yi Lee
    Signed-off-by: David Howells
    Signed-off-by: Linus Torvalds

    Chun-Yi Lee
     

21 Nov, 2012

1 commit

  • 4f3be1cfa   script: dtc: clean generated files ... Browse Code »

    Fix "make distclean" to clean up generated dtc files.

    Without this patch the following files are left around:
    - dtc-lexer.lex.c
    - dtc-parser.tab.c
    - dtc-parser.tab.h

    Signed-off-by: Magnus Damm
    Reviewed-by: Simon Horman
    Signed-off-by: Grant Likely

    Magnus Damm
     

13 Nov, 2012

1 commit

09 Nov, 2012

2 commits

  • ce6d841e9   Merge branch 'akpm' (Fixes from Andrew) ... Browse Code »

    Merge misc fixes from Andrew Morton:
    "Five fixes"

    * emailed patches from Andrew Morton : (5 patches)
    h8300: add missing L1_CACHE_SHIFT
    mm: bugfix: set current->reclaim_state to NULL while returning from kswapd()
    fanotify: fix missing break
    revert "epoll: support for disabling items, and a self-test app"
    checkpatch: improve network block comment style checking

    Linus Torvalds
     
  • c24f9f195   checkpatch: improve network block comment style checking ... Browse Code »

    Some comment styles in net and drivers/net are flagged inappropriately.

    Avoid proclaiming inline comments like:
    int a = b; /* some comment */
    and block comments like:
    /*********************
    * some comment
    ********************/
    are defective.

    Tested with
    $ cat drivers/net/t.c
    /* foo */

    /*
    * foo
    */

    /* foo
    */

    /* foo
    * bar */

    /****************************
    * some long block comment
    ***************************/

    struct foo {
    int bar; /* another test */
    };
    $

    Signed-off-by: Joe Perches
    Reported-by: Larry Finger
    Cc: David Miller
    Cc: Stephen Hemminger
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Joe Perches
     

06 Nov, 2012

1 commit

04 Nov, 2012

1 commit

  • ee951c630   ARM: 7568/1: Sort exception table at compile time ... Browse Code »

    Add the ARM machine identifier to sortextable and select the
    config option so that we can sort the exception table at compile
    time. sortextable relies on a section named __ex_table existing
    in the vmlinux, but ARM's linker script places the exception
    table in the data section. Give the exception table its own
    section so that sortextable can find it.

    This allows us to skip the sorting step during boot.

    Cc: David Daney
    Signed-off-by: Stephen Boyd
    Tested-by: Will Deacon
    Signed-off-by: Russell King

    Stephen Boyd
     

25 Oct, 2012

1 commit

20 Oct, 2012

3 commits

  • caabe2405   MODSIGN: Move the magic string to the end of a module and eliminate the search ... Browse Code »

    Emit the magic string that indicates a module has a signature after the
    signature data instead of before it. This allows module_sig_check() to
    be made simpler and faster by the elimination of the search for the
    magic string. Instead we just need to do a single memcmp().

    This works because at the end of the signature data there is the
    fixed-length signature information block. This block then falls
    immediately prior to the magic number.

    From the contents of the information block, it is trivial to calculate
    the size of the signature data and thus the size of the actual module
    data.

    Signed-off-by: David Howells
    Signed-off-by: Linus Torvalds

    David Howells
     
  • b37d1bfb5   MODSIGN: perlify sign-file and merge in x509keyid ... Browse Code »

    Turn sign-file into perl and merge in x509keyid. The latter doesn't
    need to be a separate script as it doesn't actually need to work out the
    SHA1 sum of the X.509 certificate itself, since it can get that from the
    X.509 certificate.

    Signed-off-by: David Howells
    Signed-off-by: Linus Torvalds

    David Howells
     
  • b05e585d4   kbuild: Fix module signature generation ... Browse Code »

    Rusty had clearly not actually tested his module signing changes that I
    (trustingly) applied as commit e2a666d52b48 ("kbuild: sign the modules
    at install time"). That commit had multiple bugs:

    - using "${#VARIABLE}" to get the number of characters in a shell
    variable may look clever, but it's locale-dependent: it returns the
    number of *characters*, not bytes. And we do need bytes.

    So don't use "${#..}" expansion, do the stupid "wc -c" thing instead
    (where "c" stands for "bytes", not "characters", despite the letter.

    - Rusty had confused "siglen" and "signerlen", and his conversion
    didn't set "signerlen" at all, and incorrectly set "siglen" to the
    size of the signer, not the size of the signature.

    End result: the modified sign-file script did create something that
    superficially *looked* like a signature, but didn't actually work at
    all, and would fail the signature check. Oops.

    Tssk, tssk, Rusty.

    But Rusty was definitely right that this whole thing should be rewritten
    in perl by somebody who has the perl-fu to do so. That is not me,
    though - I'm just doing an emergency fix for the shell script.

    Cc: Rusty Russell
    Signed-off-by: Linus Torvalds

    Linus Torvalds
     

19 Oct, 2012

2 commits

  • e2a666d52   kbuild: sign the modules at install time ... Browse Code »

    Linus deleted the old code and put signing on the install command,
    I fixed it to extract the keyid and signer-name within sign-file
    and cleaned up that script now it always signs in-place.

    Some enthusiast should convert sign-key to perl and pull
    x509keyid into it.

    Signed-off-by: Rusty Russell
    Signed-off-by: Linus Torvalds

    Rusty Russell
     
  • bab58350e   Merge tag 'dt-fixes-for-3.7' of git://sources.calxeda.com/kernel/linux ... Browse Code »

    Pull DeviceTree fixes from Rob Herring:
    "A handful of fixes:
    - a fix for dtc from upstream
    - sparse fixes in DeviceTree code
    - stub of_get_child_by_name for !OF builds"

    * tag 'dt-fixes-for-3.7' of git://sources.calxeda.com/kernel/linux:
    dtc: fix for_each_*() to skip first object if deleted
    of/platform: sparse fix
    of/irq: sparse fixes
    of/address: sparse fixes
    of: add stub of_get_child_by_name for non-OF builds

    Linus Torvalds
     

18 Oct, 2012

1 commit

  • 205a8eb7c   dtc: fix for_each_*() to skip first object if deleted ... Browse Code »

    The previous definition of for_each_*() would always include the very
    first object within the list, irrespective of whether it was marked
    deleted, since the deleted flag was not checked on the first object,
    but only on any "next" object.

    Fix for_each_*() to check the deleted flag in the loop body every
    iteration to correct this.

    (upstream dtc commit 1762ab42ef77db7ab2776d0d6cba3515150f518a)

    Signed-off-by: Stephen Warren
    Signed-off-by: Rob Herring

    Stephen Warren
     

17 Oct, 2012

1 commit

16 Oct, 2012

1 commit

  • 3ce9e53e7   kbuild: Fix accidental revert in commit fe04ddf ... Browse Code »

    Commit fe04ddf7c291 ("kbuild: Do not package /boot and /lib in make
    tar-pkg") accidentally reverted two previous kbuild commits. I don't
    know what I was thinking.

    This brings back changes made by commits 24cc7fb69a5b ("x86/kbuild:
    archscripts depends on scripts_basic") and c1c1a59e37da ("firmware: fix
    directory creation rule matching with make 3.80")

    Reported-by: Jan Beulich
    Cc:
    Signed-off-by: Michal Marek
    Signed-off-by: Linus Torvalds

    Michal Marek
     

15 Oct, 2012

1 commit

  • d25282d1c   Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux ... Browse Code »

    Pull module signing support from Rusty Russell:
    "module signing is the highlight, but it's an all-over David Howells frenzy..."

    Hmm "Magrathea: Glacier signing key". Somebody has been reading too much HHGTTG.

    * 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux: (37 commits)
    X.509: Fix indefinite length element skip error handling
    X.509: Convert some printk calls to pr_devel
    asymmetric keys: fix printk format warning
    MODSIGN: Fix 32-bit overflow in X.509 certificate validity date checking
    MODSIGN: Make mrproper should remove generated files.
    MODSIGN: Use utf8 strings in signer's name in autogenerated X.509 certs
    MODSIGN: Use the same digest for the autogen key sig as for the module sig
    MODSIGN: Sign modules during the build process
    MODSIGN: Provide a script for generating a key ID from an X.509 cert
    MODSIGN: Implement module signature checking
    MODSIGN: Provide module signing public keys to the kernel
    MODSIGN: Automatically generate module signing keys if missing
    MODSIGN: Provide Kconfig options
    MODSIGN: Provide gitignore and make clean rules for extra files
    MODSIGN: Add FIPS policy
    module: signature checking hook
    X.509: Add a crypto key parser for binary (DER) X.509 certificates
    MPILIB: Provide a function to read raw data into an MPI
    X.509: Add an ASN.1 decoder
    X.509: Add simple ASN.1 grammar compiler
    ...

    Linus Torvalds
     

12 Oct, 2012

2 commits

  • cbd8aca47   Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild ... Browse Code »

    Pull kbuild misc changes from Michal Marek:
    "In the non-critical part of kbuild, I have
    - Some make coccicheck improvements and two new tests
    - Support for a cleaner html output in scripts/kernel-doc, named
    html5 (no, it does not play videos, yet)

    BTW, Randy wants to route further kernel-doc patches through the
    kbuild tree."

    * 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
    Update SmPL/Coccinelle section of MAINTAINERS
    coccicheck: Add the rep+ctxt mode
    scripts/coccinelle/tests/odd_ptr_err.cocci: semantic patch for IS_ERR/PTR_ERR inconsistency
    scripts/tags.sh: Add magic for pci access functions
    scripts/coccinelle: ptr_ret: Add ternary operator version
    scripts/kernel-doc: drop maintainer
    scripts/kernel-doc: added support for html5

    Linus Torvalds
     
  • 35e9a274f   Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild ... Browse Code »

    Pull kconfig changes from Michal Marek:
    "kconfig in v3.7 is going to
    - initialize ncurses only once in menuconfig
    - be able to jump to a search result in menuconfig
    - change the misnomer oldnoconfig to a more meaningful name
    olddefconfig, keeping the old name as alias"

    * 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
    kconfig: replace 'oldnoconfig' with 'olddefconfig', and keep the old name as an alias
    menuconfig: Assign jump keys per-page instead of globally
    menuconfig: Do not open code textbox scroll up/down
    menuconfig: Add jump keys to search results
    menuconfig: Extend dialog_textbox so that it can return to a scrolled position
    menuconfig: Extend dialog_textbox so that it can exit on arbitrary keypresses
    menuconfig: Remove superfluous conditionnal
    kconfig: document oldnoconfig to what it really does in conf.c
    kconfig/mconf.c: revision of curses initialization.

    Linus Torvalds