]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Remove BUILD_BUG_ON for epitem size code to compile.
authorNick Alcock <nick.alcock@oracle.com>
Mon, 15 Dec 2014 14:27:12 +0000 (14:27 +0000)
committerNick Alcock <nick.alcock@oracle.com>
Tue, 21 Jul 2015 14:29:54 +0000 (15:29 +0100)
The changes to the epitem struct to support waitfd() / poll_wait_fixed()
cause it to be larger than the limit enforced by the BUILD_BUG_ON.  The
dropping of this build assertion is in line with the suggestion by Andrew
Morton in https://lkml.org/lkml/2013/3/8/467.

Orabug: 20456825

Signed-off-by: Nick Alcock <nick.alcock@oracle.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Acked-by: Guru Anbalagane <guru.anbalagane@oracle.com>
fs/eventpoll.c

index d90b3cc5ffcf9ddd89d92cc42f7cde172ae41516..ba26758270c53c21e6da23241434b516f31e87b1 100644 (file)
@@ -2135,7 +2135,6 @@ static int __init eventpoll_init(void)
         * We can have many thousands of epitems, so prevent this from
         * using an extra cache line on 64-bit (and smaller) CPUs
         */
-       BUILD_BUG_ON(sizeof(void *) <= 8 && sizeof(struct epitem) > 128);
 
        /* Allocates slab cache used to allocate "struct epitem" items */
        epi_cache = kmem_cache_create("eventpoll_epi", sizeof(struct epitem),