lkml.org 
[lkml]   [2011]   [Sep]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    Subjectlinux-next: manual merge of the akpm tree with the slab tree
    Hi Andrew,

    Today's linux-next merge of the scsi-post-merge tree got a conflict in
    mm/slab.c between commit fdde6abb3e8d ("slab: use print_hex_dump") from
    the slab tree and commit 0cf5ab251a1a ("When we get corruption reports,
    it's useful to see if the kernel was") from the akpm tree.

    Just context changes. I fixed it up (see below) and can carry the fix as
    necessary.
    --
    Cheers,
    Stephen Rothwell sfr@canb.auug.org.au

    diff --cc mm/slab.c
    index 5bfc204,10a3624..0000000
    --- a/mm/slab.c
    +++ b/mm/slab.c
    @@@ -3037,11 -3037,16 +3037,11 @@@ static void check_slabp(struct kmem_cac
    if (entries != cachep->num - slabp->inuse) {
    bad:
    printk(KERN_ERR "slab: Internal list corruption detected in "
    - "cache '%s'(%d), slabp %p(%d). Hexdump:\n",
    - cachep->name, cachep->num, slabp, slabp->inuse);
    + "cache '%s'(%d), slabp %p(%d). Tainted(%s). Hexdump:\n",
    + cachep->name, cachep->num, slabp, slabp->inuse, print_tainted());
    - for (i = 0;
    - i < sizeof(*slabp) + cachep->num * sizeof(kmem_bufctl_t);
    - i++) {
    - if (i % 16 == 0)
    - printk("\n%03x:", i);
    - printk(" %02x", ((unsigned char *)slabp)[i]);
    - }
    - printk("\n");
    + print_hex_dump(KERN_ERR, "", DUMP_PREFIX_OFFSET, 16, 1, slabp,
    + sizeof(*slabp) + cachep->num * sizeof(kmem_bufctl_t),
    + 1);
    BUG();
    }
    }


    \
     
     \ /
      Last update: 2011-09-14 08:27    [W:0.027 / U:0.776 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site