1. 24 Oct, 2012 11 commits
  2. 20 Oct, 2012 3 commits
    • Linus Torvalds's avatar
      Linux 3.7-rc2 · 6f0c0580
      Linus Torvalds authored
    • Linus Torvalds's avatar
      Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64 · 198190a1
      Linus Torvalds authored
      Pull arm64 fixes from Catalin Marinas:
       "Main changes:
         - AArch64 Linux compilation fixes following 3.7-rc1 changes
           (MODULES_USE_ELF_RELA, update_vsyscall() prototype)
         - Unnecessary register setting in start_thread() (thanks to Al Viro)
         - ptrace fixes"
      * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64:
        arm64: fix alignment padding in assembly code
        arm64: ptrace: use HW_BREAKPOINT_EMPTY type for disabled breakpoints
        arm64: ptrace: make structure padding explicit for debug registers
        arm64: No need to set the x0-x2 registers in start_thread()
        arm64: Ignore memory blocks below PHYS_OFFSET
        arm64: Fix the update_vsyscall() prototype
        arm64: Select MODULES_USE_ELF_RELA
        arm64: Remove duplicate inclusion of mmu_context.h in smp.c
    • Marc Zyngier's avatar
      arm64: fix alignment padding in assembly code · aeed41a9
      Marc Zyngier authored
      An interesting effect of using the generic version of linkage.h
      is that the padding is defined in terms of x86 NOPs, which can have
      even more interesting effects when the assembly code looks like this:
      	mov	x0, xzr
      	// fall through
      	mov	x0, #1
      Admittedly, the code is not very nice. But having code from another
      architecture doesn't look completely sane either.
      The fix is to add arm64's version of linkage.h, which causes the insertion
      of proper AArch64 NOPs.
      Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
      Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
  3. 19 Oct, 2012 26 commits
    • Kees Cook's avatar
      use clamp_t in UNAME26 fix · 31fd84b9
      Kees Cook authored
      The min/max call needed to have explicit types on some architectures
      (e.g. mn10300). Use clamp_t instead to avoid the warning:
        kernel/sys.c: In function 'override_release':
        kernel/sys.c:1287:10: warning: comparison of distinct pointer types lacks a cast [enabled by default]
      Reported-by: default avatarFengguang Wu <fengguang.wu@intel.com>
      Signed-off-by: default avatarKees Cook <keescook@chromium.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Linus Torvalds's avatar
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 8c1bee68
      Linus Torvalds authored
      Pull perf fixes from Ingo Molnar:
       "Assorted small fixes"
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        perf python: Properly link with libtraceevent
        perf hists browser: Add back callchain folding symbol
        perf tools: Fix build on sparc.
        perf python: Link with libtraceevent
        perf python: Initialize 'page_size' variable
        tools lib traceevent: Fix missed freeing of subargs in free_arg() in filter
        lib tools traceevent: Add back pevent assignment in __pevent_parse_format()
        perf hists browser: Fix off-by-two bug on the first column
        perf tools: Remove warnings on JIT samples for srcline sort key
        perf tools: Fix segfault when using srcline sort key
        perf: Require exclude_guest to use PEBS - kernel side enforcement
        perf tool: Precise mode requires exclude_guest
    • Arnaldo Carvalho de Melo's avatar
      perf python: Properly link with libtraceevent · 45bff41a
      Arnaldo Carvalho de Melo authored
      Namhyung Kim reported that the build fails with:
        GEN python/perf.so
        gcc: error: python_ext_build/tmp//../../libtraceevent.a: No such file or directory
        error: command 'gcc' failed with exit status 1
        cp: cannot stat `python_ext_build/lib/perf.so': No such file or directory
        make: *** [python/perf.so] Error 1
      We need to propagate the TE_PATH variable to the setup.py file.
      Reported-by: default avatarNamhyung Kim <namhyung@kernel.org>
      Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      Link: http://lkml.kernel.org/n/tip-8umiPbm4sxpknKivbjgykhut@git.kernel.org
      [ Fixed superfluous variable build error. ]
      Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
    • Ingo Molnar's avatar
      Merge tag 'perf-urgent-for-mingo' of... · a448a031
      Ingo Molnar authored
      Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux
       into perf/urgent
      Pull perf/urgent fixes from Arnaldo Carvalho de Melo:
      * The python binding needs to link with libtraceevent and to initialize
        the 'page_size' variable so that mmaping works again.
      * The callchain folding character that appears on the TUI just before
        the overhead had disappeared due to recent changes, add it back.
      * Intel PEBS in VT-x context uses the DS address as a guest linear address,
        even though its programmed by the host as a host linear address. This either
        results in guest memory corruption and or the hardware faulting and 'crashing'
        the virtual machine.  Therefore we have to disable PEBS on VT-x enter and
        re-enable on VT-x exit, enforcing a strict exclude_guest.
        Kernel side enforcement fix by Peter Zijlstra, tooling side fix by David Ahern.
      * Fix build on sparc due to UAPI, fix from David Miller.
      * Fixes for the srclike sort key for unresolved symbols and when processing
        samples in JITted code, where we don't have an ELF file, just an special
        symbol table, fixes from Namhyung Kim.
      * Fix some leaks in libtraceevent, from Steven Rostedt.
      Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
    • Linus Torvalds's avatar
      Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 37820108
      Linus Torvalds authored
      Pull ARM soc fixes from Olof Johansson:
       "A set of fixes and some minor cleanups for -rc2:
         - A series from Arnd that fixes warnings in drivers and other code
           included by ARM defconfigs.  Most have been acked by corresponding
           maintainers (and seem quite hard to argue not picking up anyway in
           the few exception cases).
         - A few misc patches from the list for integrator/vt8500/i.MX
         - A batch of fixes to OMAP platforms, fixing:
           - boot problems on beaglebone,
           - regression fixes for local timers
           - clockdomain locking fixes
           - a few boot/sparse warnings
         - For Tegra:
           - Clock rate calculation overflow fix
           - Revert a change that removed timer clocks and a fix for symbol
             name clashes
         - For Renesas:
           - IO accessor / annotation cleanups to remove warnings
         - For Kirkwood/Dove/mvebu:
           - Fixes for device trees for Dove (some minor cleanups, some fixes)
           - Fixes for the mvebu gpio driver
           - Fix build problem for Feroceon due to missing ifdefs
           - Fix lsxl DTS files"
      * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (31 commits)
        ARM: kirkwood: fix buttons on lsxl boards
        ARM: kirkwood: fix LEDs names for lsxl boards
        ARM: Kirkwood: fix disabling CACHE_FEROCEON_L2
        gpio: mvebu: Add missing breaks in mvebu_gpio_irq_set_type
        ARM: dove: Add crypto engine to DT
        ARM: dove: Remove watchdog from DT
        ARM: dove: Restructure SoC device tree descriptor
        ARM: dove: Fix clock names of sata and gbe
        ARM: dove: Fix tauros2 device tree init
        ARM: dove: Add pcie clock support
        ARM: OMAP2+: Allow kernel to boot even if GPMC fails to reserve memory
        ARM: OMAP: clockdomain: Fix locking on _clkdm_clk_hwmod_enable / disable
        ARM: s3c: mark s3c2440_clk_add as __init_refok
        spi/s3c64xx: use correct dma_transfer_direction type
        ARM: OMAP4: devices: fixup OMAP4 DMIC platform device error message
        ARM: OMAP2+: clock data: Add dev-id for the omap-gpmc dummy fck
        ARM: OMAP: resolve sparse warning concerning debug_card_init()
        ARM: OMAP4: Fix twd_local_timer_register regression
        ARM: tegra: add tegra_timer clock
        ARM: tegra: rename tegra system timer
    • David Howells's avatar
      MODSIGN: Move the magic string to the end of a module and eliminate the search · caabe240
      David Howells authored
      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
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Olof Johansson's avatar
      Merge tag 'kirkwood_fixes_for_v3.7' of git://git.infradead.org/users/jcooper/linux into fixes · 70f3900e
      Olof Johansson authored
      From Jason Cooper:
       - improve #ifdef logic to prevent linker errors with CACHE_FEROCEON_L2
       - lsxl board dts fixes
      * tag 'kirkwood_fixes_for_v3.7' of git://git.infradead.org/users/jcooper/linux:
        ARM: kirkwood: fix buttons on lsxl boards
        ARM: kirkwood: fix LEDs names for lsxl boards
        ARM: Kirkwood: fix disabling CACHE_FEROCEON_L2
    • David Howells's avatar
      MODSIGN: Cleanup .gitignore · b6bb324d
      David Howells authored
      The module build process no longer creates intermediate files for module
      signing, so remove them from .gitignore.
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • David Howells's avatar
      MODSIGN: perlify sign-file and merge in x509keyid · b37d1bfb
      David Howells authored
      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: default avatarDavid Howells <dhowells@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Olof Johansson's avatar
      Merge branch 'testing/driver-warnings' of... · 068a565a
      Olof Johansson authored
      Merge branch 'testing/driver-warnings' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into fixes
      A collection of warning fixes on non-ARM code from Arnd Bergmann:
      * 'testing/driver-warnings' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        ARM: s3c: mark s3c2440_clk_add as __init_refok
        spi/s3c64xx: use correct dma_transfer_direction type
        pcmcia: sharpsl: don't discard sharpsl_pcmcia_ops
        USB: EHCI: mark ehci_orion_conf_mbus_windows __devinit
        mm/slob: use min_t() to compare ARCH_SLAB_MINALIGN
        SCSI: ARM: make fas216_dumpinfo function conditional
        SCSI: ARM: ncr5380/oak uses no interrupts
    • KAMEZAWA Hiroyuki's avatar
      hold task->mempolicy while numa_maps scans. · 9e781440
      KAMEZAWA Hiroyuki authored
        /proc/<pid>/numa_maps scans vma and show mempolicy under
        mmap_sem. It sometimes accesses task->mempolicy which can
        be freed without mmap_sem and numa_maps can show some
        garbage while scanning.
      This patch tries to take reference count of task->mempolicy at reading
      numa_maps before calling get_vma_policy(). By this, task->mempolicy
      will not be freed until numa_maps reaches its end.
        -  updated comments to be more verbose.
        -  removed task_lock() in numa_maps code.
        -  access task->mempolicy only once and remember it.  Becase kernel/exit.c
           can overwrite it.
      Signed-off-by: default avatarKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
      Acked-by: default avatarDavid Rientjes <rientjes@google.com>
      Acked-by: default avatarKOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Linus Torvalds's avatar
      Merge branch 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 3b641bf4
      Linus Torvalds authored
      Pull miscellaneous x86 fixes from Peter Anvin:
       "The biggest ones are fixing suspend/resume breakage on 32 bits, and an
        interrim fix for mapping over holes that allows AMD kit with more than
        1 TB.
        A final solution for the latter is in the works, but involves some
        fairly invasive changes that will probably mean it will only be
        appropriate for 3.8."
      * 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, MCE: Remove bios_cmci_threshold sysfs attribute
        x86, amd, mce: Avoid NULL pointer reference on CPU northbridge lookup
        x86: Exclude E820_RESERVED regions and memory holes above 4 GB from direct mapping.
        x86/cache_info: Use ARRAY_SIZE() in amd_l3_attrs()
        x86/reboot: Remove quirk entry for SBC FITPC
        x86, suspend: Correct the restore of CR4, EFER; skip computing EFLAGS.ID
    • Linus Torvalds's avatar
      Merge branch 'akpm' (Fixes from Andrew) · 4a1f2b0f
      Linus Torvalds authored
      Merge misc fixes from Andrew Morton:
       "Seven fixes"
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (7 patches)
        lib/dma-debug.c: fix __hash_bucket_find()
        mm: compaction: correct the nr_strict va isolated check for CMA
        firmware/memmap: avoid type conflicts with the generic memmap_init()
        pidns: remove recursion from free_pid_ns()
        drivers/video/backlight/lm3639_bl.c: return proper error in lm3639_bled_mode_store() error paths
        kernel/sys.c: fix stack memory content leak via UNAME26
        linux/coredump.h needs asm/siginfo.h
    • Ming Lei's avatar
      lib/dma-debug.c: fix __hash_bucket_find() · fe73fbe1
      Ming Lei authored
      If there is only one match, the unique matched entry should be returned.
      Without the fix, the upcoming dma debug interfaces ("dma-debug: new
      interfaces to debug dma mapping errors") can't work reliably because
      only device and dma_addr are passed to dma_mapping_error().
      Signed-off-by: default avatarMing Lei <ming.lei@canonical.com>
      Reported-by: default avatarWu Fengguang <fengguang.wu@intel.com>
      Cc: Joerg Roedel <joerg.roedel@amd.com>
      Tested-by: default avatarShuah Khan <shuah.khan@hp.com>
      Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
      Cc: Jakub Kicinski <kubakici@wp.pl>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Mel Gorman's avatar
      mm: compaction: correct the nr_strict va isolated check for CMA · 0db63d7e
      Mel Gorman authored
      Thierry reported that the "iron out" patch for isolate_freepages_block()
      had problems due to the strict check being too strict with "mm:
      compaction: Iron out isolate_freepages_block() and
      isolate_freepages_range() -fix1".  It's possible that more pages than
      necessary are isolated but the check still fails and I missed that this
      fix was not picked up before RC1.  This same problem has been identified
      in 3.7-RC1 by Tony Prisk and should be addressed by the following patch.
      Signed-off-by: default avatarMel Gorman <mgorman@suse.de>
      Tested-by: default avatarTony Prisk <linux@prisktech.co.nz>
      Reported-by: default avatarThierry Reding <thierry.reding@avionic-design.de>
      Acked-by: default avatarRik van Riel <riel@redhat.com>
      Acked-by: default avatarMinchan Kim <minchan@kernel.org>
      Cc: Richard Davies <richard@arachsys.com>
      Cc: Shaohua Li <shli@kernel.org>
      Cc: Avi Kivity <avi@redhat.com>
      Cc: Arnd Bergmann <arnd@arndb.de>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Fengguang Wu's avatar
      firmware/memmap: avoid type conflicts with the generic memmap_init() · bac71696
      Fengguang Wu authored
      Fix this build error:
        drivers/firmware/memmap.c:240:19: error: conflicting types for 'memmap_init'
        arch/ia64/include/asm/pgtable.h:565:17: note: previous declaration of 'memmap_init' was here
      Signed-off-by: default avatarFengguang Wu <fengguang.wu@intel.com>
      Cc: Bernhard Walle <bwalle@suse.de>
      Cc: Glauber Costa <glommer@parallels.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Cyrill Gorcunov's avatar
      pidns: remove recursion from free_pid_ns() · bbc2e3ef
      Cyrill Gorcunov authored
      free_pid_ns() operates in a recursive fashion:
          kref_put(&ns->kref, free_pid_ns);
      thus if there was a huge nesting of namespaces the userspace may trigger
      avalanche calling of free_pid_ns leading to kernel stack exhausting and a
      panic eventually.
      This patch turns the recursion into an iterative loop.
      Based on a patch by Andrew Vagin.
      [akpm@linux-foundation.org: export put_pid_ns() to modules]
      Signed-off-by: default avatarCyrill Gorcunov <gorcunov@openvz.org>
      Cc: Andrew Vagin <avagin@openvz.org>
      Cc: Oleg Nesterov <oleg@redhat.com>
      Cc: "Eric W. Biederman" <ebiederm@xmission.com>
      Cc: Pavel Emelyanov <xemul@parallels.com>
      Cc: Greg KH <greg@kroah.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Axel Lin's avatar
    • Kees Cook's avatar
      kernel/sys.c: fix stack memory content leak via UNAME26 · 2702b152
      Kees Cook authored
      Calling uname() with the UNAME26 personality set allows a leak of kernel
      stack contents.  This fixes it by defensively calculating the length of
      copy_to_user() call, making the len argument unsigned, and initializing
      the stack buffer to zero (now technically unneeded, but hey, overkill).
      Reported-by: default avatarPaX Team <pageexec@freemail.hu>
      Signed-off-by: default avatarKees Cook <keescook@chromium.org>
      Cc: Andi Kleen <ak@linux.intel.com>
      Cc: PaX Team <pageexec@freemail.hu>
      Cc: Brad Spengler <spender@grsecurity.net>
      Cc: <stable@vger.kernel.org>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Richard Weinberger's avatar
      linux/coredump.h needs asm/siginfo.h · 1d46e232
      Richard Weinberger authored
      Commit 5ab1c309
       ("coredump: pass siginfo_t* to do_coredump() and
      below, not merely signr") added siginfo_t to linux/coredump.h but forgot
      to include asm/siginfo.h.  This breaks the build for UML/i386.  (And any
      other arch where asm/siginfo.h is not magically preincluded...)
        In file included from arch/x86/um/elfcore.c:2:0: include/linux/coredump.h:15:25: error: unknown type name 'siginfo_t'
        make[1]: *** [arch/x86/um/elfcore.o] Error 1
      Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
      Cc: Denys Vlasenko <vda.linux@googlemail.com>
      Cc: Oleg Nesterov <oleg@redhat.com>
      Cc: Amerigo Wang <amwang@redhat.com>
      Cc: "Jonathan M. Foote" <jmfoote@cert.org>
      Cc: Roland McGrath <roland@hack.frob.com>
      Cc: Pedro Alves <palves@redhat.com>
      Cc: Fengguang Wu <fengguang.wu@intel.com>
      Cc: Stephen Rothwell <sfr@canb.auug.org.au>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Linus Torvalds's avatar
      remap_file_pages: correctly handle the case of a NULL vm_ops pointer · deb521c4
      Linus Torvalds authored
      In commit 0b173bc4
       ("mm: kill vma flag VM_CAN_NONLINEAR") we
      replaced the VM_CAN_NONLINEAR test with checking whether the mapping has
      a '->remap_pages()' vm operation, but there is no guarantee that there
      it even has a vm_ops pointer at all.
      Add the appropriate test for NULL vm_ops.
      Reported-by: default avatarSasha Levin <levinsasha928@gmail.com>
      Cc: Konstantin Khlebnikov <khlebnikov@openvz.org>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Linus Torvalds's avatar
      Merge tag 'xtensa-next-20121018' of git://github.com/czankel/xtensa-linux · 17dbe27d
      Linus Torvalds authored
      Pull Xtensa patchset from Chris Zankel:
       "These are all limited to the xtensa subtree and include some important
        changes (adding long missing system calls for newer libc versions and
        other fixes) and the UAPI changes"
      * tag 'xtensa-next-20121018' of git://github.com/czankel/xtensa-linux:
        xtensa: add missing system calls to the syscall table
        xtensa: minor compiler warning fix
        xtensa: Use Kbuild infrastructure to handle asm-generic headers
        UAPI: (Scripted) Disintegrate arch/xtensa/include/asm
        xtensa: fix unaligned usermode access
        xtensa: reorganize SR referencing
        xtensa: fix boot parameters parsing
        xtensa: fix missing return in do_page_fault for SIGBUS case
        xtensa: copy_thread with CLONE_VM must not copy live parent AR windows
        xtensa: fix memmove(), bcopy(), and memcpy().
        xtensa: ISS: fix rs_put_char
        xtensa: ISS: fix specific simcalls
    • Linus Torvalds's avatar
      kbuild: Fix module signature generation · b05e585d
      Linus Torvalds authored
      Rusty had clearly not actually tested his module signing changes that I
      (trustingly) applied as commit e2a666d5
       ("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 <rusty@rustcorp.com.au>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Linus Torvalds's avatar
      xen: Fix annoying compile-time warning · 16757372
      Linus Torvalds authored
      Commit cb6b6df1
       ("xen/pv-on-hvm kexec: add quirk for Xen 3.4 and
      shutdown watches.") added the xen_strict_xenbus_quirk() function with an
      old K&R-style declaration without proper typing, causing gcc to rightly
        drivers/xen/xenbus/xenbus_xs.c:628:13: warning: function declaration isn’t a prototype [-Wstrict-prototypes]
      because we really don't live in caves using stone-age tools any more,
      and the kernel has always used properly typed ANSI C function
      So if a function doesn't take arguments, we tell the compiler so
      explicitly by adding the proper "void" in the prototype.
      I'm sure there are tons of other examples of this kind of stuff in the
      tree, but this is the one that hits my workstation config, so..
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Linus Torvalds's avatar
      Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging · e80bd270
      Linus Torvalds authored
      Pull hwmon fixes from Guenter Roeck:
       "Drop some leftover dependencies on CONFIG_EXPERIMENTAL, and add
        support for Intel Atom CE4110/4150/4170."
      * tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
        hwmon: (coretemp) Add support for Atom CE4110/4150/4170
        Documentation/hwmon: remove CONFIG_EXPERIMENTAL
        hwmon: (pmbus) remove CONFIG_EXPERIMENTAL
    • Linus Torvalds's avatar
      Merge tag 'tty-3.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · ccfc2730
      Linus Torvalds authored
      Pull TTY fixes from Greg Kroah-Hartman:
       "Here are some tty and serial driver fixes for your 3.7-rc1 tree.
        Again, the UABI header file fixes, and a number of build and runtime
        serial driver bugfixes that solve problems people have been reporting
        (the staging driver is a tty driver, hence the fixes coming in through
        this tree.)
        All of these have been in the linux-next tree for a while.
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org&gt;">
      * tag 'tty-3.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
        staging: dgrp: check return value of alloc_tty_driver
        staging: dgrp: check for NULL pointer in (un)register_proc_table
        serial/8250_hp300: Missing 8250 register interface conversion bits
        UAPI: (Scripted) Disintegrate include/linux/hsi
        tty: serial: sccnxp: Fix bug with unterminated platform_id list
        staging: serial: dgrp: Add missing #include <linux/uaccess.h>
        serial: sccnxp: Allows the driver to be compiled as a module
        tty: Fix bogus "callbacks suppressed" messages
        net, TTY: initialize tty->driver_data before usage