Commit ed1af26c authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by Andrew Morton
Browse files

drivers/char/mem.c: shrink character device's devlist[] array 

Merge padding, shrinking "struct memdev" from 32 bytes to 24 bytes
on 64-bit.

Link: https://lkml.kernel.org/r/fe4d62ab-2427-4635-b9f4-467853fb63e3@p183


Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 543cd4c5

drivers/char/mem.c

+9 −9
Original line number Diff line number Diff line
@@ -692,23 +692,23 @@ static const struct file_operations full_fops = { 


static const struct memdev {

	const char *name;

	umode_t mode;

	const struct file_operations *fops;

	fmode_t fmode;

	umode_t mode;

} devlist[] = {

#ifdef CONFIG_DEVMEM

	 [DEVMEM_MINOR] = { "mem", 0, &mem_fops, FMODE_UNSIGNED_OFFSET },

	[DEVMEM_MINOR] = { "mem", &mem_fops, FMODE_UNSIGNED_OFFSET, 0 },

#endif

	 [3] = { "null", 0666, &null_fops, FMODE_NOWAIT },

	[3] = { "null", &null_fops, FMODE_NOWAIT, 0666 },

#ifdef CONFIG_DEVPORT

	 [4] = { "port", 0, &port_fops, 0 },

	[4] = { "port", &port_fops, 0, 0 },

#endif

	 [5] = { "zero", 0666, &zero_fops, FMODE_NOWAIT },

	 [7] = { "full", 0666, &full_fops, 0 },

	 [8] = { "random", 0666, &random_fops, FMODE_NOWAIT },

	 [9] = { "urandom", 0666, &urandom_fops, FMODE_NOWAIT },

	[5] = { "zero", &zero_fops, FMODE_NOWAIT, 0666 },

	[7] = { "full", &full_fops, 0, 0666 },

	[8] = { "random", &random_fops, FMODE_NOWAIT, 0666 },

	[9] = { "urandom", &urandom_fops, FMODE_NOWAIT, 0666 },

#ifdef CONFIG_PRINTK

	[11] = { "kmsg", 0644, &kmsg_fops, 0 },

	[11] = { "kmsg", &kmsg_fops, 0, 0644 },

#endif

};