Commit 5b3e84fc authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc: change CONFIG_PPC_STD_MMU to CONFIG_PPC_BOOK3S 



Today we have:

config PPC_BOOK3S
        def_bool y
        depends on PPC_BOOK3S_32 || PPC_BOOK3S_64

config PPC_STD_MMU
        def_bool y
        depends on PPC_BOOK3S

PPC_STD_MMU is therefore redundant with PPC_BOOK3S. Lets remove it.

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 68289ae9

arch/powerpc/mm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ obj-$(CONFIG_PPC_BOOK3E_64) += pgtable-book3e.o 
obj-$(CONFIG_PPC_BOOK3S_64)	+= pgtable-hash64.o hash_utils_64.o slb.o $(hash64-y) mmu_context_book3s64.o pgtable-book3s64.o

obj-$(CONFIG_PPC_RADIX_MMU)	+= pgtable-radix.o tlb-radix.o

obj-$(CONFIG_PPC_BOOK3S_32)	+= ppc_mmu_32.o hash_low_32.o mmu_context_hash32.o

obj-$(CONFIG_PPC_STD_MMU)	+= tlb_hash$(BITS).o

obj-$(CONFIG_PPC_BOOK3S)	+= tlb_hash$(BITS).o

ifdef CONFIG_PPC_BOOK3S_64

obj-$(CONFIG_PPC_4K_PAGES)	+= hash64_4k.o

obj-$(CONFIG_PPC_64K_PAGES)	+= hash64_64k.o

arch/powerpc/mm/fault.c

+2 −2
Original line number Diff line number Diff line
@@ -341,7 +341,7 @@ static inline void cmo_account_page_fault(void) 
static inline void cmo_account_page_fault(void) { }

#endif /* CONFIG_PPC_SMLPAR */



#ifdef CONFIG_PPC_STD_MMU

#ifdef CONFIG_PPC_BOOK3S

static void sanity_check_fault(bool is_write, unsigned long error_code)

{

	/*
@@ -378,7 +378,7 @@ static void sanity_check_fault(bool is_write, unsigned long error_code) 
}

#else

static void sanity_check_fault(bool is_write, unsigned long error_code) { }

#endif /* CONFIG_PPC_STD_MMU */

#endif /* CONFIG_PPC_BOOK3S */



/*

 * Define the correct "is_write" bit in error_code based

arch/powerpc/mm/mem.c

+2 −2
Original line number Diff line number Diff line
@@ -503,7 +503,7 @@ EXPORT_SYMBOL(flush_icache_user_range); 
void update_mmu_cache(struct vm_area_struct *vma, unsigned long address,

		      pte_t *ptep)

{

#ifdef CONFIG_PPC_STD_MMU

#ifdef CONFIG_PPC_BOOK3S

	/*

	 * We don't need to worry about _PAGE_PRESENT here because we are

	 * called with either mm->page_table_lock held or ptl lock held
@@ -541,7 +541,7 @@ void update_mmu_cache(struct vm_area_struct *vma, unsigned long address, 
	}



	hash_preload(vma->vm_mm, address, is_exec, trap);

#endif /* CONFIG_PPC_STD_MMU */

#endif /* CONFIG_PPC_BOOK3S */

#if (defined(CONFIG_PPC_BOOK3E_64) || defined(CONFIG_PPC_FSL_BOOK3E)) \

	&& defined(CONFIG_HUGETLB_PAGE)

	if (is_vm_hugetlb_page(vma))

arch/powerpc/xmon/xmon.c

+1 −1
Original line number Diff line number Diff line
@@ -1058,7 +1058,7 @@ cmds(struct pt_regs *excp) 
		case 'P':

			show_tasks();

			break;

#ifdef CONFIG_PPC_STD_MMU

#ifdef CONFIG_PPC_BOOK3S

		case 'u':

			dump_segments();

			break;