Commit e4b71dcf authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86: clean up arch/x86/mm/pageattr.c 



do some leftover cleanups in the now unified arch/x86/mm/pageattr.c
file.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 4554ab95

arch/x86/mm/pageattr.c

+5 −8
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
 * Copyright 2002 Andi Kleen, SuSE Labs.

 * Thanks to Ben LaHaise for precious feedback.

 */



#include <linux/highmem.h>

#include <linux/module.h>

#include <linux/sched.h>
@@ -50,9 +49,7 @@ static void __set_pmd_pte(pte_t *kpte, unsigned long address, pte_t pte) 
	/* change init_mm */

	set_pte_atomic(kpte, pte);

#ifdef CONFIG_X86_32

	if (SHARED_KERNEL_PMD)

		return;

	{

	if (!SHARED_KERNEL_PMD) {

		struct page *page;



		for (page = pgd_list; page; page = (struct page *)page->index) {
@@ -277,14 +274,14 @@ void kernel_map_pages(struct page *page, int numpages, int enable) 
		return;



	/*

	 * the return value is ignored - the calls cannot fail,

	 * large pages are disabled at boot time.

	 * The return value is ignored - the calls cannot fail,

	 * large pages are disabled at boot time:

	 */

	change_page_attr(page, numpages, enable ? PAGE_KERNEL : __pgprot(0));



	/*

	 * we should perform an IPI and flush all tlbs,

	 * but that can deadlock->flush only current cpu.

	 * We should perform an IPI and flush all tlbs,

	 * but that can deadlock->flush only current cpu:

	 */

	__flush_tlb_all();

}

include/asm-x86/pgtable_64.h

+2 −0
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ extern void clear_kernel_mapping(unsigned long addr, unsigned long size); 


#endif /* !__ASSEMBLY__ */



#define SHARED_KERNEL_PMD	1



/*

 * PGDIR_SHIFT determines what a top-level page table entry can map

 */