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

Commit e7df0d88 authored by Joonsoo Kim's avatar Joonsoo Kim Committed by Linus Torvalds
Browse files

powerpc: query dynamic DEBUG_PAGEALLOC setting 



We can disable debug_pagealloc processing even if the code is compiled
with CONFIG_DEBUG_PAGEALLOC.  This patch changes the code to query
whether it is enabled or not in runtime.

Signed-off-by: default avatarJoonsoo Kim <iamjoonsoo.kim@lge.com>
Acked-by: default avatarDavid Rientjes <rientjes@google.com>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Christoph Lameter <cl@linux.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 505f6d22

arch/powerpc/kernel/traps.c

+2 −3
Original line number Diff line number Diff line
@@ -203,9 +203,8 @@ static int __kprobes __die(const char *str, struct pt_regs *regs, long err) 
#ifdef CONFIG_SMP

	printk("SMP NR_CPUS=%d ", NR_CPUS);

#endif

#ifdef CONFIG_DEBUG_PAGEALLOC

	if (debug_pagealloc_enabled())

		printk("DEBUG_PAGEALLOC ");

#endif

#ifdef CONFIG_NUMA

	printk("NUMA ");

#endif

arch/powerpc/mm/hash_utils_64.c

+20 −16
Original line number Diff line number Diff line
@@ -255,8 +255,10 @@ int htab_bolt_mapping(unsigned long vstart, unsigned long vend, 


		if (ret < 0)

			break;



#ifdef CONFIG_DEBUG_PAGEALLOC

		if ((paddr >> PAGE_SHIFT) < linear_map_hash_count)

		if (debug_pagealloc_enabled() &&

			(paddr >> PAGE_SHIFT) < linear_map_hash_count)

			linear_map_hash_slots[paddr >> PAGE_SHIFT] = ret | 0x80;

#endif /* CONFIG_DEBUG_PAGEALLOC */

	}
@@ -513,16 +515,16 @@ static void __init htab_init_page_sizes(void) 
		memcpy(mmu_psize_defs, mmu_psize_defaults_gp,

		       sizeof(mmu_psize_defaults_gp));

found:

#ifndef CONFIG_DEBUG_PAGEALLOC

	if (!debug_pagealloc_enabled()) {

		/*

	 * Pick a size for the linear mapping. Currently, we only support

	 * 16M, 1M and 4K which is the default

		 * Pick a size for the linear mapping. Currently, we only

		 * support 16M, 1M and 4K which is the default

		 */

		if (mmu_psize_defs[MMU_PAGE_16M].shift)

			mmu_linear_psize = MMU_PAGE_16M;

		else if (mmu_psize_defs[MMU_PAGE_1M].shift)

			mmu_linear_psize = MMU_PAGE_1M;

#endif /* CONFIG_DEBUG_PAGEALLOC */

	}



#ifdef CONFIG_PPC_64K_PAGES

	/*
@@ -721,10 +723,12 @@ static void __init htab_initialize(void) 
	prot = pgprot_val(PAGE_KERNEL);



#ifdef CONFIG_DEBUG_PAGEALLOC

	if (debug_pagealloc_enabled()) {

		linear_map_hash_count = memblock_end_of_DRAM() >> PAGE_SHIFT;

	linear_map_hash_slots = __va(memblock_alloc_base(linear_map_hash_count,

						    1, ppc64_rma_size));

		linear_map_hash_slots = __va(memblock_alloc_base(

				linear_map_hash_count, 1, ppc64_rma_size));

		memset(linear_map_hash_slots, 0, linear_map_hash_count);

	}

#endif /* CONFIG_DEBUG_PAGEALLOC */



	/* On U3 based machines, we need to reserve the DART area and

arch/powerpc/mm/init_32.c

+4 −4
Original line number Diff line number Diff line
@@ -112,10 +112,10 @@ void __init MMU_setup(void) 
	if (strstr(boot_command_line, "noltlbs")) {

		__map_without_ltlbs = 1;

	}

#ifdef CONFIG_DEBUG_PAGEALLOC

	if (debug_pagealloc_enabled()) {

		__map_without_bats = 1;

		__map_without_ltlbs = 1;

#endif

	}

}



/*