Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Mar 1, 2011
  1. @torvalds

    Linux 2.6.38-rc7

    torvalds authored
  2. @torvalds

    Revert "TPM: Long default timeout fix"

    torvalds authored
    This reverts commit c4ff4b8.
    
    Ted Ts'o reports:
    
     "TPM is working for me so I can log into employer's network in 2.6.37.
      It broke when I tried 2.6.38-rc6, with the following relevant lines
      from my dmesg:
    
      [   11.081627] tpm_tis 00:0b: 1.2 TPM (device-id 0x0, rev-id 78)
      [   25.734114] tpm_tis 00:0b: Operation Timed out
      [   78.040949] tpm_tis 00:0b: Operation Timed out
    
      This caused me to get suspicious, especially since the _other_ TPM
      commit in 2.6.38 had already been reverted, so I tried reverting
      commit c4ff4b8: "TPM: Long default timeout fix".  With this commit
      reverted, my TPM on my Lenovo T410 is once again working."
    
    Requested-and-tested-by: Theodore Ts'o <tytso@mit.edu>
    Acked-by: Rajiv Andrade <srajiv@linux.vnet.ibm.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  3. @torvalds

    Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/…

    torvalds authored
    …kernel/git/groeck/staging
    
    * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging:
      hwmon: (adt7411) add MODULE_DEVICE_TABLE
      hwmon: (ad7414) add MODULE_DEVICE_TABLE
  4. @torvalds

    fs/block_dev.c: fix new kernel-doc warning

    Randy Dunlap authored torvalds committed
    Fix new kernel-doc warning in fs/block_dev.c:
    
    Warning(fs/block_dev.c:937): No description found for parameter 'kill_dirty'
    
    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  5. @rjwysocki @torvalds

    ACPI: Fix build for CONFIG_NET unset

    rjwysocki authored torvalds committed
    Several ACPI drivers fail to build if CONFIG_NET is unset, because
    they refer to things depending on CONFIG_THERMAL that in turn depends
    on CONFIG_NET.  However, CONFIG_THERMAL doesn't really need to depend
    on CONFIG_NET, because the only part of it requiring CONFIG_NET is
    the netlink interface in thermal_sys.c.
    
    Put the netlink interface in thermal_sys.c under #ifdef CONFIG_NET
    and remove the dependency of CONFIG_THERMAL on CONFIG_NET from
    drivers/thermal/Kconfig.
    
    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
    Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
    Cc: Ingo Molnar <mingo@elte.hu>
    Cc: Len Brown <lenb@kernel.org>
    Cc: Stephen Rothwell <sfr@canb.auug.org.au>
    Cc: Luming Yu <luming.yu@intel.com>
    Cc: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  6. @torvalds

    Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/airlied/drm-2.6
    
    * 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
      drm: fix unsigned vs signed comparison issue in modeset ctl ioctl.
      drm/nv50-nvc0: make sure vma is definitely unmapped when destroying bo
  7. @torvalds

    Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/l…

    torvalds authored
    …inux/kernel/git/tmlind/linux-omap-2.6
    
    * 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
      omap4: prcm: Fix the CPUx clockdomain offsets
      OMAP2+: clocksource: fix crash on boot when !CONFIG_OMAP_32K_TIMER
      OMAP2/3: clock: fix fint calculation for DPLL_FREQSEL
      OMAP2+: mailbox: fix lookups for multiple mailboxes
      OMAP2420: mailbox: fix IVA vs DSP IRQ numbering
      mach-omap2: smartreflex: world-writable debugfs voltage files
      mach-omap2: pm: world-writable debugfs timer files
      mach-omap2: mux: world-writable debugfs files
  8. @torvalds

    Merge branches 'perf-fixes-for-linus', 'x86-fixes-for-linus' and 'tim…

    torvalds authored
    …ers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
    
    * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      perf timechart: Fix max number of cpus
      perf timechart: Fix black idle boxes in the title
      perf hists: Print number of samples, not the period sum
    
    * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      x86: Use u32 instead of long to set reset vector back to 0
    
    * 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      clockevents: Prevent oneshot mode when broadcast device is periodic
  9. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/mszeredi/fuse
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
      fuse: fix truncate after open
      fuse: fix hang of single threaded fuseblk filesystem
  10. @torvalds

    Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/k…

    torvalds authored
    …ernel/git/jlbec/ocfs2
    
    * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2:
      ocfs2: Check heartbeat mode for kernel stacks only
      Ocfs2/refcounttree: Fix a bug for refcounttree to writeback clusters in a right number.
      ocfs2: Fix estimate of necessary credits for mkdir
  11. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/tiwai/sound-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
      eukrea-tlv320: fix platform_name
      ASoC: correct pxa AC97 DAI names
      ALSA: hda - Add support for new IDT 92HD98 and 92HD99 codecs
      ALSA: HDA: Add ideapad quirk for two Dell machines
      ALSA: HDA: Add a new Conexant codec 506e (20590)
      ALSA: usb-audio: fix oops due to cleanup race when disconnecting
      ASoC: Hook wm_hubs micbiases up to CLK_SYS
      ASoC: Correct definition of WM8903_VMID_RES_5K
      ASoC: Fix WM8958 default microphone detection argument ordering
      ALSA: HDA: Fix mic initialization in VIA auto parser
      ALSA: fix one memory leak in sound jack
  12. @torvalds

    mm: <asm-generic/pgtable.h> must include <linux/mm_types.h>

    Ben Hutchings authored torvalds committed
    Commit e2cda32 ("thp: add pmd mangling generic functions") replaced
    some macros in <asm-generic/pgtable.h> with inline functions.
    
    If the functions are to be defined (not all architectures need them)
    then struct vm_area_struct must be defined first.  So include
    <linux/mm_types.h>.
    
    Fixes a build failure seen in Debian:
    
        CC [M]  drivers/media/dvb/mantis/mantis_pci.o
      In file included from arch/arm/include/asm/pgtable.h:460,
                       from drivers/media/dvb/mantis/mantis_pci.c:25:
      include/asm-generic/pgtable.h: In function 'ptep_test_and_clear_young':
      include/asm-generic/pgtable.h:29: error: dereferencing pointer to incomplete type
    
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Commits on Feb 28, 2011
  1. x86: Use u32 instead of long to set reset vector back to 0

    Don Zickus authored Ingo Molnar committed
    A customer of ours, complained that when setting the reset
    vector back to 0, it trashed other data and hung their box.
    They noticed when only 4 bytes were set to 0 instead of 8,
    everything worked correctly.
    
    Mathew pointed out:
    
     |
     | We're supposed to be resetting trampoline_phys_low and
     | trampoline_phys_high here, which are two 16-bit values.
     | Writing 64 bits is definitely going to overwrite space
     | that we're not supposed to be touching.
     |
    
    So limit the area modified to u32.
    
    Signed-off-by: Don Zickus <dzickus@redhat.com>
    Acked-by: Matthew Garrett <mjg@redhat.com>
    Cc: <stable@kernel.org>
    LKML-Reference: <1297139100-424-1-git-send-email-dzickus@redhat.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
  2. @watologo1

    perf timechart: Fix max number of cpus

    watologo1 authored Ingo Molnar committed
    Currently numcpus is determined in pid_put_sample which is only
    called on sched_switch/sched_wakeup sample processing.
    
    On a machine with a lot cpus I often saw the last cpu missing.
    
    Check for (max) numcpus on every event happening and in the
    beginning. -> fixes the issue for me.
    
    Signed-off-by: Thomas Renninger <trenn@suse.de>
    Cc: Arjan van de Ven <arjan@linux.intel.com>
    Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
    Cc: lenb@kernel.org
    LKML-Reference: <1298842606-55712-6-git-send-email-trenn@suse.de>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
  3. @watologo1

    perf timechart: Fix black idle boxes in the title

    watologo1 authored Ingo Molnar committed
    This fix is needed for eye of gnome and firefox svg viewers.
    Only Inkscape can handle the broken case.
    
    Compare with the other svg_legenda_box declarations, looks
    like a typo slipped in at this place.
    
    Signed-off-by: Thomas Renninger <trenn@suse.de>
    Cc: Arjan van de Ven <arjan@linux.intel.com>
    Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
    Cc: lenb@kernel.org
    LKML-Reference: <1298842606-55712-5-git-send-email-trenn@suse.de>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
  4. Merge remote branch 'nouveau/drm-nouveau-fixes' of /ssd/git/drm-nouve…

    Dave Airlie authored
    …au-next into drm-fixes
    
    * 'nouveau/drm-nouveau-fixes' of /ssd/git/drm-nouveau-next:
      drm/nv50-nvc0: make sure vma is definitely unmapped when destroying bo
  5. drm: fix unsigned vs signed comparison issue in modeset ctl ioctl.

    Dave Airlie authored
    This fixes CVE-2011-1013.
    
    Reported-by: Matthiew Herrb (OpenBSD X.org team)
    Cc: stable@kernel.org
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  6. drm/nv50-nvc0: make sure vma is definitely unmapped when destroying bo

    Ben Skeggs authored
    Somehow fixes a misrendering + hang at GDM startup on my NVA8...
    
    My first guess would have been stale TLB entries laying around that a new
    bo then accidentally inherits.  That doesn't make a great deal of sense
    however, as when we mapped the pages for the new bo the TLBs would've
    gotten flushed anyway.
    
    Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Commits on Feb 26, 2011
  1. @AxelLin

    hwmon: (adt7411) add MODULE_DEVICE_TABLE

    AxelLin authored Guenter Roeck committed
    The device table is required to load modules based on modaliases.
    
    Signed-off-by: Axel Lin <axel.lin@gmail.com>
    Acked-by: Wolfram Sang <w.sang@pengutronix.de>
    Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
  2. @AxelLin

    hwmon: (ad7414) add MODULE_DEVICE_TABLE

    AxelLin authored Guenter Roeck committed
    The device table is required to load modules based on modaliases.
    
    Signed-off-by: Axel Lin <axel.lin@gmail.com>
    Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
  3. @tiwai
  4. clockevents: Prevent oneshot mode when broadcast device is periodic

    Thomas Gleixner authored
    When the per cpu timer is marked CLOCK_EVT_FEAT_C3STOP, then we only
    can switch into oneshot mode, when the backup broadcast device
    supports oneshot mode as well. Otherwise we would try to switch the
    broadcast device into an unsupported mode unconditionally. This went
    unnoticed so far as the current available broadcast devices support
    oneshot mode. Seth unearthed this problem while debugging and working
    around an hpet related BIOS wreckage.
    
    Add the necessary check to tick_is_oneshot_available().
    
    Reported-and-tested-by: Seth Forshee <seth.forshee@canonical.com>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    LKML-Reference: <alpine.LFD.2.00.1102252231200.2701@localhost6.localdomain6>
    Cc: stable@kernel.org # .21 ->
