diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-04-13 17:29:07 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-04-13 17:29:07 -0400 |
| commit | f499cae1e59d75d5eb24c23d47cf8986e6032c6d (patch) | |
| tree | 1af6235c18391212c40116eb90b01eae8938efee /mm/failslab.c | |
| parent | fc3f55e672e1ed917dd9e215af81939cd3d717da (diff) | |
| parent | 80a04d3f2f94fb68b5df05e3ac6697130bc3467a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'mm/failslab.c')
| -rw-r--r-- | mm/failslab.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mm/failslab.c b/mm/failslab.c index 7c6ea6493f80..9339de5f0a91 100644 --- a/mm/failslab.c +++ b/mm/failslab.c | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | #include <linux/fault-inject.h> | 1 | #include <linux/fault-inject.h> |
| 2 | #include <linux/gfp.h> | ||
| 2 | 3 | ||
| 3 | static struct { | 4 | static struct { |
| 4 | struct fault_attr attr; | 5 | struct fault_attr attr; |