Commit 7aa555bf authored Nov 21, 2013 by Kirill A. Shutemov Committed by Linus Torvalds Nov 21, 2013

mm: place page->pmd_huge_pte to right union

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 e009bb30 ("mm: implement split page table lock for PMD
level") 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@linux.intel.com>
Reviewed-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent f92ca80b

include/linux/mm_types.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -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 */

Admin message