Skip to content
  1. Oct 20, 2012
    • 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.
      
      V2->v3
        -  updated comments to be more verbose.
        -  removed task_lock() in numa_maps code.
      V1->V2
        -  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>
      9e781440
    • 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
      3b641bf4
    • 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
      4a1f2b0f
    • 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>
      fe73fbe1
    • 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>
      0db63d7e
    • 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>
      bac71696
    • Cyrill Gorcunov's avatar
      pidns: remove recursion from free_pid_ns() · bbc2e3ef
      Cyrill Gorcunov authored
      
      
      free_pid_ns() operates in a recursive fashion:
      
      free_pid_ns(parent)
        put_pid_ns(parent)
          kref_put(&ns->kref, free_pid_ns);
            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>
      bbc2e3ef
    • 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).
      
      CVE-2012-0957
      
      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>
      2702b152
    • 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>
      1d46e232
    • 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>
      deb521c4
    • 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
      17dbe27d
    • 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>
      b05e585d
    • 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
      complain:
      
        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
      declarations.
      
      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>
      16757372
    • 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
      e80bd270
    • 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
      ccfc2730
    • Linus Torvalds's avatar
      Merge tag 'usb-3.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · 42bf3e27
      Linus Torvalds authored
      
      
      Pull USB fixes from Greg Kroah-Hartman:
       "Here are the USB patches against your 3.7-rc1 tree.
      
        There are the usual UABI header file movements, and we finally are now
        able to remove the dbg() macro that is over 15 years old (that had to
        wait for after some other trees got merged into yours during the big
        3.7-rc1 merge window.)
      
        Other than that, nothing major, just a number of bugfixes and new
        device ids.  It turns out that almost all of the usb-serial drivers
        had bugs in how they were handling their internal data, leaking
        memory, hence all of those fixups.
      
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org&gt;">
      
      * tag 'usb-3.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (42 commits)
        USB: option: add more ZTE devices
        USB: option: blacklist net interface on ZTE devices
        usb: host: xhci: New system added for Compliance Mode Patch on SN65LVPE502CP
        USB: io_ti: fix sysfs-attribute creation
        USB: iuu_phoenix: fix sysfs-attribute creation
        USB: spcp8x5: fix port-data memory leak
        USB: ssu100: fix port-data memory leak
        USB: ti_usb_3410_5052: fix port-data memory leak
        USB: oti6858: fix port-data memory leak
        USB: iuu_phoenix: fix port-data memory leak
        USB: kl5kusb105: fix port-data memory leak
        USB: io_ti: fix port-data memory leak
        USB: keyspan_pda: fix port-data memory leak
        USB: f81232: fix port-data memory leak
        USB: io_edgeport: fix port-data memory leak
        USB: kobil_sct: fix port-data memory leak
        USB: cypress_m8: fix port-data memory leak
        usb: acm: fix the computation of the number of data bits
        usb: Missing dma_mask in ehci-vt8500.c when probed from device-tree
        usb: Missing dma_mask in uhci-platform.c when probed from device-tree
        ...
      42bf3e27
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel · fb06de04
      Linus Torvalds authored
      Pull hexagon updates from Richard Kuo:
       "It includes the Hexagon UAPI changes from David Howells and some CR
        marking changes for the transition from Code Aurora to Linux
        Foundation."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel:
        Hexagon: Copyright marking changes
        UAPI: (Scripted) Disintegrate arch/hexagon/include/asm
      fb06de04
    • Linus Torvalds's avatar
      Merge tag 'parisc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6 · 22054fbe
      Linus Torvalds authored
      
      
      Pull PARISC changes from James Bottomley:
       "This is a couple of high code motion patches (all within arch/parisc)
        I'd like to apply at -rc1 to avoid conflicts with anything else.  One
        moves us on to the generated instead of included asm file model and
        the other is a pull request from David Howells for UAPI
        disintegration.
      
      Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com&gt;">
      
      * tag 'parisc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6:
        UAPI: (Scripted) Disintegrate arch/parisc/include/asm
        [PARISC] asm: redo generic includes
      22054fbe
    • Rafael J. Wysocki's avatar
      MAINTAINERS: Add Rafael's address to ACPI maintainers · ea26d0cf
      Rafael J. Wysocki authored
      
      
      Since I will be maintaining ACPI together with Len from now on, add my
      address to the ACPI maintainers list in the MAINTAINERS file (this is
      the address to send patches to).
      
      Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
      Acked-by: default avatarLen Brown <len.brown@intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      ea26d0cf
    • Linus Torvalds's avatar
      Merge branch 'for-3.7' of git://linux-nfs.org/~bfields/linux · 90cdb1a0
      Linus Torvalds authored
      Pull nfsd bugfixes from J Bruce Fields.
      
      * 'for-3.7' of git://linux-nfs.org/~bfields/linux:
        SUNRPC: Prevent kernel stack corruption on long values of flush
        NLM: nlm_lookup_file() may return NLMv4-specific error codes
      90cdb1a0
    • Ben Collins's avatar
      USB: ehci-fsl: Return valid error in ehci_fsl_setup_phy · d479c911
      Ben Collins authored
      ehci_fsl_setup_phy is supposed to return an int, but had a void return
      value in the case of controller_ver being invalid.
      
      Introduced by commit 3735ba8d
      
       ("powerpc/usb: fix bug of CPU hang
      when missing USB PHY clock"), which missed one return.
      
      Signed-off-by: default avatarBen Collins <ben.c@servergy.com>
      Cc: Shengzhou Liu <Shengzhou.Liu@freescale.com>
      Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      d479c911
    • Chris Zankel's avatar
      xtensa: add missing system calls to the syscall table · 7216cabf
      Chris Zankel authored
      
      
      Add the following system calls to the syscall table:
      
      fallocate
      sendmmsg
      umount2
      syncfs
      epoll_create1
      inotify_init1
      signalfd4
      dup3
      pipe2
      timerfd_create
      timerfd_settime
      timerfd_gettime
      eventfd2
      preadv
      pwritev
      fanotify_init
      fanotify_mark
      process_vm_readv
      process_vm_writev
      name_to_handle_at
      open_by_handle_at
      sync_file_range
      perf_event_open
      rt_tgsigqueueinfo
      clock_adjtime
      prlimit64
      kcmp
      
      Note that we have to use the 'sys_sync_file_range2' version, so that
      the 64-bit arguments are aligned correctly to the argument registers.
      
      Signed-off-by: default avatarChris Zankel <chris@zankel.net>
      7216cabf
    • James Bottomley's avatar
      Merge tag 'disintegrate-parisc-20121016' into for-linus · 6238559f
      James Bottomley authored
      
      
      UAPI Disintegration 2012-10-16
      
      Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
      6238559f
    • Chris Zankel's avatar
      xtensa: minor compiler warning fix · 39070cb8
      Chris Zankel authored
      
      
      Fix two compiler warnings complaining about truncating a value on
      a 64-bit host, and about declaring an unused variable that is only
      used for a specific configuration.
      
      Signed-off-by: default avatarChris Zankel <chris@zankel.net>
      39070cb8
  2. Oct 19, 2012
    • Rusty Russell's avatar
      kbuild: sign the modules at install time · e2a666d5
      Rusty Russell authored
      
      
      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: default avatarRusty Russell <rusty@rustcorp.com.au>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      e2a666d5
    • H. Peter Anvin's avatar
      Merge commit '5bc66170' into x86/urgent · 4533d862
      H. Peter Anvin authored
      
      
      From Borislav Petkov <bp@amd64.org>:
      
      Below is a RAS fix which reverts the addition of a sysfs attribute
      which we agreed is not needed, post-factum. And this should go in now
      because that sysfs attribute is going to end up in 3.7 otherwise and
      thus exposed to userspace; removing it then would be a lot harder.
      
      This is done as a merge rather than a simple patch/cherry-pick since
      the baseline for this patch was not in the previous x86/urgent.
      
      Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
      4533d862
    • Borislav Petkov's avatar
      x86, MCE: Remove bios_cmci_threshold sysfs attribute · 5bc66170
      Borislav Petkov authored
      450cc201
      
       ("x86/mce: Provide boot argument to honour bios-set CMCI
      threshold") added the bios_cmci_threshold sysfs attribute which was
      supposed to communicate to userspace tools that BIOS CMCI threshold has
      been honoured.
      
      However, this info is not of any importance to userspace - it should
      rather get the actual error count it has been thresholded already from
      MCi_STATUS[38:52].
      
      So drop this before it becomes a used interface (good thing we caught
      this early in 3.7-rc1, right after the merge window closed).
      
      Cc: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
      Acked-by: default avatarTony Luck <tony.luck@intel.com>
      Link: http://lkml.kernel.org/r/20121017105940.GA14590@x1.osrc.amd.com
      Signed-off-by: default avatarBorislav Petkov <borislav.petkov@amd.com>
      5bc66170
    • Linus Torvalds's avatar
      Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media · c9623de4
      Linus Torvalds authored
      Pull media fixes from Mauro Carvalho Chehab:
       "Media fixes for:
         - one Kconfig fix patch;
         - one patch fixing DocBook breakage due to the drivers/media UAPI
           changes;
         - the remaining UAPI media changes (DVB API).
      
        I'm aware that is is a little late for the UAPI renames for the DVB
        API, but IMHO, it is better to merge it for 3.7, due to two reasons:
      
         1) There is a major rename at 3.7 (not only uapi changes, but also
            the entire media drivers were reorganized on 3.7, in order to
            simplify the Kconfig logic, and easy drivers selection, especially
            for hybrid devices).  By confining all those renames there at 3.7
            it will cause all the harm at for media developers on just one
            shot.  Stable backports upstream and at distros will likely
            welcome it as well, as they won't need to check what changed on
            3.7 and what was postponed for on 3.8.
      
         2) The V4L2 DocBook Makefile creates a cross-reference between the
            media API headers and the specs.  This helps us _a_lot_ to be sure
            that all API improvements are properly documented.  Every time a
            header changes from one place to another, DocBook/media/Makefile
            needs to be patched.  Currently, the DocBook breakage patch
            depends on the DVB UAPI."
      
      * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
        [media] Kconfig: Fix dependencies for driver autoselect options
        DocBook/media/Makefile: Fix build due to uapi breakage
        UAPI: (Scripted) Disintegrate include/linux/dvb
      c9623de4
    • Richard Kuo's avatar
      Hexagon: Copyright marking changes · e1858b2a
      Richard Kuo authored
      
      
      Code Aurora Forum (CAF) is becoming a part of Linux Foundation Labs.
      
      Signed-off-by: default avatarRichard Kuo <rkuo@codeaurora.org>
      e1858b2a
    • David Howells's avatar
    • Jussi Kivilinna's avatar
      crypto: aesni - fix XTS mode on x86-32, add wrapper function for asmlinkage aesni_enc() · 32bec973
      Jussi Kivilinna authored
      
      
      Calling convention for internal functions and 'asmlinkage' functions is
      different on x86-32. Therefore do not directly cast aesni_enc as XTS tweak
      function, but use wrapper function in between. Fixes crash with "XTS +
      aesni_intel + x86-32" combination.
      
      Cc: stable@vger.kernel.org
      Reported-by: default avatarKrzysztof Kolasa <kkolasa@winsoft.pl>
      Signed-off-by: default avatarJussi Kivilinna <jussi.kivilinna@mbnet.fi>
      Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      32bec973
    • David Rientjes's avatar
      fs, xattr: fix bug when removing a name not in xattr list · 43385846
      David Rientjes authored
      Commit 38f38657
      
       ("xattr: extract simple_xattr code from tmpfs") moved
      some code from tmpfs but introduced a subtle bug along the way.
      
      If the name passed to simple_xattr_remove() does not exist in the list of
      xattrs, then it is possible to call kfree(new_xattr) when new_xattr is
      actually initialized to itself on the stack via uninitialized_var().
      
      This causes a BUG() since the memory was not allocated via the slab
      allocator and was not bypassed through to the page allocator because it
      was too large.
      
      Initialize the local variable to NULL so the kfree() never takes place.
      
      Reported-by: default avatarFengguang Wu <fengguang.wu@intel.com>
      Signed-off-by: default avatarDavid Rientjes <rientjes@google.com>
      Acked-by: default avatarHugh Dickins <hughd@google.com>
      Acked-by: default avatarAristeu Rozanski <aris@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      43385846
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · d63e210e
      Linus Torvalds authored
      Pull MIPS fixes from Ralf Baechle:
       "Random small fixes across the MIPS code."
      
      * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
        MIPS: CMP: Fix physical core number calculation logic
        MIPS: JZ4740: Forward declare struct uart_port in header.
        MIPS: JZ4740: Fix '#include guard' in serial.h
        MIPS: hugetlbfs: Fix hazard between tlb write and pagemask restoration.
        MIPS: Restore pagemask after dumping the TLB.
        MIPS: Hugetlbfs: Handle huge pages correctly in pmd_bad()
        MIPS: R5000: Fix TLB hazard handling.
        MIPS: tlbex: Deal with re-definition of label
        MIPS: Make __{,n,u}delay declarations match definitions and generic delay.h
      d63e210e
    • Linus Torvalds's avatar
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · a0a6a39e
      Linus Torvalds authored
      Pull powerpc fixes from Benjamin Herrenschmidt:
       "Here are a handful of powerpc related fixes."
      
      * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
        cpuidle/powerpc: Fix snooze state problem in the cpuidle design on pseries.
        cpuidle/powerpc: Fix smt_snooze_delay functionality.
        cpuidle/powerpc: Fix target residency initialisation in pseries cpuidle
        powerpc: Build fix for powerpc KVM
        Revert "powerpc/perf: Use pmc_overflow() to detect rolled back events"
      a0a6a39e
    • Linus Torvalds's avatar
      Merge tag 'dt-fixes-for-3.7' of git://sources.calxeda.com/kernel/linux · bab58350
      Linus Torvalds authored
      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
      bab58350
    • Linus Torvalds's avatar
      Merge tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · ec351832
      Linus Torvalds authored
      Pull sound fixes from Takashi Iwai:
       "Significant changes are:
         - A regression fix for the new HD-audio LPIB delay counting,
           VGA-switcheroo race fix
         - ASoC ams-delta fix for the broken driver loading
      
        Otherwise a collection of mostly small / trivial fixes."
      
      * tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: emu10k1: add chip details for E-mu 1010 PCIe card
        ALSA: hda - Always check array bounds in alc_get_line_out_pfx
        ASoC: bells: Correct typo in sub speaker DAI name for WM5110
        ALSA: hda - Stop LPIB delay counting on broken hardware
        ALSA: hda - Fix registration race of VGA switcheroo
        ALSA: hda - Clean up superfluous position_fix list entries
        ALSA: ac97 - Fix missing NULL check in snd_ac97_cvol_new()
        ASoC: codecs: da9055: Minor improvement in ALC calibration process
        ASoC: dmaengine: Correct Makefile when sound is built as module
        ASoC: fsi: don't reschedule DMA from an atomic context
        ASoC: fix documentation in soc-jack
        ARM: pxa: Fix build error caused by sram.h rename
        ASoC: wm2200: Fix non-inverted OUT2 mute control
        ASoC: wm2200: Use rev A register patches on rev B
        ASoC: bells: Correct typo in sub speaker DAI name for WM5110
        ASoC: ams-delta: Convert to use snd_soc_register_card()
        ASoC: omap-mcpdm: Remove OMAP revision check
        ASoC: Fix wrong include for McPDM
        ASoC: omap-abe-twl6040: Fix typo of Vibrator
        ASoC: twl6040: Fix Stream DAPM mapping
      ec351832
  3. Oct 18, 2012
    • Bjørn Mork's avatar
      USB: option: add more ZTE devices · 4b35f1c5
      Bjørn Mork authored
      
      
      Cc: <stable@vger.kernel.org>
      Signed-off-by: default avatarBjørn Mork <bjorn@mork.no>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      4b35f1c5
    • Bjørn Mork's avatar
      USB: option: blacklist net interface on ZTE devices · 1452df6f
      Bjørn Mork authored
      
      
      Based on information from the ZTE Windows drivers.
      
      Cc: <stable@vger.kernel.org>
      Signed-off-by: default avatarBjørn Mork <bjorn@mork.no>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      1452df6f
    • Greg Kroah-Hartman's avatar
      Merge tag 'fixes-for-v3.7-rc2' of... · 6b7ced68
      Greg Kroah-Hartman authored
      Merge tag 'fixes-for-v3.7-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus
      
      usb: fixes for v3.7-rc2
      
      Here's the first set of fixes for v3.7-rc cycle.
      
      DesignWare Core USB3 Driver (dwc3) got two fixes. The first one fixes a long
      standing bug which would keep endpoint with BUSY flag set forever if we cancel
      a transfer which has already been started by the controller. The second fix
      will just switch PHYs back off when DWC3 driver is removed.
      
      MUSB fixed a bug which would cause a Kernel Oops at least on AM3517 when
      removing a device. For some reason that particular device can fall into a
      situation where you have both Disconnect and Endpoint IRQs happen
      simultaneously (have both bits set in IRQ_STATUS register) and, because
      Disconnect Interrupt is handled before Endpoint Interrupts, we would try to
      transfer data over a disconnected device, thus generating a kernel oops.
      
      Renensas' USB DRD driver got two fixes which are a) fixing an off-by-one bug on
      the pipe iterator implementation and b) fixing Interrupt Status Clear procedure
      in order to properly clear a single Interrupt event without clearing (and
      masking) other events we didn't handle yet.
      6b7ced68