Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[PATCH] uml: fix hugest stack users

The C99 initialization, with GCC's bad handling, for 6K wide structs (which
_aren't_ on the stack), is causing GCC to use 12K for these silly procs with 3
vars. Workaround this.

Note that .name = { '\0' } translates to memset(->name, 0, '->name' size) - I verified
this with GCC's docs and a testprogram.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by

Paolo 'Blaisorblade' Giarrusso and committed by
Linus Torvalds
854e981c 98105d47

+22 -19
+7 -6
arch/um/drivers/slip_common.h
··· 88 88 int esc; 89 89 }; 90 90 91 - #define SLIP_PROTO_INIT { \ 92 - .ibuf = { '\0' }, \ 93 - .obuf = { '\0' }, \ 94 - .more = 0, \ 95 - .pos = 0, \ 96 - .esc = 0 \ 91 + static inline void slip_proto_init(struct slip_proto * slip) 92 + { 93 + memset(slip->ibuf, 0, sizeof(slip->ibuf)); 94 + memset(slip->obuf, 0, sizeof(slip->obuf)); 95 + slip->more = 0; 96 + slip->pos = 0; 97 + slip->esc = 0; 97 98 } 98 99 99 100 extern int slip_proto_read(int fd, void *buf, int len,
+8 -7
arch/um/drivers/slip_kern.c
··· 21 21 22 22 private = dev->priv; 23 23 spri = (struct slip_data *) private->user; 24 - *spri = ((struct slip_data) 25 - { .name = { '\0' }, 26 - .addr = NULL, 27 - .gate_addr = init->gate_addr, 28 - .slave = -1, 29 - .slip = SLIP_PROTO_INIT, 30 - .dev = dev }); 24 + 25 + memset(spri->name, 0, sizeof(spri->name)); 26 + spri->addr = NULL; 27 + spri->gate_addr = init->gate_addr; 28 + spri->slave = -1; 29 + spri->dev = dev; 30 + 31 + slip_proto_init(&spri->slip); 31 32 32 33 dev->init = NULL; 33 34 dev->header_cache_update = NULL;
+7 -6
arch/um/drivers/slirp_kern.c
··· 21 21 22 22 private = dev->priv; 23 23 spri = (struct slirp_data *) private->user; 24 - *spri = ((struct slirp_data) 25 - { .argw = init->argw, 26 - .pid = -1, 27 - .slave = -1, 28 - .slip = SLIP_PROTO_INIT, 29 - .dev = dev }); 24 + 25 + spri->argw = init->argw; 26 + spri->pid = -1; 27 + spri->slave = -1; 28 + spri->dev = dev; 29 + 30 + slip_proto_init(&spri->slip); 30 31 31 32 dev->init = NULL; 32 33 dev->hard_header_len = 0;