diff options
| author | Patrick McHardy <kaber@trash.net> | 2013-03-31 18:10:34 +0200 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2013-03-31 18:10:34 +0200 |
| commit | 70711d223510ba1773cfe1d7770a56141c815ff8 (patch) | |
| tree | 4a71f38a3a554ddecaa31b7d8c6bc49b7d1705b4 /fs/cachefiles/key.c | |
| parent | d53b4ed072d9779cdf53582c46436dec06d0961f (diff) | |
| parent | 19f949f52599ba7c3f67a5897ac6be14bfcb1200 (diff) | |
Merge tag 'v3.8' of /home/kaber/src/repos/linux
Linux 3.8
Signed-off-by: Patrick McHardy <kaber@trash.net>
Conflicts:
include/linux/Kbuild
include/linux/netlink.h
Diffstat (limited to 'fs/cachefiles/key.c')
| -rw-r--r-- | fs/cachefiles/key.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cachefiles/key.c b/fs/cachefiles/key.c index 81b8b2b3a67..33b58c60f2d 100644 --- a/fs/cachefiles/key.c +++ b/fs/cachefiles/key.c @@ -78,7 +78,7 @@ char *cachefiles_cook_key(const u8 *raw, int keylen, uint8_t type) _debug("max: %d", max); - key = kmalloc(max, GFP_KERNEL); + key = kmalloc(max, cachefiles_gfp); if (!key) return NULL; |