diff options
author | Elliott Hughes <enh@google.com> | 2013-09-30 18:29:24 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-30 18:29:24 -0700 |
commit | a03e01171a04dbcefe1945fd552a7f60733b0ab6 (patch) | |
tree | 696ce922ee9d0e60dbff7ebbfdea4243ee629975 /original | |
parent | ebdd52743f3d606e5f5a2e2aa7781b61513d80a7 (diff) | |
parent | d11c1b5c59f49fb893557f6ff69fe0f1b2c93c89 (diff) | |
download | kernel-headers-a03e01171a04dbcefe1945fd552a7f60733b0ab6.tar.gz |
am d11c1b5c: Merge "Remove x86-only page*.h files."
* commit 'd11c1b5c59f49fb893557f6ff69fe0f1b2c93c89':
Remove x86-only page*.h files.
Diffstat (limited to 'original')
-rw-r--r-- | original/asm-x86/page_32.h | 51 | ||||
-rw-r--r-- | original/asm-x86/page_32_types.h | 57 | ||||
-rw-r--r-- | original/asm-x86/page_64.h | 6 | ||||
-rw-r--r-- | original/asm-x86/page_64_types.h | 75 | ||||
-rw-r--r-- | original/asm-x86/page_types.h | 61 |
5 files changed, 0 insertions, 250 deletions
diff --git a/original/asm-x86/page_32.h b/original/asm-x86/page_32.h deleted file mode 100644 index da4e762..0000000 --- a/original/asm-x86/page_32.h +++ /dev/null @@ -1,51 +0,0 @@ -#ifndef _ASM_X86_PAGE_32_H -#define _ASM_X86_PAGE_32_H - -#include <asm/page_32_types.h> - -#ifndef __ASSEMBLY__ - -#ifdef CONFIG_HUGETLB_PAGE -#define HAVE_ARCH_HUGETLB_UNMAPPED_AREA -#endif - -#define __phys_addr_nodebug(x) ((x) - PAGE_OFFSET) -#ifdef CONFIG_DEBUG_VIRTUAL -extern unsigned long __phys_addr(unsigned long); -#else -#define __phys_addr(x) __phys_addr_nodebug(x) -#endif -#define __phys_reloc_hide(x) RELOC_HIDE((x), 0) - -#ifdef CONFIG_FLATMEM -#define pfn_valid(pfn) ((pfn) < max_mapnr) -#endif /* CONFIG_FLATMEM */ - -#ifdef CONFIG_X86_USE_3DNOW -#include <asm/mmx.h> - -static inline void clear_page(void *page) -{ - mmx_clear_page(page); -} - -static inline void copy_page(void *to, void *from) -{ - mmx_copy_page(to, from); -} -#else /* !CONFIG_X86_USE_3DNOW */ -#include <linux/string.h> - -static inline void clear_page(void *page) -{ - memset(page, 0, PAGE_SIZE); -} - -static inline void copy_page(void *to, void *from) -{ - memcpy(to, from, PAGE_SIZE); -} -#endif /* CONFIG_X86_3DNOW */ -#endif /* !__ASSEMBLY__ */ - -#endif /* _ASM_X86_PAGE_32_H */ diff --git a/original/asm-x86/page_32_types.h b/original/asm-x86/page_32_types.h deleted file mode 100644 index ade619f..0000000 --- a/original/asm-x86/page_32_types.h +++ /dev/null @@ -1,57 +0,0 @@ -#ifndef _ASM_X86_PAGE_32_DEFS_H -#define _ASM_X86_PAGE_32_DEFS_H - -#include <linux/const.h> - -/* - * This handles the memory map. - * - * A __PAGE_OFFSET of 0xC0000000 means that the kernel has - * a virtual address space of one gigabyte, which limits the - * amount of physical memory you can use to about 950MB. - * - * If you want more physical memory than this then see the CONFIG_HIGHMEM4G - * and CONFIG_HIGHMEM64G options in the kernel configuration. - */ -#define __PAGE_OFFSET _AC(CONFIG_PAGE_OFFSET, UL) - -#define THREAD_ORDER 1 -#define THREAD_SIZE (PAGE_SIZE << THREAD_ORDER) - -#define STACKFAULT_STACK 0 -#define DOUBLEFAULT_STACK 1 -#define NMI_STACK 0 -#define DEBUG_STACK 0 -#define MCE_STACK 0 -#define N_EXCEPTION_STACKS 1 - -#ifdef CONFIG_X86_PAE -/* 44=32+12, the limit we can fit into an unsigned long pfn */ -#define __PHYSICAL_MASK_SHIFT 44 -#define __VIRTUAL_MASK_SHIFT 32 - -#else /* !CONFIG_X86_PAE */ -#define __PHYSICAL_MASK_SHIFT 32 -#define __VIRTUAL_MASK_SHIFT 32 -#endif /* CONFIG_X86_PAE */ - -/* - * Kernel image size is limited to 512 MB (see in arch/x86/kernel/head_32.S) - */ -#define KERNEL_IMAGE_SIZE (512 * 1024 * 1024) - -#ifndef __ASSEMBLY__ - -/* - * This much address space is reserved for vmalloc() and iomap() - * as well as fixmap mappings. - */ -extern unsigned int __VMALLOC_RESERVE; -extern int sysctl_legacy_va_layout; - -extern void find_low_pfn_range(void); -extern void setup_bootmem_allocator(void); - -#endif /* !__ASSEMBLY__ */ - -#endif /* _ASM_X86_PAGE_32_DEFS_H */ diff --git a/original/asm-x86/page_64.h b/original/asm-x86/page_64.h deleted file mode 100644 index 072694e..0000000 --- a/original/asm-x86/page_64.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_X86_PAGE_64_H -#define _ASM_X86_PAGE_64_H - -#include <asm/page_64_types.h> - -#endif /* _ASM_X86_PAGE_64_H */ diff --git a/original/asm-x86/page_64_types.h b/original/asm-x86/page_64_types.h deleted file mode 100644 index 7639dbf..0000000 --- a/original/asm-x86/page_64_types.h +++ /dev/null @@ -1,75 +0,0 @@ -#ifndef _ASM_X86_PAGE_64_DEFS_H -#define _ASM_X86_PAGE_64_DEFS_H - -#define THREAD_ORDER 1 -#define THREAD_SIZE (PAGE_SIZE << THREAD_ORDER) -#define CURRENT_MASK (~(THREAD_SIZE - 1)) - -#define EXCEPTION_STACK_ORDER 0 -#define EXCEPTION_STKSZ (PAGE_SIZE << EXCEPTION_STACK_ORDER) - -#define DEBUG_STACK_ORDER (EXCEPTION_STACK_ORDER + 1) -#define DEBUG_STKSZ (PAGE_SIZE << DEBUG_STACK_ORDER) - -#define IRQ_STACK_ORDER 2 -#define IRQ_STACK_SIZE (PAGE_SIZE << IRQ_STACK_ORDER) - -#define STACKFAULT_STACK 1 -#define DOUBLEFAULT_STACK 2 -#define NMI_STACK 3 -#define DEBUG_STACK 4 -#define MCE_STACK 5 -#define N_EXCEPTION_STACKS 5 /* hw limit: 7 */ - -#define PUD_PAGE_SIZE (_AC(1, UL) << PUD_SHIFT) -#define PUD_PAGE_MASK (~(PUD_PAGE_SIZE-1)) - -/* - * Set __PAGE_OFFSET to the most negative possible address + - * PGDIR_SIZE*16 (pgd slot 272). The gap is to allow a space for a - * hypervisor to fit. Choosing 16 slots here is arbitrary, but it's - * what Xen requires. - */ -#define __PAGE_OFFSET _AC(0xffff880000000000, UL) - -#define __PHYSICAL_START ((CONFIG_PHYSICAL_START + \ - (CONFIG_PHYSICAL_ALIGN - 1)) & \ - ~(CONFIG_PHYSICAL_ALIGN - 1)) - -#define __START_KERNEL (__START_KERNEL_map + __PHYSICAL_START) -#define __START_KERNEL_map _AC(0xffffffff80000000, UL) - -/* See Documentation/x86/x86_64/mm.txt for a description of the memory map. */ -#define __PHYSICAL_MASK_SHIFT 46 -#define __VIRTUAL_MASK_SHIFT 47 - -/* - * Kernel image size is limited to 512 MB (see level2_kernel_pgt in - * arch/x86/kernel/head_64.S), and it is mapped here: - */ -#define KERNEL_IMAGE_SIZE (512 * 1024 * 1024) -#define KERNEL_IMAGE_START _AC(0xffffffff80000000, UL) - -#ifndef __ASSEMBLY__ -void clear_page(void *page); -void copy_page(void *to, void *from); - -/* duplicated to the one in bootmem.h */ -extern unsigned long max_pfn; -extern unsigned long phys_base; - -extern unsigned long __phys_addr(unsigned long); -#define __phys_reloc_hide(x) (x) - -#define vmemmap ((struct page *)VMEMMAP_START) - -extern void init_extra_mapping_uc(unsigned long phys, unsigned long size); -extern void init_extra_mapping_wb(unsigned long phys, unsigned long size); - -#endif /* !__ASSEMBLY__ */ - -#ifdef CONFIG_FLATMEM -#define pfn_valid(pfn) ((pfn) < max_pfn) -#endif - -#endif /* _ASM_X86_PAGE_64_DEFS_H */ diff --git a/original/asm-x86/page_types.h b/original/asm-x86/page_types.h deleted file mode 100644 index e21fdd1..0000000 --- a/original/asm-x86/page_types.h +++ /dev/null @@ -1,61 +0,0 @@ -#ifndef _ASM_X86_PAGE_DEFS_H -#define _ASM_X86_PAGE_DEFS_H - -#include <linux/const.h> -#include <linux/types.h> - -/* PAGE_SHIFT determines the page size */ -#define PAGE_SHIFT 12 -#define PAGE_SIZE (_AC(1,UL) << PAGE_SHIFT) -#define PAGE_MASK (~(PAGE_SIZE-1)) - -#define __PHYSICAL_MASK ((phys_addr_t)((1ULL << __PHYSICAL_MASK_SHIFT) - 1)) -#define __VIRTUAL_MASK ((1UL << __VIRTUAL_MASK_SHIFT) - 1) - -/* Cast PAGE_MASK to a signed type so that it is sign-extended if - virtual addresses are 32-bits but physical addresses are larger - (ie, 32-bit PAE). */ -#define PHYSICAL_PAGE_MASK (((signed long)PAGE_MASK) & __PHYSICAL_MASK) - -#define PMD_PAGE_SIZE (_AC(1, UL) << PMD_SHIFT) -#define PMD_PAGE_MASK (~(PMD_PAGE_SIZE-1)) - -#define HPAGE_SHIFT PMD_SHIFT -#define HPAGE_SIZE (_AC(1,UL) << HPAGE_SHIFT) -#define HPAGE_MASK (~(HPAGE_SIZE - 1)) -#define HUGETLB_PAGE_ORDER (HPAGE_SHIFT - PAGE_SHIFT) - -#define HUGE_MAX_HSTATE 2 - -#define PAGE_OFFSET ((unsigned long)__PAGE_OFFSET) - -#define VM_DATA_DEFAULT_FLAGS \ - (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0 ) | \ - VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) - -#ifdef CONFIG_X86_64 -#include <asm/page_64_types.h> -#else -#include <asm/page_32_types.h> -#endif /* CONFIG_X86_64 */ - -#ifndef __ASSEMBLY__ - -extern int devmem_is_allowed(unsigned long pagenr); - -extern unsigned long max_low_pfn_mapped; -extern unsigned long max_pfn_mapped; - -static inline phys_addr_t get_max_mapped(void) -{ - return (phys_addr_t)max_pfn_mapped << PAGE_SHIFT; -} - -extern unsigned long init_memory_mapping(unsigned long start, - unsigned long end); - -extern void initmem_init(void); - -#endif /* !__ASSEMBLY__ */ - -#endif /* _ASM_X86_PAGE_DEFS_H */ |