Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

relay: use macro PAGE_ALIGN instead of FIX_SIZE

Browse source 
Macro FIX_SIZE is same as PAGE_ALIGN at present, so use PAGE_ALIGN
instead.

Thanks Andrew found this.

Signed-off-by: zhangwei(Jovi) <jovi.zhangwei@huawei.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Eric Dumazet <edumazet@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
zhangwei(Jovi) 2013-04-30 15:28:41 -07:00 committed by Linus Torvalds
parent 536b39ecf1
commit a05342cbd6
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
kernel/relay.c
View file

@ -550,9 +550,6 @@ static int __cpuinit relay_hotcpu_callback(struct notifier_block *nb,
return NOTIFY_OK; return NOTIFY_OK;
} }
/* Needs a _much_ better name... */
#define FIX_SIZE(x) ((((x) - 1) & PAGE_MASK) + PAGE_SIZE)
/** /**
* relay_open - create a new relay channel * relay_open - create a new relay channel
* @base_filename: base name of files to create, %NULL for buffering only * @base_filename: base name of files to create, %NULL for buffering only
@ -591,7 +588,7 @@ struct rchan *relay_open(const char *base_filename,
chan->version = RELAYFS_CHANNEL_VERSION; chan->version = RELAYFS_CHANNEL_VERSION;
chan->n_subbufs = n_subbufs; chan->n_subbufs = n_subbufs;
chan->subbuf_size = subbuf_size; 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->parent = parent;
chan->private_data = private_data; chan->private_data = private_data;
if (base_filename) { if (base_filename) {