diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-08 11:02:50 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-08 11:02:57 -0400 |
| commit | ff96e612cba32510e263e17b213235fe5746397e (patch) | |
| tree | a8df57d76b10e0901a4fb76cd2987eb9826a560a /mm/failslab.c | |
| parent | cd84a42f315e50edd454c27a3da3951ccd3d735a (diff) | |
| parent | 577c9c456f0e1371cbade38eaf91ae8e8a308555 (diff) | |
Merge commit 'v2.6.30-rc1' into core/urgent
Merge reason: need latest upstream to queue up dependent fix
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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; |