git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'x86/alternatives', 'x86/cleanups', 'x86/commandline', 'x86/crashdump...
[safe/jmp/linux-2.6]
/
include
/
asm-x86
/
pgtable_32.h
diff --git
a/include/asm-x86/pgtable_32.h
b/include/asm-x86/pgtable_32.h
index
5c3b265
..
8de702d
100644
(file)
--- a/
include/asm-x86/pgtable_32.h
+++ b/
include/asm-x86/pgtable_32.h
@@
-1,5
+1,5
@@
-#ifndef
_I386_PGTABLE
_H
-#define
_I386_PGTABLE
_H
+#ifndef
ASM_X86__PGTABLE_32
_H
+#define
ASM_X86__PGTABLE_32
_H
/*
/*
@@
-31,6
+31,7
@@
static inline void pgtable_cache_init(void) { }
static inline void check_pgt_cache(void) { }
void paging_init(void);
static inline void check_pgt_cache(void) { }
void paging_init(void);
+extern void set_pmd_pfn(unsigned long, unsigned long, pgprot_t);
/*
* The Linux x86 paging architecture is 'compile-time dual-mode', it
/*
* The Linux x86 paging architecture is 'compile-time dual-mode', it
@@
-56,8
+57,7
@@
void paging_init(void);
* area for the same reason. ;)
*/
#define VMALLOC_OFFSET (8 * 1024 * 1024)
* area for the same reason. ;)
*/
#define VMALLOC_OFFSET (8 * 1024 * 1024)
-#define VMALLOC_START (((unsigned long)high_memory + 2 * VMALLOC_OFFSET - 1) \
- & ~(VMALLOC_OFFSET - 1))
+#define VMALLOC_START ((unsigned long)high_memory + VMALLOC_OFFSET)
#ifdef CONFIG_X86_PAE
#define LAST_PKMAP 512
#else
#ifdef CONFIG_X86_PAE
#define LAST_PKMAP 512
#else
@@
-73,6
+73,8
@@
void paging_init(void);
# define VMALLOC_END (FIXADDR_START - 2 * PAGE_SIZE)
#endif
# define VMALLOC_END (FIXADDR_START - 2 * PAGE_SIZE)
#endif
+#define MAXMEM (VMALLOC_END - PAGE_OFFSET - __VMALLOC_RESERVE)
+
/*
* Define this if things work differently on an i386 and an i486:
* it will (on an i486) warn about kernel memory accesses that are
/*
* Define this if things work differently on an i386 and an i486:
* it will (on an i486) warn about kernel memory accesses that are
@@
-186,4
+188,4
@@
do { \
#define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \
remap_pfn_range(vma, vaddr, pfn, size, prot)
#define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \
remap_pfn_range(vma, vaddr, pfn, size, prot)
-#endif /*
_I386_PGTABLE
_H */
+#endif /*
ASM_X86__PGTABLE_32
_H */