03 Jan, 2013

1 commit

  • Commit 56c176c9cac9 ("UAPI: strip the _UAPI prefix from header guards
    during header installation") strips the _UAPI prefix from header guards,
    but only if there's a single space between the cpp directive and the
    label.

    Make it more flexible and able to handle tabs and multiple white space
    characters.

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

    David Howells
     

21 Dec, 2012

4 commits

  • Merge the rest of Andrew's patches for -rc1:
    "A bunch of fixes and misc missed-out-on things.

    That'll do for -rc1. I still have a batch of IPC patches which still
    have a possible bug report which I'm chasing down."

    * emailed patches from Andrew Morton : (25 commits)
    keys: use keyring_alloc() to create module signing keyring
    keys: fix unreachable code
    sendfile: allows bypassing of notifier events
    SGI-XP: handle non-fatal traps
    fat: fix incorrect function comment
    Documentation: ABI: remove testing/sysfs-devices-node
    proc: fix inconsistent lock state
    linux/kernel.h: fix DIV_ROUND_CLOSEST with unsigned divisors
    memcg: don't register hotcpu notifier from ->css_alloc()
    checkpatch: warn on uapi #includes that #include
    mm: cma: WARN if freed memory is still in use
    exec: do not leave bprm->interp on stack
    ...

    Linus Torvalds
     
  • Pull kbuild misc changes from Michal Marek:
    "This is the non-critical part of kbuild

    - scripts/kernel-doc requires a "Return:" section for non-void
    functions
    - ARCH=arm SUBARCH=... support for make tags
    - COMPILED_SOURCE=1 support for make tags (only indexes .c files for
    which a .o exists)
    - New coccinelle check
    - Option parsing fix for scripts/config"

    * 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
    scripts/config: Fix wrong "shift" for --keep-case
    scripts/tags.sh: Support compiled source
    scripts/tags.sh: Support subarch for ARM
    scripts/coccinelle/misc/warn.cocci: use WARN
    scripts/kernel-doc: check that non-void fcts describe their return value
    Kernel-doc: Convention: Use a "Return" section to describe return values

    Linus Torvalds
     
  • Avoid specifying internal uapi #include paths with uapi/... as
    userspace should not use and never see that.

    Neaten message line wrapping above.

    Signed-off-by: Joe Perches
    Acked-by: David Howells
    Acked-by: Andy Whitcroft
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Joe Perches
     
  • Pull kbuild changes from Michal Marek:
    "The kbuild changes are minimal this time:

    - scripts/pnmlogo fix for some newer format

    - minor top-level Makefile cleanup

    - fix for a v3.5 regression with make clean M="

    * 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
    kbuild: Do not remove vmlinux when cleaning external module
    scripts/pnmtologo: fix for plain PBM
    kbuild: Remove reference to uninitialised variable

    Linus Torvalds
     

19 Dec, 2012

2 commits

  • Pull module update from Rusty Russell:
    "Nothing all that exciting; a new module-from-fd syscall for those who
    want to verify the source of the module (ChromeOS) and/or use standard
    IMA on it or other security hooks."

    * tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
    MODSIGN: Fix kbuild output when using default extra_certificates
    MODSIGN: Avoid using .incbin in C source
    modules: don't hand 0 to vmalloc.
    module: Remove a extra null character at the top of module->strtab.
    ASN.1: Use the ASN1_LONG_TAG and ASN1_INDEFINITE_LENGTH constants
    ASN.1: Define indefinite length marker constant
    moduleparam: use __UNIQUE_ID()
    __UNIQUE_ID()
    MODSIGN: Add modules_sign make target
    powerpc: add finit_module syscall.
    ima: support new kernel module syscall
    add finit_module syscall to asm-generic
    ARM: add finit_module syscall to ARM
    security: introduce kernel_module_from_file hook
    module: add flags arg to sys_finit_module()
    module: add syscall to load module from fd

    Linus Torvalds
     
  • Ensure that calls to d_find_alias() have a corresponding dput().

    Signed-off-by: Cyril Roelandt
    Cc: Julia Lawall
    Cc: Gilles Muller
    Cc: Nicolas Palix
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Cyril Roelandt
     

18 Dec, 2012

12 commits


14 Dec, 2012

3 commits

  • Remove wrong "shift" for --keep-case. There is always "shift" at
    beginning of while-loop. No need "shift" at --keep-case just before
    "continue" to process next argument.

    Now the following works as expected:

    ./scripts/config -e aAa -k -e bBb -e cCc && tail -3 .config
    CONFIG_AAA=y
    CONFIG_bBb=y
    CONFIG_cCc=y

    Signed-off-by: Hiroshi Doyu
    Signed-off-by: Michal Marek

    Hiroshi Doyu
     
  • If CONFIG_MODULE_SIG is set, and 'make modules_sign' is called then this
    patch will cause the modules to get a signature appended. The make target
    is intended to be run after 'make modules_install', and will modify the
    modules in-place in the installed location. It can be used to produce
    signed modules after they have been processed by distribution build
    scripts.

    Signed-off-by: Josh Boyer
    Signed-off-by: Rusty Russell (minor typo fix)

    Josh Boyer
     
  • 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

  • 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

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

3 commits


09 Dec, 2012

1 commit


06 Dec, 2012

1 commit

  • 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
    Acked-by: Randy Dunlap
    Signed-off-by: Michal Marek

    Yacine Belkadi
     

01 Dec, 2012

2 commits

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

  • 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

  • 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

  • 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

  • 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
     

20 Nov, 2012

1 commit

  • PBM generated with current tools do not have a whitespace between the
    digits. Therefore the pnmtologo tool fails to gernerate the required
    C-Array for these images. This patch fixes that behaviour and can
    handle both 'old style' and 'new style' PBM files.

    Signed-off-by: Andreas Bießmann
    Signed-off-by: Michal Marek

    Andreas Bießmann
     

13 Nov, 2012

1 commit


09 Nov, 2012

2 commits

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