diff options
author | Kevin Hilman <khilman@linaro.org> | 2015-11-10 17:25:34 -0800 |
---|---|---|
committer | Kevin Hilman <khilman@linaro.org> | 2015-11-10 17:25:34 -0800 |
commit | 4c9c5a306017efae3bb820e26fa9891f32ddf759 (patch) | |
tree | 10dda727dbd515574ec517c446c29bd71461d4d7 /lib | |
parent | 8c9dcdb8f3a67b5f9b38412a4ae0c6ad42a2ba8d (diff) | |
parent | 1f2ce4a2e7aea3a2123b17aff62a80553df31e21 (diff) |
Merge tag 'v4.1.13' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-linaro-lsk-v4.1
This is the 4.1.13 stable release
# gpg: Signature made Mon Nov 9 14:34:15 2015 PST using RSA key ID 6092693E
# gpg: Good signature from "Greg Kroah-Hartman (Linux kernel stable release signing key) <greg@kroah.com>"
* tag 'v4.1.13' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable: (86 commits)
Linux 4.1.13
dts: imx6: fix sd card gpio polarity specified in device tree
xen: fix backport of previous kexec patch
serial: 8250_pci: Add support for 12 port Exar boards
pinctrl: baytrail: Use raw_spinlock for locking
pinctrl: baytrail: Serialize all register access
thp: use is_zero_pfn() only after pte_present() check
drm/vmwgfx: Fix up user_dmabuf refcounting
NVMe: Fix memory leak on retried commands
arm64: compat: fix stxr failure case in SWP emulation
arm64: kernel: fix tcr_el1.t0sz restore on systems with extended idmap
arm64: kernel: rename __cpu_suspend to keep it aligned with arm
cpufreq: intel_pstate: Fix divide by zero on Knights Landing (KNL)
IB/cm: Fix rb-tree duplicate free and use-after-free
btrfs: fix possible leak in btrfs_ioctl_balance()
MFD/OF: document MFD devices and handle simple-mfd
mvsas: Fix NULL pointer dereference in mvs_slot_task_free
irqchip/tegra: Propagate IRQ type setting to parent
EDAC, sb_edac: Fix TAD presence check for sbridge_mci_bind_devs()
Revert "md: allow a partially recovered device to be hot-added to an array."
...
Diffstat (limited to 'lib')
-rw-r--r-- | lib/fault-inject.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/fault-inject.c b/lib/fault-inject.c index f1cdeb024d17..6a823a53e357 100644 --- a/lib/fault-inject.c +++ b/lib/fault-inject.c @@ -44,7 +44,7 @@ static void fail_dump(struct fault_attr *attr) printk(KERN_NOTICE "FAULT_INJECTION: forcing a failure.\n" "name %pd, interval %lu, probability %lu, " "space %d, times %d\n", attr->dname, - attr->probability, attr->interval, + attr->interval, attr->probability, atomic_read(&attr->space), atomic_read(&attr->times)); if (attr->verbose > 1) |