3bf8f5a92c
Commit 2f569afd9c ("CONFIG_HIGHPTE vs.
sub-page page tables") caused some build breakage due to pgtable_t only
getting declared in the CONFIG_X86_PAE case.
Move the declaration outside the PAE section.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
112 lines
2.4 KiB
C
112 lines
2.4 KiB
C
#ifndef _ASM_X86_PAGE_32_H
|
|
#define _ASM_X86_PAGE_32_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)
|
|
|
|
#ifdef CONFIG_X86_PAE
|
|
#define __PHYSICAL_MASK_SHIFT 36
|
|
#define __VIRTUAL_MASK_SHIFT 32
|
|
#define PAGETABLE_LEVELS 3
|
|
|
|
#ifndef __ASSEMBLY__
|
|
typedef u64 pteval_t;
|
|
typedef u64 pmdval_t;
|
|
typedef u64 pudval_t;
|
|
typedef u64 pgdval_t;
|
|
typedef u64 pgprotval_t;
|
|
typedef u64 phys_addr_t;
|
|
|
|
typedef union {
|
|
struct {
|
|
unsigned long pte_low, pte_high;
|
|
};
|
|
pteval_t pte;
|
|
} pte_t;
|
|
#endif /* __ASSEMBLY__
|
|
*/
|
|
#else /* !CONFIG_X86_PAE */
|
|
#define __PHYSICAL_MASK_SHIFT 32
|
|
#define __VIRTUAL_MASK_SHIFT 32
|
|
#define PAGETABLE_LEVELS 2
|
|
|
|
#ifndef __ASSEMBLY__
|
|
typedef unsigned long pteval_t;
|
|
typedef unsigned long pmdval_t;
|
|
typedef unsigned long pudval_t;
|
|
typedef unsigned long pgdval_t;
|
|
typedef unsigned long pgprotval_t;
|
|
typedef unsigned long phys_addr_t;
|
|
|
|
typedef union { pteval_t pte, pte_low; } pte_t;
|
|
typedef pte_t boot_pte_t;
|
|
|
|
#endif /* __ASSEMBLY__ */
|
|
#endif /* CONFIG_X86_PAE */
|
|
|
|
#ifndef __ASSEMBLY__
|
|
typedef struct page *pgtable_t;
|
|
#endif
|
|
|
|
#ifdef CONFIG_HUGETLB_PAGE
|
|
#define HAVE_ARCH_HUGETLB_UNMAPPED_AREA
|
|
#endif
|
|
|
|
#ifndef __ASSEMBLY__
|
|
#define __phys_addr(x) ((x)-PAGE_OFFSET)
|
|
#define __phys_reloc_hide(x) RELOC_HIDE((x), 0)
|
|
|
|
#ifdef CONFIG_FLATMEM
|
|
#define pfn_valid(pfn) ((pfn) < max_mapnr)
|
|
#endif /* CONFIG_FLATMEM */
|
|
|
|
extern int nx_enabled;
|
|
|
|
/*
|
|
* 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;
|
|
|
|
#define VMALLOC_RESERVE ((unsigned long)__VMALLOC_RESERVE)
|
|
#define MAXMEM (-__PAGE_OFFSET-__VMALLOC_RESERVE)
|
|
|
|
#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 */
|