From: Andrew Morton <akpm@osdl.org>

- Add comment explaining weird return value

- Make setup_fault_attr __init.

Cc: <okuji@enbug.org>
Cc: Akinobu Mita <akinobu.mita@gmail.com>
Cc: Don Mullis <dwm@meer.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 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;
_