Skip to content

Reduce ifdef mess in hugetlbpage.c

Christophe Leroy linuxppc-dev lkml 3 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest posting 2/217 patches 3 repliesIn review
  2. v2 posting 1/211 patches 11 repliesSuperseded
  3. v127 patches 8 repliesSuperseded

Patches in v2 posting 2/2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/17powerpc/mm: Don't BUG() in hugepd_page()arch/powerpc/include/asm/hugetlb.h+2 -22 replies
2/17powerpc/mm: don't BUG in add_huge_page_size()arch/powerpc/mm/hugetlbpage.c+1 -10 replies
3/17powerpc/book3e: drop mmu_get_tsize()arch/powerpc/mm/hugetlbpage-book3e.c+0 -51 reply
4/17powerpc/64: only book3s/64 supports CONFIG_PPC_64K_PAGESarch/powerpc/Kconfig arch/powerpc/include/asm/nohash/64/pgalloc.h arch/powerpc/include/asm/nohash/64/pgtable.h +6 more+5 -720 replies
5/17powerpc/book3e: hugetlbpage is only for CONFIG_PPC_FSL_BOOK3Earch/powerpc/mm/Makefile arch/powerpc/mm/hugetlbpage-book3e.c+20 -290 replies
6/17powerpc/mm: move __find_linux_pte() out of hugetlbpage.carch/powerpc/mm/hugetlbpage.c arch/powerpc/mm/pgtable.c+104 -1030 replies
7/17powerpc/mm: make hugetlbpage.c depend on CONFIG_HUGETLB_PAGEarch/powerpc/mm/Makefile arch/powerpc/mm/hugetlbpage.c+1 -60 replies
8/17powerpc/mm: make gup_hugepte() staticarch/powerpc/include/asm/pgtable.h arch/powerpc/mm/hugetlbpage.c+19 -220 replies
9/17powerpc/mm: split asm/hugetlb.h into dedicated subarch filesarch/powerpc/include/asm/book3s/64/hugetlb.h arch/powerpc/include/asm/hugetlb.h arch/powerpc/include/asm/nohash/32/hugetlb-8xx.h +1 more+106 -830 replies
10/17powerpc/mm: add a helper to populate hugepdarch/powerpc/include/asm/book3s/64/hugetlb.h arch/powerpc/include/asm/nohash/32/hugetlb-8xx.h arch/powerpc/include/asm/nohash/hugetlb-book3e.h +1 more+20 -190 replies
11/17powerpc/mm: cleanup ifdef mess in add_huge_page_size()arch/powerpc/include/asm/book3s/64/hugetlb.h arch/powerpc/include/asm/nohash/32/hugetlb-8xx.h arch/powerpc/include/asm/nohash/hugetlb-book3e.h +1 more+43 -340 replies
12/17powerpc/mm: move hugetlb_disabled into asm/hugetlb.harch/powerpc/include/asm/hugetlb.h arch/powerpc/include/asm/page.h arch/powerpc/kernel/fadump.c +1 more+4 -10 replies
13/17powerpc/mm: cleanup HPAGE_SHIFT setuparch/powerpc/Kconfig arch/powerpc/include/asm/hugetlb.h arch/powerpc/include/asm/page.h +2 more+30 -240 replies
14/17powerpc/mm: cleanup remaining ifdef mess in hugetlbpage.carch/powerpc/mm/hugetlbpage.c+5 -70 replies
15/17powerpc/mm: flatten function __find_linux_pte() step 1arch/powerpc/mm/pgtable.c+22 -100 replies
16/17powerpc/mm: flatten function __find_linux_pte() step 2arch/powerpc/mm/pgtable.c+30 -320 replies
17/17powerpc/mm: flatten function __find_linux_pte() step 3arch/powerpc/mm/pgtable.c+49 -490 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v2 yet.

Read the v2 thread

Cover letter [PATCH v2 00/17] Reduce ifdef mess in hugetlbpage.c

This is a split out of v1 series "Reduce ifdef mess in hugetlbpage.c and slice.c"

The main purpose of this series is to reduce the amount of #ifdefs in hugetlbpage.c by moving subarch specific stuff in dedicated header files.

This series also drops all CONFIG_PPC_64K_PAGES related code in book3e as it cannot be selected.

Compile test at http://kisskb.ellerman.id.au/kisskb/head/74280b305020ab2c50efe383d37fccff009e6b84/

Christophe Leroy (17):
powerpc/mm: Don't BUG() in hugepd_page() powerpc/mm: don't BUG in add_huge_page_size() powerpc/book3e: drop mmu_get_tsize()
powerpc/64: only book3s/64 supports CONFIG_PPC_64K_PAGES powerpc/book3e: hugetlbpage is only for CONFIG_PPC_FSL_BOOK3E powerpc/mm: move __find_linux_pte() out of hugetlbpage.c powerpc/mm: make hugetlbpage.c depend on CONFIG_HUGETLB_PAGE powerpc/mm: make gup_hugepte() static
powerpc/mm: split asm/hugetlb.h into dedicated subarch files powerpc/mm: add a helper to populate hugepd powerpc/mm: cleanup ifdef mess in add_huge_page_size() powerpc/mm: move hugetlb_disabled into asm/hugetlb.h powerpc/mm: cleanup HPAGE_SHIFT setup
powerpc/mm: cleanup remaining ifdef mess in hugetlbpage.c powerpc/mm: flatten function __find_linux_pte() step 1 powerpc/mm: flatten function __find_linux_pte() step 2 powerpc/mm: flatten function __find_linux_pte() step 3

 arch/powerpc/Kconfig                             |   3 +-
 arch/powerpc/include/asm/book3s/64/hugetlb.h     |  72 +++++++
 arch/powerpc/include/asm/hugetlb.h               |  87 +-------
 arch/powerpc/include/asm/nohash/32/hugetlb-8xx.h |  44 +++++
 arch/powerpc/include/asm/nohash/64/pgalloc.h     |   3 -
 arch/powerpc/include/asm/nohash/64/pgtable.h     |   4 -
 arch/powerpc/include/asm/nohash/hugetlb-book3e.h |  45 +++++
 arch/powerpc/include/asm/nohash/pte-book3e.h     |   5 -
 arch/powerpc/include/asm/page.h                  |  12 +-
 arch/powerpc/include/asm/pgtable-be-types.h      |   9 +-
 arch/powerpc/include/asm/pgtable-types.h         |   9 +-
 arch/powerpc/include/asm/pgtable.h               |   3 -
 arch/powerpc/include/asm/task_size_64.h          |   2 +-
 arch/powerpc/kernel/fadump.c                     |   1 +
 arch/powerpc/mm/Makefile                         |   4 +-
 arch/powerpc/mm/hash_utils_64.c                  |   1 +
 arch/powerpc/mm/hugetlbpage-book3e.c             |  52 ++---
 arch/powerpc/mm/hugetlbpage-hash64.c             |  16 ++
 arch/powerpc/mm/hugetlbpage.c                    | 240 +++--------------------
 arch/powerpc/mm/pgtable.c                        | 114 +++++++++++
 arch/powerpc/mm/tlb_low_64e.S                    |  31 ---
 arch/powerpc/mm/tlb_nohash.c                     |  13 --
 22 files changed, 366 insertions(+), 404 deletions(-)
 create mode 100644 arch/powerpc/include/asm/nohash/32/hugetlb-8xx.h
 create mode 100644 arch/powerpc/include/asm/nohash/hugetlb-book3e.h
Signature · 1 line
2.13.3