Description of problem:
when I run pahole on F12 x86_64 I'm getting BRAIN
FART ALERTs (and other issues).

Version-Release number of selected component (if applicable):
dwarves-1.7-5.x86_64

How reproducible:
Always

Steps to Reproduce:
1. run pahole against the swiss_cheese example
2. see "BRAIN FART ALERT! ..."
  
Actual results:
$ pahole swiss_cheese
struct cheese {
        char                       name[17];             /*     0    17 */
        short int                  age;                  /*     0     2 */
        char                       type;                 /*     0     1 */
        int                        calories;             /*     0     4 */
        short int                  price;                /*     0     2 */
        int                        barcode[4];           /*     0    16 */

        /* size: 48, cachelines: 1, members: 6 */
        /* padding: 32 */
        /* last cacheline: 48 bytes */

        /* BRAIN FART ALERT! 48 != 17 + 0(holes), diff = 31 */

};

Expected results:
$ pahole swiss_cheese
struct cheese {
        char                       name[17];             /*     0    17 */

        /* XXX 1 byte hole, try to pack */

        short int                  age;                  /*    18     2 */
        char                       type;                 /*    20     1 */

        /* XXX 3 bytes hole, try to pack */

        int                        calories;             /*    24     4 */
        short int                  price;                /*    28     2 */

        /* XXX 2 bytes hole, try to pack */

        int                        barcode[4];           /*    32    16 */

        /* size: 48, cachelines: 1, members: 6 */
        /* sum members: 42, holes: 3, sum holes: 6 */
        /* last cacheline: 48 bytes */
};

Additional info:
I haven't attached the "swiss_cheese" example (which I got from acme's OLS 2007 "7 dwarves" paper) because acme has already given me a patch to test.  I verified that the patch (attached) fixes pahole on F12.