diff options
| author | Linus Torvalds | 2013-03-03 22:13:20 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2013-03-03 22:13:20 +0100 |
| commit | 1c82315a12144cde732636e259d39e3ee81b3c5b (patch) | |
| tree | 904770abe925abf1e37bad1a6d7d7f576257b194 /fs | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s39... (diff) | |
| parent | btrfs/raid56: Add missing #include <linux/vmalloc.h> (diff) | |
| download | kernel-qcow2-linux-1c82315a12144cde732636e259d39e3ee81b3c5b.tar.gz kernel-qcow2-linux-1c82315a12144cde732636e259d39e3ee81b3c5b.tar.xz kernel-qcow2-linux-1c82315a12144cde732636e259d39e3ee81b3c5b.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull btrfs fixup from Chris Mason:
"Geert and James both sent this one in, sorry guys"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
btrfs/raid56: Add missing #include <linux/vmalloc.h>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/raid56.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/btrfs/raid56.c b/fs/btrfs/raid56.c index 07222053c7d8..9a79fb790adb 100644 --- a/fs/btrfs/raid56.c +++ b/fs/btrfs/raid56.c @@ -31,6 +31,7 @@ #include <linux/hash.h> #include <linux/list_sort.h> #include <linux/raid/xor.h> +#include <linux/vmalloc.h> #include <asm/div64.h> #include "compat.h" #include "ctree.h" |