Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8c6546b authored Sep 23, 2019 by Matthew Wilcox (Oracle) Committed by Linus Torvalds Sep 24, 2019

mm: introduce compound_nr()

Replace 1 << compound_order(page) with compound_nr(page).  Minor
improvements in readability.

Link: http://lkml.kernel.org/r/20190721104612.19120-4-willy@infradead.org


Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: Andrew Morton <akpm@linux-foundation.org>
Reviewed-by: Ira Weiny <ira.weiny@intel.com>
Acked-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Michal Hocko <mhocko@suse.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 94ad9338

arch/arm/mm/flush.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -208,13 +208,13 @@ void __flush_dcache_page(struct address_space mapping, struct page page)
		} else {
		unsigned long i;
		if (cache_is_vipt_nonaliasing()) {
		for (i = 0; i < (1 << compound_order(page)); i++) {
		for (i = 0; i < compound_nr(page); i++) {
		void *addr = kmap_atomic(page + i);
		__cpuc_flush_dcache_area(addr, PAGE_SIZE);
		kunmap_atomic(addr);
		}
		} else {
		for (i = 0; i < (1 << compound_order(page)); i++) {
		for (i = 0; i < compound_nr(page); i++) {
		void *addr = kmap_high_get(page + i);
		if (addr) {
		__cpuc_flush_dcache_area(addr, PAGE_SIZE);

arch/powerpc/mm/hugetlbpage.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -667,7 +667,7 @@ void flush_dcache_icache_hugepage(struct page *page)

		BUG_ON(!PageCompound(page));

		for (i = 0; i < (1UL << compound_order(page)); i++) {
		for (i = 0; i < compound_nr(page); i++) {
		if (!PageHighMem(page)) {
		__flush_dcache_icache(page_address(page+i));
		} else {

fs/proc/task_mmu.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -461,7 +461,7 @@ static void smaps_page_accumulate(struct mem_size_stats *mss,
		static void smaps_account(struct mem_size_stats mss, struct page page,
		bool compound, bool young, bool dirty, bool locked)
		{
		int i, nr = compound ? 1 << compound_order(page) : 1;
		int i, nr = compound ? compound_nr(page) : 1;
		unsigned long size = nr * PAGE_SIZE;

		/*

include/linux/mm.h

+6 −0

Original line number	Diff line number	Diff line
		@@ -805,6 +805,12 @@ static inline void set_compound_order(struct page *page, unsigned int order)
		page[1].compound_order = order;
		}

		/* Returns the number of pages in this potentially compound page. */
		static inline unsigned long compound_nr(struct page *page)
		{
		return 1UL << compound_order(page);
		}

		/* Returns the number of bytes in this potentially compound page. */
		static inline unsigned long page_size(struct page *page)
		{

mm/compaction.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -969,7 +969,7 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn,
		* is safe to read and it's 0 for tail pages.
		*/
		if (unlikely(PageCompound(page))) {
		low_pfn += (1UL << compound_order(page)) - 1;
		low_pfn += compound_nr(page) - 1;
		goto isolate_fail;
		}
		}