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

Commit 28e93a00 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'x86/mm' into x86/core

parents caab36b5 ed26dbe5

arch/x86/include/asm/init.h

0 → 100644
+18 −0
Original line number Diff line number Diff line 
#ifndef _ASM_X86_INIT_32_H

#define _ASM_X86_INIT_32_H



#ifdef CONFIG_X86_32

extern void __init early_ioremap_page_table_range_init(void);

#endif



extern unsigned long __init

kernel_physical_mapping_init(unsigned long start,

			     unsigned long end,

			     unsigned long page_size_mask);





extern unsigned long __initdata e820_table_start;

extern unsigned long __meminitdata e820_table_end;

extern unsigned long __meminitdata e820_table_top;



#endif /* _ASM_X86_INIT_32_H */

arch/x86/include/asm/page_types.h

+0 −6
Original line number Diff line number Diff line
@@ -40,14 +40,8 @@ 


#ifndef __ASSEMBLY__



struct pgprot;



extern int page_is_ram(unsigned long pagenr);

extern int devmem_is_allowed(unsigned long pagenr);

extern void map_devmem(unsigned long pfn, unsigned long size,

		       struct pgprot vma_prot);

extern void unmap_devmem(unsigned long pfn, unsigned long size,

			 struct pgprot vma_prot);



extern unsigned long max_low_pfn_mapped;

extern unsigned long max_pfn_mapped;

arch/x86/include/asm/pat.h

+5 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#define _ASM_X86_PAT_H



#include <linux/types.h>

#include <asm/pgtable_types.h>



#ifdef CONFIG_X86_PAT

extern int pat_enabled;
@@ -17,5 +18,9 @@ extern int free_memtype(u64 start, u64 end); 


extern int kernel_map_sync_memtype(u64 base, unsigned long size,

		unsigned long flag);

extern void map_devmem(unsigned long pfn, unsigned long size,

		       struct pgprot vma_prot);

extern void unmap_devmem(unsigned long pfn, unsigned long size,

			 struct pgprot vma_prot);



#endif /* _ASM_X86_PAT_H */

arch/x86/include/asm/pgtable_32_types.h

+5 −0
Original line number Diff line number Diff line
@@ -25,6 +25,11 @@ 
 * area for the same reason. ;)

 */

#define VMALLOC_OFFSET	(8 * 1024 * 1024)



#ifndef __ASSEMBLER__

extern bool __vmalloc_start_set; /* set once high_memory is set */

#endif



#define VMALLOC_START	((unsigned long)high_memory + VMALLOC_OFFSET)

#ifdef CONFIG_X86_PAE

#define LAST_PKMAP 512

arch/x86/include/asm/pgtable_types.h

+1 −0
Original line number Diff line number Diff line
@@ -273,6 +273,7 @@ typedef struct page *pgtable_t; 


extern pteval_t __supported_pte_mask;

extern int nx_enabled;

extern void set_nx(void);



#define pgprot_writecombine	pgprot_writecombine

extern pgprot_t pgprot_writecombine(pgprot_t prot);