git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
asm-i386
/
page.h
diff --git
a/include/asm-i386/page.h
b/include/asm-i386/page.h
index
53cfb1c
..
ee426b0
100644
(file)
--- a/
include/asm-i386/page.h
+++ b/
include/asm-i386/page.h
@@
-12,7
+12,6
@@
#ifdef __KERNEL__
#ifndef __ASSEMBLY__
#ifdef __KERNEL__
#ifndef __ASSEMBLY__
-#include <linux/config.h>
#ifdef CONFIG_X86_USE_3DNOW
#ifdef CONFIG_X86_USE_3DNOW
@@
-53,6
+52,7
@@
typedef struct { unsigned long long pgprot; } pgprot_t;
#define pte_val(x) ((x).pte_low | ((unsigned long long)(x).pte_high << 32))
#define __pmd(x) ((pmd_t) { (x) } )
#define HPAGE_SHIFT 21
#define pte_val(x) ((x).pte_low | ((unsigned long long)(x).pte_high << 32))
#define __pmd(x) ((pmd_t) { (x) } )
#define HPAGE_SHIFT 21
+#include <asm-generic/pgtable-nopud.h>
#else
typedef struct { unsigned long pte_low; } pte_t;
typedef struct { unsigned long pgd; } pgd_t;
#else
typedef struct { unsigned long pte_low; } pte_t;
typedef struct { unsigned long pgd; } pgd_t;
@@
-60,6
+60,7
@@
typedef struct { unsigned long pgprot; } pgprot_t;
#define boot_pte_t pte_t /* or would you rather have a typedef */
#define pte_val(x) ((x).pte_low)
#define HPAGE_SHIFT 22
#define boot_pte_t pte_t /* or would you rather have a typedef */
#define pte_val(x) ((x).pte_low)
#define HPAGE_SHIFT 22
+#include <asm-generic/pgtable-nopmd.h>
#endif
#define PTE_MASK PAGE_MASK
#endif
#define PTE_MASK PAGE_MASK
@@
-97,6
+98,8
@@
typedef struct { unsigned long pgprot; } pgprot_t;
#ifndef __ASSEMBLY__
#ifndef __ASSEMBLY__
+struct vm_area_struct;
+
/*
* This much address space is reserved for vmalloc() and iomap()
* as well as fixmap mappings.
/*
* This much address space is reserved for vmalloc() and iomap()
* as well as fixmap mappings.
@@
-107,23
+110,27
@@
extern int sysctl_legacy_va_layout;
extern int page_is_ram(unsigned long pagenr);
extern int page_is_ram(unsigned long pagenr);
+extern int devmem_is_allowed(unsigned long pagenr);
+
#endif /* __ASSEMBLY__ */
#endif /* __ASSEMBLY__ */
+#ifdef __ASSEMBLY__
#define __PAGE_OFFSET CONFIG_PAGE_OFFSET
#define __PAGE_OFFSET CONFIG_PAGE_OFFSET
-#define __PHYSICAL_START CONFIG_PHYSICAL_START
-#define __KERNEL_START (__PAGE_OFFSET + __PHYSICAL_START)
-#define __MAXMEM (-__PAGE_OFFSET-__VMALLOC_RESERVE)
+#else
+#define __PAGE_OFFSET ((unsigned long)CONFIG_PAGE_OFFSET)
+#endif
+
#define PAGE_OFFSET ((unsigned long)__PAGE_OFFSET)
#define PAGE_OFFSET ((unsigned long)__PAGE_OFFSET)
-#define PHYSICAL_START ((unsigned long)__PHYSICAL_START)
#define VMALLOC_RESERVE ((unsigned long)__VMALLOC_RESERVE)
#define VMALLOC_RESERVE ((unsigned long)__VMALLOC_RESERVE)
-#define MAXMEM (
(unsigned long)__MAXMEM
)
+#define MAXMEM (
-__PAGE_OFFSET-__VMALLOC_RESERVE
)
#define __pa(x) ((unsigned long)(x)-PAGE_OFFSET)
#define __pa(x) ((unsigned long)(x)-PAGE_OFFSET)
+/* __pa_symbol should be used for C visible symbols.
+ This seems to be the official gcc blessed way to do such arithmetic. */
+#define __pa_symbol(x) __pa(RELOC_HIDE((unsigned long)(x),0))
#define __va(x) ((void *)((unsigned long)(x)+PAGE_OFFSET))
#define pfn_to_kaddr(pfn) __va((pfn) << PAGE_SHIFT)
#ifdef CONFIG_FLATMEM
#define __va(x) ((void *)((unsigned long)(x)+PAGE_OFFSET))
#define pfn_to_kaddr(pfn) __va((pfn) << PAGE_SHIFT)
#ifdef CONFIG_FLATMEM
-#define pfn_to_page(pfn) (mem_map + (pfn))
-#define page_to_pfn(page) ((unsigned long)((page) - mem_map))
#define pfn_valid(pfn) ((pfn) < max_mapnr)
#endif /* CONFIG_FLATMEM */
#define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
#define pfn_valid(pfn) ((pfn) < max_mapnr)
#endif /* CONFIG_FLATMEM */
#define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
@@
-135,8
+142,12
@@
extern int page_is_ram(unsigned long pagenr);
((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0 ) | \
VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0 ) | \
VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
-#endif /* __KERNEL__ */
-
+#include <asm-generic/memory_model.h>
#include <asm-generic/page.h>
#include <asm-generic/page.h>
+#ifndef CONFIG_COMPAT_VDSO
+#define __HAVE_ARCH_GATE_AREA 1
+#endif
+#endif /* __KERNEL__ */
+
#endif /* _I386_PAGE_H */
#endif /* _I386_PAGE_H */