Commits on Feb 25, 2011
  1. @torvalds

    Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/…

    torvalds authored
    …git/rafael/suspend-2.6
    
    * 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
      PM: Make ACPI wakeup from S5 work again when CONFIG_PM_SLEEP is unset
  2. @abou9 @torvalds

    rapidio: fix sysfs config attribute to access 16MB of maint space

    abou9 authored torvalds committed
    Fixes sysfs config attribute to allow access to entire 16MB maintenance
    space of RapidIO devices.
    
    Signed-off-by: Alexandre Bounine <alexandre.bounine@idt.com>
    Cc: Kumar Gala <galak@kernel.crashing.org>
    Cc: Matt Porter <mporter@kernel.crashing.org>
    Cc: Li Yang <leoli@freescale.com>
    Cc: Thomas Moll <thomas.moll@sysgo.com>
    Cc: Micha Nelissen <micha@neli.hopto.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  3. @ago @torvalds

    pps: initialize ts_real properly

    ago authored torvalds committed
    Initialize ts_real.flags to fix compiler warning about possible
    uninitialized use of this field.
    
    Signed-off-by: Alexander Gordeev <lasaine@lvk.cs.msu.su>
    Cc: john stultz <johnstul@us.ibm.com>
    Cc: Rodolfo Giometti <giometti@linux.it>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  4. @torvalds

    memcg: more mem_cgroup_uncharge() batching

    Hugh Dickins authored torvalds committed
    It seems odd that truncate_inode_pages_range(), called not only when
    truncating but also when evicting inodes, has mem_cgroup_uncharge_start
    and _end() batching in its second loop to clear up a few leftovers, but
    not in its first loop that does almost all the work: add them there too.
    
    Signed-off-by: Hugh Dickins <hughd@google.com>
    Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
    Acked-by: Balbir Singh <balbir@linux.vnet.ibm.com>
    Acked-by: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  5. @torvalds

    thp: fix interleaving for transparent hugepages

    Andi Kleen authored torvalds committed
    The THP code didn't pass the correct interleaving shift to the memory
    policy code.  Fix this here by adjusting for the order.
    
    Signed-off-by: Andi Kleen <ak@linux.intel.com>
    Reviewed-by: Christoph Lameter <cl@linux.com>
    Acked-by: Andrea Arcangeli <aarcange@redhat.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  6. @jankara @torvalds

    aio: fix race between io_destroy() and io_submit()

    jankara authored torvalds committed
    A race can occur when io_submit() races with io_destroy():
    
     CPU1						CPU2
    io_submit()
      do_io_submit()
        ...
        ctx = lookup_ioctx(ctx_id);
    						io_destroy()
        Now do_io_submit() holds the last reference to ctx.
        ...
        queue new AIO
        put_ioctx(ctx) - frees ctx with active AIOs
    
    We solve this issue by checking whether ctx is being destroyed in AIO
    submission path after adding new AIO to ctx.  Then we are guaranteed that
    either io_destroy() waits for new AIO or we see that ctx is being
    destroyed and bail out.
    
    Cc: Nick Piggin <npiggin@kernel.dk>
    Reviewed-by: Jeff Moyer <jmoyer@redhat.com>
    Signed-off-by: Jan Kara <jack@suse.cz>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  7. @torvalds

    aio: fix rcu ioctx lookup

    Nick Piggin authored torvalds committed
    aio-dio-invalidate-failure GPFs in aio_put_req from io_submit.
    
    lookup_ioctx doesn't implement the rcu lookup pattern properly.
    rcu_read_lock does not prevent refcount going to zero, so we might take
    a refcount on a zero count ioctx.
    
    Fix the bug by atomically testing for zero refcount before incrementing.
    
    [jack@suse.cz: added comment into the code]
    Reviewed-by: Jeff Moyer <jmoyer@redhat.com>
    Signed-off-by: Nick Piggin <npiggin@kernel.dk>
    Signed-off-by: Jan Kara <jack@suse.cz>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  8. @namhyung @torvalds

    mm: fix dubious code in __count_immobile_pages()

    namhyung authored torvalds committed
    When pfn_valid_within() failed 'iter' was incremented twice.
    
    Signed-off-by: Namhyung Kim <namhyung@gmail.com>
    Reviewed-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
    Reviewed-by: Minchan Kim <minchan.kim@gmail.com>
    Cc: <stable@kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  9. @torvalds

    drivers/rtc/rtc-ds3232.c: fix time range difference between linux and…

    Lei Xu authored torvalds committed
    … RTC chip
    
    In linux rtc_time struct, tm_mon range is 0~11, tm_wday range is 0~6,
    while in RTC HW REG, month range is 1~12, day of the week range is 1~7,
    this patch adjusts difference of them.
    
    The efect of this bug was that most of month will be operated on as the
    next month by the hardware (When in Jan it maybe even worse).  For
    example, if in May, software wrote 4 to the hardware, which handled it as
    April.  Then the logic would be different between software and hardware,
    which would cause weird things to happen.
    
    Signed-off-by: Lei Xu <B33228@freescale.com>
    Cc: Alessandro Zummo <a.zummo@towertech.it>
    Cc: john stultz <johnstul@us.ibm.com>
    Cc: Jack Lan <jack.lan@freescale.com>
    Cc: <stable@kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  10. @torvalds

    ldm: corrupted partition table can cause kernel oops

    Timo Warns authored torvalds committed
    The kernel automatically evaluates partition tables of storage devices.
    The code for evaluating LDM partitions (in fs/partitions/ldm.c) contains
    a bug that causes a kernel oops on certain corrupted LDM partitions.  A
    kernel subsystem seems to crash, because, after the oops, the kernel no
    longer recognizes newly connected storage devices.
    
    The patch changes ldm_parse_vmdb() to Validate the value of vblk_size.
    
    Signed-off-by: Timo Warns <warns@pre-sense.de>
    Cc: Eugene Teo <eugeneteo@kernel.sg>
    Acked-by: Richard Russon <ldm@flatcap.org>
    Cc: Harvey Harrison <harvey.harrison@gmail.com>
    Cc: <stable@kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  11. @gormanm @torvalds

    mm: vmscan: stop reclaim/compaction earlier due to insufficient progr…

    gormanm authored torvalds committed
    …ess if !__GFP_REPEAT
    
    should_continue_reclaim() for reclaim/compaction allows scanning to
    continue even if pages are not being reclaimed until the full list is
    scanned.  In terms of allocation success, this makes sense but potentially
    it introduces unwanted latency for high-order allocations such as
    transparent hugepages and network jumbo frames that would prefer to fail
    the allocation attempt and fallback to order-0 pages.  Worse, there is a
    potential that the full LRU scan will clear all the young bits, distort
    page aging information and potentially push pages into swap that would
    have otherwise remained resident.
    
    This patch will stop reclaim/compaction if no pages were reclaimed in the
    last SWAP_CLUSTER_MAX pages that were considered.  For allocations such as
    hugetlbfs that use __GFP_REPEAT and have fewer fallback options, the full
    LRU list may still be scanned.
    
    Order-0 allocation should not be affected because RECLAIM_MODE_COMPACTION
    is not set so the following avoids the gfp_mask being examined:
    
            if (!(sc->reclaim_mode & RECLAIM_MODE_COMPACTION))
                    return false;
    
    A tool was developed based on ftrace that tracked the latency of
    high-order allocations while transparent hugepage support was enabled and
    three benchmarks were run.  The "fix-infinite" figures are 2.6.38-rc4 with
    Johannes's patch "vmscan: fix zone shrinking exit when scan work is done"
    applied.
    
      STREAM Highorder Allocation Latency Statistics
                     fix-infinite     break-early
      1 :: Count            10298           10229
      1 :: Min             0.4560          0.4640
      1 :: Mean            1.0589          1.0183
      1 :: Max            14.5990         11.7510
      1 :: Stddev          0.5208          0.4719
      2 :: Count                2               1
      2 :: Min             1.8610          3.7240
      2 :: Mean            3.4325          3.7240
      2 :: Max             5.0040          3.7240
      2 :: Stddev          1.5715          0.0000
      9 :: Count           111696          111694
      9 :: Min             0.5230          0.4110
      9 :: Mean           10.5831         10.5718
      9 :: Max            38.4480         43.2900
      9 :: Stddev          1.1147          1.1325
    
    Mean time for order-1 allocations is reduced.  order-2 looks increased but
    with so few allocations, it's not particularly significant.  THP mean
    allocation latency is also reduced.  That said, allocation time varies so
    significantly that the reductions are within noise.
    
    Max allocation time is reduced by a significant amount for low-order
    allocations but reduced for THP allocations which presumably are now
    breaking before reclaim has done enough work.
    
      SysBench Highorder Allocation Latency Statistics
                     fix-infinite     break-early
      1 :: Count            15745           15677
      1 :: Min             0.4250          0.4550
      1 :: Mean            1.1023          1.0810
      1 :: Max            14.4590         10.8220
      1 :: Stddev          0.5117          0.5100
      2 :: Count                1               1
      2 :: Min             3.0040          2.1530
      2 :: Mean            3.0040          2.1530
      2 :: Max             3.0040          2.1530
      2 :: Stddev          0.0000          0.0000
      9 :: Count             2017            1931
      9 :: Min             0.4980          0.7480
      9 :: Mean           10.4717         10.3840
      9 :: Max            24.9460         26.2500
      9 :: Stddev          1.1726          1.1966
    
    Again, mean time for order-1 allocations is reduced while order-2
    allocations are too few to draw conclusions from.  The mean time for THP
    allocations is also slightly reduced albeit the reductions are within
    varianes.
    
    Once again, our maximum allocation time is significantly reduced for
    low-order allocations and slightly increased for THP allocations.
    
      Anon stream mmap reference Highorder Allocation Latency Statistics
      1 :: Count             1376            1790
      1 :: Min             0.4940          0.5010
      1 :: Mean            1.0289          0.9732
      1 :: Max             6.2670          4.2540
      1 :: Stddev          0.4142          0.2785
      2 :: Count                1               -
      2 :: Min             1.9060               -
      2 :: Mean            1.9060               -
      2 :: Max             1.9060               -
      2 :: Stddev          0.0000               -
      9 :: Count            11266           11257
      9 :: Min             0.4990          0.4940
      9 :: Mean        27250.4669      24256.1919
      9 :: Max      11439211.0000    6008885.0000
      9 :: Stddev     226427.4624     186298.1430
    
    This benchmark creates one thread per CPU which references an amount of
    anonymous memory 1.5 times the size of physical RAM.  This pounds swap
    quite heavily and is intended to exercise THP a bit.
    
    Mean allocation time for order-1 is reduced as before.  It's also reduced
    for THP allocations but the variations here are pretty massive due to
    swap.  As before, maximum allocation times are significantly reduced.
    
    Overall, the patch reduces the mean and maximum allocation latencies for
    the smaller high-order allocations.  This was with Slab configured so it
    would be expected to be more significant with Slub which uses these size
    allocations more aggressively.
    
    The mean allocation times for THP allocations are also slightly reduced.
    The maximum latency was slightly increased as predicted by the comments
    due to reclaim/compaction breaking early.  However, workloads care more
    about the latency of lower-order allocations than THP so it's an
    acceptable trade-off.
    
    Signed-off-by: Mel Gorman <mel@csn.ul.ie>
    Acked-by: Andrea Arcangeli <aarcange@redhat.com>
    Acked-by: Johannes Weiner <hannes@cmpxchg.org>
    Reviewed-by: Minchan Kim <minchan.kim@gmail.com>
    Acked-by: Andrea Arcangeli <aarcange@redhat.com>
    Acked-by: Rik van Riel <riel@redhat.com>
    Cc: Michal Hocko <mhocko@suse.cz>
    Cc: Kent Overstreet <kent.overstreet@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  12. @torvalds

    drivers/nfc/pn544.c: add missing regulator

    Matti J. Aaltonen authored torvalds committed
    The regulator framework is used for power management.  The regulators are
    only named in the driver code, the actual control stuff is in the board
    file for each architecture or use case.
    
    The PN544 chip has three regulators that can be controlled or not -
    depending on the architecture where the chip is being used.  So some of
    the regulators may not be controllable.  In our current case the third
    regulator, which was missing from the code, went unnoticed because we
    didn't need to control it.  To be as general as possible - in this respect
    - the driver needs to list all regulators.  Then the board file can be
    used to actually set the usage.
    
    Signed-off-by: Matti J. Aaltonen <matti.j.aaltonen@nokia.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  13. @torvalds

    drivers/nfc/Kconfig: use full form of the NFC acronym

    Matti J. Aaltonen authored torvalds committed
    Spell out the NFC acronym when it's shown for the first time.
    
    Signed-off-by: Matti J. Aaltonen <matti.j.aaltonen@nokia.com>
    Acked-by: Wolfram Sang <w.sang@pengutronix.de>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Something went wrong with that request. Please try again.