diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-09-11 09:33:12 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-09-11 09:33:12 +0200 |
| commit | 3d2f4d0c0d4f3b676ecca504a3916b8e9843a181 (patch) | |
| tree | f72e05df59734bb1deeba510283072e16c056640 /net/9p/trans_virtio.c | |
| parent | 09da111aef57c022ac28bb8974f41c1729102d11 (diff) | |
| parent | 3f640970a41429f0a076c01270bbd014c9eae61c (diff) | |
| download | linux-3d2f4d0c0d4f3b676ecca504a3916b8e9843a181.tar.bz2 | |
Merge branch 'for-linus' into for-next
Back-merge from for-linus just to make the further development easier.
Diffstat (limited to 'net/9p/trans_virtio.c')
| -rw-r--r-- | net/9p/trans_virtio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c index 4acb1d5417aa..f24b25c25106 100644 --- a/net/9p/trans_virtio.c +++ b/net/9p/trans_virtio.c @@ -507,8 +507,8 @@ err_out: /* wakeup anybody waiting for slots to pin pages */ wake_up(&vp_wq); } - kfree(in_pages); - kfree(out_pages); + kvfree(in_pages); + kvfree(out_pages); return err; } |