The patch titled
fault-injection-capabilities-infrastructure-retval-fix
has been removed from the -mm tree. Its filename was
fault-injection-capabilities-infrastructure-tweaks.patch
This patch was dropped because it was folded into fault-injection-capabilities-infrastructure.patch
------------------------------------------------------
Subject: fault-injection-capabilities-infrastructure-retval-fix
From: Andrew Morton <akpm@xxxxxxxx>
- Add comment explaining weird return value
- Make setup_fault_attr __init.
Cc: <okuji@xxxxxxxxx>
Cc: Akinobu Mita <akinobu.mita@xxxxxxxxx>
Cc: Don Mullis <dwm@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
lib/fault-inject.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletion(-)
diff -puN lib/fault-inject.c~fault-injection-capabilities-infrastructure-tweaks lib/fault-inject.c
--- a/lib/fault-inject.c~fault-injection-capabilities-infrastructure-tweaks
+++ a/lib/fault-inject.c
@@ -7,7 +7,11 @@
#include <linux/module.h>
#include <linux/fault-inject.h>
-int setup_fault_attr(struct fault_attr *attr, char *str)
+/*
+ * setup_fault_attr() is a helper function for various __setup handlers, so it
+ * returns 0 on error, because that is what __setup handlers do.
+ */
+int __init setup_fault_attr(struct fault_attr *attr, char *str)
{
unsigned long probability;
unsigned long interval;
_
Patches currently in -mm which might be from akpm@xxxxxxxx are
origin.patch
node-aware-skb-allocation-fix-for-device-tree-changes.patch
tty-signal-tty-locking.patch
pktcdvd-bio-write-congestion-using-blk_congestion_wait.patch
fsstack-introduce-fsstack_copy_attrinode_.patch
add-process_session-helper-routine-deprecate-old-field.patch
mxser-session-warning-fix.patch
mxser-workqueue-fixes.patch
tty-switch-to-ktermios-and-new-framework.patch
tty-switch-to-ktermios.patch
tty_ioctl-use-termios-for-the-old-structure-and-termios2.patch
drivers-isdn-handcrafted-min-max-macro-removal.patch
fault-injection-capabilities-infrastructure.patch
fault-injection-capabilities-infrastructure-tweaks.patch
fault-injection-Kconfig-cleanup.patch
fault-injection-stacktrace-filtering-kconfig-fix.patch
sysctl-fix-sys_sysctl-interface-of-ipc-sysctls-fix-3.patch
video-get-the-default-mode-from-the-right-database.patch
various-fbdev-files-mark-structs-fix.patch
backlight-lcd-remove-dependenct-from-the-framebuffer-layer-tidy.patch
gxfb-fixups-for-the-amd-geode-gx-tidy.patch
gxfb-support-flat-panel-timings-tidy.patch
gxfb-support-command-line-options-tidy.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
