diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-28 17:16:11 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-28 17:16:11 -0400 |
commit | 46b51ea2099fa2082342e52b8284aa828429b80b (patch) | |
tree | 0a0d7bfe1aff036c86a2e7beacbd91398008bfb6 /lib | |
parent | 1fdb24e969110fafea36d3b393bea438f702c87f (diff) | |
parent | a6029e1f75bb484c1f5bc68b6a8572e4024795bc (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (83 commits)
mmc: fix compile error when CONFIG_BLOCK is not enabled
mmc: core: Cleanup eMMC4.5 conditionals
mmc: omap_hsmmc: if multiblock reads are broken, disable them
mmc: core: add workaround for controllers with broken multiblock reads
mmc: core: Prevent too long response times for suspend
mmc: recognise SDIO cards with SDIO_CCCR_REV 3.00
mmc: sd: Handle SD3.0 cards not supporting UHS-I bus speed mode
mmc: core: support HPI send command
mmc: core: Add cache control for eMMC4.5 device
mmc: core: Modify the timeout value for writing power class
mmc: core: new discard feature support at eMMC v4.5
mmc: core: mmc sanitize feature support for v4.5
mmc: dw_mmc: modify DATA register offset
mmc: sdhci-pci: add flag for devices that can support runtime PM
mmc: omap_hsmmc: ensure pbias configuration is always done
mmc: core: Add Power Off Notify Feature eMMC 4.5
mmc: sdhci-s3c: fix potential NULL dereference
mmc: replace printk with appropriate display macro
mmc: core: Add default timeout value for CMD6
mmc: sdhci-pci: add runtime pm support
...
Diffstat (limited to 'lib')
-rw-r--r-- | lib/Kconfig.debug | 11 | ||||
-rw-r--r-- | lib/fault-inject.c | 5 |
2 files changed, 15 insertions, 1 deletions
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index 75330bd87565..c583a57cddfe 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug | |||
@@ -1070,6 +1070,17 @@ config FAIL_IO_TIMEOUT | |||
1070 | Only works with drivers that use the generic timeout handling, | 1070 | Only works with drivers that use the generic timeout handling, |
1071 | for others it wont do anything. | 1071 | for others it wont do anything. |
1072 | 1072 | ||
1073 | config FAIL_MMC_REQUEST | ||
1074 | bool "Fault-injection capability for MMC IO" | ||
1075 | select DEBUG_FS | ||
1076 | depends on FAULT_INJECTION && MMC | ||
1077 | help | ||
1078 | Provide fault-injection capability for MMC IO. | ||
1079 | This will make the mmc core return data errors. This is | ||
1080 | useful to test the error handling in the mmc block device | ||
1081 | and to test how the mmc host driver handles retries from | ||
1082 | the block device. | ||
1083 | |||
1073 | config FAULT_INJECTION_DEBUG_FS | 1084 | config FAULT_INJECTION_DEBUG_FS |
1074 | bool "Debugfs entries for fault-injection capabilities" | 1085 | bool "Debugfs entries for fault-injection capabilities" |
1075 | depends on FAULT_INJECTION && SYSFS && DEBUG_FS | 1086 | depends on FAULT_INJECTION && SYSFS && DEBUG_FS |
diff --git a/lib/fault-inject.c b/lib/fault-inject.c index f193b7796449..4f7554025e30 100644 --- a/lib/fault-inject.c +++ b/lib/fault-inject.c | |||
@@ -14,7 +14,7 @@ | |||
14 | * setup_fault_attr() is a helper function for various __setup handlers, so it | 14 | * setup_fault_attr() is a helper function for various __setup handlers, so it |
15 | * returns 0 on error, because that is what __setup handlers do. | 15 | * returns 0 on error, because that is what __setup handlers do. |
16 | */ | 16 | */ |
17 | int __init setup_fault_attr(struct fault_attr *attr, char *str) | 17 | int setup_fault_attr(struct fault_attr *attr, char *str) |
18 | { | 18 | { |
19 | unsigned long probability; | 19 | unsigned long probability; |
20 | unsigned long interval; | 20 | unsigned long interval; |
@@ -36,6 +36,7 @@ int __init setup_fault_attr(struct fault_attr *attr, char *str) | |||
36 | 36 | ||
37 | return 1; | 37 | return 1; |
38 | } | 38 | } |
39 | EXPORT_SYMBOL_GPL(setup_fault_attr); | ||
39 | 40 | ||
40 | static void fail_dump(struct fault_attr *attr) | 41 | static void fail_dump(struct fault_attr *attr) |
41 | { | 42 | { |
@@ -130,6 +131,7 @@ bool should_fail(struct fault_attr *attr, ssize_t size) | |||
130 | 131 | ||
131 | return true; | 132 | return true; |
132 | } | 133 | } |
134 | EXPORT_SYMBOL_GPL(should_fail); | ||
133 | 135 | ||
134 | #ifdef CONFIG_FAULT_INJECTION_DEBUG_FS | 136 | #ifdef CONFIG_FAULT_INJECTION_DEBUG_FS |
135 | 137 | ||
@@ -243,5 +245,6 @@ fail: | |||
243 | 245 | ||
244 | return ERR_PTR(-ENOMEM); | 246 | return ERR_PTR(-ENOMEM); |
245 | } | 247 | } |
248 | EXPORT_SYMBOL_GPL(fault_create_debugfs_attr); | ||
246 | 249 | ||
247 | #endif /* CONFIG_FAULT_INJECTION_DEBUG_FS */ | 250 | #endif /* CONFIG_FAULT_INJECTION_DEBUG_FS */ |