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

Commit 2a32f2db authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 

* 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  resource: Fix broken indentation
  resource: Fix generic page_is_ram() for partial RAM pages
  x86, paravirt: Remove kmap_atomic_pte paravirt op.
  x86, vmi: Disable highmem PTE allocation even when CONFIG_HIGHPTE=y
  x86, xen: Disable highmem PTE allocation even when CONFIG_HIGHPTE=y
parents feaf77d5 f4149660

arch/x86/include/asm/highmem.h

+0 −4
Original line number Diff line number Diff line
@@ -66,10 +66,6 @@ void *kmap_atomic_pfn(unsigned long pfn, enum km_type type); 
void *kmap_atomic_prot_pfn(unsigned long pfn, enum km_type type, pgprot_t prot);

struct page *kmap_atomic_to_page(void *ptr);



#ifndef CONFIG_PARAVIRT

#define kmap_atomic_pte(page, type)	kmap_atomic(page, type)

#endif



#define flush_cache_kmaps()	do { } while (0)



extern void add_highpages_with_active_regions(int nid, unsigned long start_pfn,

arch/x86/include/asm/paravirt.h

+0 −9
Original line number Diff line number Diff line
@@ -435,15 +435,6 @@ static inline void paravirt_release_pud(unsigned long pfn) 
	PVOP_VCALL1(pv_mmu_ops.release_pud, pfn);

}



#ifdef CONFIG_HIGHPTE

static inline void *kmap_atomic_pte(struct page *page, enum km_type type)

{

	unsigned long ret;

	ret = PVOP_CALL2(unsigned long, pv_mmu_ops.kmap_atomic_pte, page, type);

	return (void *)ret;

}

#endif



static inline void pte_update(struct mm_struct *mm, unsigned long addr,

			      pte_t *ptep)

{

arch/x86/include/asm/paravirt_types.h

+0 −4
Original line number Diff line number Diff line
@@ -304,10 +304,6 @@ struct pv_mmu_ops { 
#endif	/* PAGETABLE_LEVELS == 4 */

#endif	/* PAGETABLE_LEVELS >= 3 */



#ifdef CONFIG_HIGHPTE

	void *(*kmap_atomic_pte)(struct page *page, enum km_type type);

#endif



	struct pv_lazy_ops lazy_mode;



	/* dom0 ops */

arch/x86/include/asm/pgtable_32.h

+2 −2
Original line number Diff line number Diff line
@@ -54,10 +54,10 @@ extern void set_pmd_pfn(unsigned long, unsigned long, pgprot_t); 
	 in_irq() ? KM_IRQ_PTE :	\

	 KM_PTE0)

#define pte_offset_map(dir, address)					\

	((pte_t *)kmap_atomic_pte(pmd_page(*(dir)), __KM_PTE) +		\

	((pte_t *)kmap_atomic(pmd_page(*(dir)), __KM_PTE) +		\

	 pte_index((address)))

#define pte_offset_map_nested(dir, address)				\

	((pte_t *)kmap_atomic_pte(pmd_page(*(dir)), KM_PTE1) +		\

	((pte_t *)kmap_atomic(pmd_page(*(dir)), KM_PTE1) +		\

	 pte_index((address)))

#define pte_unmap(pte) kunmap_atomic((pte), __KM_PTE)

#define pte_unmap_nested(pte) kunmap_atomic((pte), KM_PTE1)

arch/x86/kernel/paravirt.c

+0 −4
Original line number Diff line number Diff line
@@ -428,10 +428,6 @@ struct pv_mmu_ops pv_mmu_ops = { 
	.ptep_modify_prot_start = __ptep_modify_prot_start,

	.ptep_modify_prot_commit = __ptep_modify_prot_commit,



#ifdef CONFIG_HIGHPTE

	.kmap_atomic_pte = kmap_atomic,

#endif



#if PAGETABLE_LEVELS >= 3

#ifdef CONFIG_X86_PAE

	.set_pte_atomic = native_set_pte_atomic,