On Thu, Nov 21, 2013 at 03:00:10PM +0200, Kirill A. Shutemov wrote: > I don't know what went wrong, mis-merge or something, but ->pmd_huge_pte > placed in wrong union within struct page. > > In original patch[1] it's placed to union with ->lru and ->slab, but in > commit e009bb30c8df it's in union with ->index and ->freelist. > > That union seems also unused for pages with table tables and safe to > re-use, but it's not what I've tested. > > Let's move it to original place. It fixes indentation at least. :) > > [1] https://lkml.org/lkml/2013/10/7/288 > > Signed-off-by: Kirill A. Shutemov <kirill.shutemov@xxxxxxxxxxxxxxx> Reviewed-by: Naoya Horiguchi <n-horiguchi@xxxxxxxxxxxxx> > --- > include/linux/mm_types.h | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h > index 10f5a7272b80..011eb85d7b0f 100644 > --- a/include/linux/mm_types.h > +++ b/include/linux/mm_types.h > @@ -65,9 +65,6 @@ struct page { > * this page is only used to > * free other pages. > */ > -#if defined(CONFIG_TRANSPARENT_HUGEPAGE) && USE_SPLIT_PMD_PTLOCKS > - pgtable_t pmd_huge_pte; /* protected by page->ptl */ > -#endif > }; > > union { > @@ -135,6 +132,9 @@ struct page { > > struct list_head list; /* slobs list of pages */ > struct slab *slab_page; /* slab fields */ > +#if defined(CONFIG_TRANSPARENT_HUGEPAGE) && USE_SPLIT_PMD_PTLOCKS > + pgtable_t pmd_huge_pte; /* protected by page->ptl */ > +#endif > }; > > /* Remainder is not double word aligned */ > -- > 1.8.4.3 > > -- > To unsubscribe, send a message with 'unsubscribe linux-mm' in > the body to majordomo@xxxxxxxxx. For more info on Linux MM, > see: http://www.linux-mm.org/ . > Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a> > -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@xxxxxxxxx. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>