Merge branch 'slab/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penber...

[mirror_ubuntu-bionic-kernel.git] / kernel / relay.c

diff --git a/kernel/relay.c b/kernel/relay.c
index d21006c4a3cc8eb970e9317dd8838e1f3e4b6e21..eef0d113b79ed22734b980b076e05c3aee73a64c 100644 (file)
--- a/kernel/relay.c
+++ b/kernel/relay.c
@@ -588,7 +588,7 @@ struct rchan *relay_open(const char *base_filename,
        chan->version = RELAYFS_CHANNEL_VERSION;
        chan->n_subbufs = n_subbufs;
        chan->subbuf_size = subbuf_size;
-       chan->alloc_size = FIX_SIZE(subbuf_size * n_subbufs);
+       chan->alloc_size = PAGE_ALIGN(subbuf_size * n_subbufs);
        chan->parent = parent;
        chan->private_data = private_data;
        if (base_filename) {