1. 26 Jan, 2015 13 commits
    • Pranith Kumar's avatar
      printk: add dummy routine for when CONFIG_PRINTK=n · 07261edb
      Pranith Kumar authored
      There are missing dummy routines for log_buf_addr_get() and
      log_buf_len_get() for when CONFIG_PRINTK is not set causing build
      failures.
      
      This patch adds these dummy routines at the appropriate location.
      Signed-off-by: default avatarPranith Kumar <bobby.prani@gmail.com>
      Cc: Michael Ellerman <mpe@ellerman.id.au>
      Reviewed-by: default avatarPetr Mladek <pmladek@suse.cz>
      Acked-by: default avatarSteven Rostedt <rostedt@goodmis.org>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      07261edb
    • Michael S. Tsirkin's avatar
      mm/vmscan: fix highidx argument type · 17636faa
      Michael S. Tsirkin authored
      for_each_zone_zonelist_nodemask wants an enum zone_type argument, but is
      passed gfp_t:
      
        mm/vmscan.c:2658:9:    expected int enum zone_type [signed] highest_zoneidx
        mm/vmscan.c:2658:9:    got restricted gfp_t [usertype] gfp_mask
        mm/vmscan.c:2658:9: warning: incorrect type in argument 2 (different base types)
        mm/vmscan.c:2658:9:    expected int enum zone_type [signed] highest_zoneidx
        mm/vmscan.c:2658:9:    got restricted gfp_t [usertype] gfp_mask
      
      convert argument to the correct type.
      Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
      Cc: Johannes Weiner <hannes@cmpxchg.org>
      Cc: Vladimir Davydov <vdavydov@parallels.com>
      Cc: Rik van Riel <riel@redhat.com>
      Cc: Michal Hocko <mhocko@suse.cz>
      Cc: Mel Gorman <mgorman@suse.de>
      Cc: Vlastimil Babka <vbabka@suse.cz>
      Cc: Suleiman Souhlal <suleiman@google.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      17636faa
    • Greg Thelen's avatar
      memcg: remove extra newlines from memcg oom kill log · 0346dadb
      Greg Thelen authored
      Commit e61734c5 ("cgroup: remove cgroup->name") added two extra
      newlines to memcg oom kill log messages.  This makes dmesg hard to read
      and parse.  The issue affects 3.15+.
      
      Example:
      
        Task in /t                          <<< extra #1
         killed as a result of limit of /t
                                            <<< extra #2
        memory: usage 102400kB, limit 102400kB, failcnt 274712
      
      Remove the extra newlines from memcg oom kill messages, so the messages
      look like:
      
        Task in /t killed as a result of limit of /t
        memory: usage 102400kB, limit 102400kB, failcnt 240649
      
      Fixes: e61734c5 ("cgroup: remove cgroup->name")
      Signed-off-by: default avatarGreg Thelen <gthelen@google.com>
      Acked-by: default avatarMichal Hocko <mhocko@suse.cz>
      Acked-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      0346dadb
    • Kees Cook's avatar
      x86, build: replace Perl script with Shell script · d69911a6
      Kees Cook authored
      Commit e6023367 ("x86, kaslr: Prevent .bss from overlaping initrd")
      added Perl to the required build environment.  This reimplements in
      shell the Perl script used to find the size of the kernel with bss and
      brk added.
      Signed-off-by: default avatarKees Cook <keescook@chromium.org>
      Reported-by: default avatarRob Landley <rob@landley.net>
      Acked-by: default avatarRob Landley <rob@landley.net>
      Cc: Anca Emanuel <anca.emanuel@gmail.com>
      Cc: Fengguang Wu <fengguang.wu@intel.com>
      Cc: Junjie Mao <eternal.n08@gmail.com>
      Cc: Kees Cook <keescook@chromium.org>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      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>
      d69911a6
    • Johannes Weiner's avatar
      mm: page_alloc: embed OOM killing naturally into allocation slowpath · 9879de73
      Johannes Weiner authored
      The OOM killing invocation does a lot of duplicative checks against the
      task's allocation context.  Rework it to take advantage of the existing
      checks in the allocator slowpath.
      
      The OOM killer is invoked when the allocator is unable to reclaim any
      pages but the allocation has to keep looping.  Instead of having a check
      for __GFP_NORETRY hidden in oom_gfp_allowed(), just move the OOM
      invocation to the true branch of should_alloc_retry().  The __GFP_FS
      check from oom_gfp_allowed() can then be moved into the OOM avoidance
      branch in __alloc_pages_may_oom(), along with the PF_DUMPCORE test.
      
      __alloc_pages_may_oom() can then signal to the caller whether the OOM
      killer was invoked, instead of requiring it to duplicate the order and
      high_zoneidx checks to guess this when deciding whether to continue.
      Signed-off-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
      Acked-by: default avatarMichal Hocko <mhocko@suse.cz>
      Cc: David Rientjes <rientjes@google.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      9879de73
    • Linus Torvalds's avatar
      Linux 3.19-rc6 · 26bc420b
      Linus Torvalds authored
      26bc420b
    • Linus Torvalds's avatar
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 14746306
      Linus Torvalds authored
      Pull x86 fixes from Thomas Gleixner:
       "Hopefully the last round of fixes for 3.19
      
         - regression fix for the LDT changes
         - regression fix for XEN interrupt handling caused by the APIC
           changes
         - regression fixes for the PAT changes
         - last minute fixes for new the MPX support
         - regression fix for 32bit UP
         - fix for a long standing relocation issue on 64bit tagged for stable
         - functional fix for the Hyper-V clocksource tagged for stable
         - downgrade of a pr_err which tends to confuse users
      
        Looks a bit on the large side, but almost half of it are valuable
        comments"
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/tsc: Change Fast TSC calibration failed from error to info
        x86/apic: Re-enable PCI_MSI support for non-SMP X86_32
        x86, mm: Change cachemode exports to non-gpl
        x86, tls: Interpret an all-zero struct user_desc as "no segment"
        x86, tls, ldt: Stop checking lm in LDT_empty
        x86, mpx: Strictly enforce empty prctl() args
        x86, mpx: Fix potential performance issue on unmaps
        x86, mpx: Explicitly disable 32-bit MPX support on 64-bit kernels
        x86, hyperv: Mark the Hyper-V clocksource as being continuous
        x86: Don't rely on VMWare emulating PAT MSR correctly
        x86, irq: Properly tag virtualization entry in /proc/interrupts
        x86, boot: Skip relocs when load address unchanged
        x86/xen: Override ACPI IRQ management callback __acpi_unregister_gsi
        ACPI: pci: Do not clear pci_dev->irq in acpi_pci_irq_disable()
        x86/xen: Treat SCI interrupt as normal GSI interrupt
      14746306
    • Linus Torvalds's avatar
      Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 4d2f0ef1
      Linus Torvalds authored
      Pull irq fixes from Thomas Gleixner:
       "From the irqchip departement you get:
      
         - regression fix for omap-intc
      
         - regression fix for atmel-aic-common
      
         - functional correctness fix for hip04
      
         - type mismatch fix for gic-v3-its
      
         - proper error pointer check for mtd-sysirq
      
        Mostly one and two liners except for the omap regression fix which is
        slightly larger than desired"
      
      * 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        irqchip: atmel-aic-common: Prevent clobbering of priority when changing IRQ type
        irqchip: omap-intc: Fix legacy DMA regression
        irqchip: gic-v3-its: Fix use of max with decimal constant
        irqchip: hip04: Initialize hip04_cpu_map to 0xffff
        irqchip: mtk-sysirq: Use IS_ERR() instead of NULL pointer check
      4d2f0ef1
    • Linus Torvalds's avatar
      Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · b73f0c8f
      Linus Torvalds authored
      Pull timer fixes from Thomas Gleixner:
       "A set of small fixes:
      
         - regression fix for exynos_mct clocksource
      
         - trivial build fix for kona clocksource
      
         - functional one liner fix for the sh_tmu clocksource
      
         - two validation fixes to prevent (root only) data corruption in the
           kernel via settimeofday and adjtimex.  Tagged for stable"
      
      * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        time: adjtimex: Validate the ADJ_FREQUENCY values
        time: settimeofday: Validate the values of tv from user
        clocksource: sh_tmu: Set cpu_possible_mask to fix SMP broadcast
        clocksource: kona: fix __iomem annotation
        clocksource: exynos_mct: Fix bitmask regression for exynos4_mct_write
      b73f0c8f
    • Linus Torvalds's avatar
      Merge tag 'armsoc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 71a59b12
      Linus Torvalds authored
      Pull ARM SoC fixes from Olof Johansson:
       "A week's worth of fixes for various ARM platforms.  Diff wise, the
        largest fix is for OMAP to deal with how GIC now registers interrupts
        (irq_domain_add_legacy() -> irq_domain_add_linear() changes).
      
        Besides this, a few more renesas platforms needed the GIC instatiation
        done for legacy boards.  There's also a fix that disables coherency of
        mvebu due to issues, and a few other smaller fixes"
      
      * tag 'armsoc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        arm64: dts: add baud rate to Juno stdout-path
        ARM: dts: imx25: Fix PWM "per" clocks
        bus: mvebu-mbus: fix support of MBus window 13
        Merge tag 'mvebu-fixes-3.19-3' of git://git.infradead.org/linux-mvebu into fixes
        ARM: mvebu: completely disable hardware I/O coherency
        ARM: OMAP: Work around hardcoded interrupts
        ARM: shmobile: r8a7779: Instantiate GIC from C board code in legacy builds
        ARM: shmobile: r8a7778: Instantiate GIC from C board code in legacy builds
        arm: boot: dts: dra7: enable dwc3 suspend PHY quirk
      71a59b12
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · 80a75554
      Linus Torvalds authored
      Pull vfs fixes from Al Viro:
       "A couple of fixes - deadlock in CIFS and build breakage in cris serial
        driver (resurfaced f_dentry in there)"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        VFS: Convert file->f_dentry->d_inode to file_inode()
        fix deadlock in cifs_ioctl_clone()
      80a75554
    • Linus Torvalds's avatar
      Merge tag 'dm-3.19-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm · bfc835b5
      Linus Torvalds authored
      Pull device mapper fixes from Mike Snitzer:
       "Two stable fixes for dm-cache and one 3.19 DM core fix:
      
         - fix potential for dm-cache metadata corruption via stale metadata
           buffers being used when switching an inactive cache table to
           active; this could occur due to each table having it's own bufio
           client rather than sharing the client between tables.
      
         - fix dm-cache target to properly account for discard IO while
           suspending otherwise IO quiescing could complete prematurely.
      
         - fix DM core's handling of multiple internal suspends by maintaining
           an 'internal_suspend_count' and only resuming the device when this
           count drops to zero"
      
      * tag 'dm-3.19-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
        dm: fix handling of multiple internal suspends
        dm cache: fix problematic dual use of a single migration count variable
        dm cache: share cache-metadata object across inactive and active DM tables
      bfc835b5
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.dk/linux-block · 8e908e99
      Linus Torvalds authored
      Pull two block layer fixes from Jens Axboe:
       "Two small patches that should make it into 3.19:
      
         - a fixup from me for NVMe, making the cq_vector a signed variable.
           Otherwise our -1 comparison fails, and commit 2b25d981 doesn't
           do what it was supposed to.
      
         - a fixup for the hotplug handling for blk-mq from Ming Lei, using
           the proper kobject referencing to ensure we release resources at
           the right time"
      
      * 'for-linus' of git://git.kernel.dk/linux-block:
        blk-mq: fix hctx/ctx kobject use-after-free
        NVMe: cq_vector should be signed
      8e908e99
  2. 24 Jan, 2015 11 commits
  3. 23 Jan, 2015 16 commits