The patch titled kill open-coded offsetof in cm4000_cs.c ZERO_DEV() has been added to the -mm tree. Its filename is kill-open-coded-offsetof-in-cm4000_csc-zero_dev.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: kill open-coded offsetof in cm4000_cs.c ZERO_DEV() From: Al Viro <viro@xxxxxxxxxxxxxxxx> ... to make sure that it doesn't break again when a field changes (see "[PATCH] pcmcia: fix zeroing of cm4000_cs.c data" for recent example). Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx> Cc: Dominik Brodowski <linux@xxxxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- drivers/char/pcmcia/cm4000_cs.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff -puN drivers/char/pcmcia/cm4000_cs.c~kill-open-coded-offsetof-in-cm4000_csc-zero_dev drivers/char/pcmcia/cm4000_cs.c --- a/drivers/char/pcmcia/cm4000_cs.c~kill-open-coded-offsetof-in-cm4000_csc-zero_dev +++ a/drivers/char/pcmcia/cm4000_cs.c @@ -149,12 +149,7 @@ struct cm4000_dev { #define ZERO_DEV(dev) \ memset(&dev->atr_csum,0, \ sizeof(struct cm4000_dev) - \ - /*link*/ sizeof(struct pcmcia_device *) - \ - /*node*/ sizeof(dev_node_t) - \ - /*atr*/ MAX_ATR*sizeof(char) - \ - /*rbuf*/ 512*sizeof(char) - \ - /*sbuf*/ 512*sizeof(char) - \ - /*queue*/ 4*sizeof(wait_queue_head_t)) + offsetof(struct cm4000_dev, atr_csum)) static struct pcmcia_device *dev_table[CM4000_MAX_DEV]; static struct class *cmm_class; _ Patches currently in -mm which might be from viro@xxxxxxxxxxxxxxxx are sctp_unpack_cookie-fix.patch fix-broken-uses-of-nipquad-in-net-atm.patch kill-open-coded-offsetof-in-cm4000_csc-zero_dev.patch m68k-trapsc-constraints.patch m68k-windfarm-is-powerpc-only-dont-do-it-on-m68k-macs.patch inotify-add-names-inode-to-event-handler.patch inotify-add-interfaces-to-kernel-api.patch inotify-allow-watch-removal-from-event-handler.patch inotify-update-kernel-documentation.patch affs_fill_super-%s-abuses.patch slab-leaks3-default-y.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html