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]
/
arch
/
i386
/
mm
/
boot_ioremap.c
diff --git
a/arch/i386/mm/boot_ioremap.c
b/arch/i386/mm/boot_ioremap.c
index
523b306
..
4de95a1
100644
(file)
--- a/
arch/i386/mm/boot_ioremap.c
+++ b/
arch/i386/mm/boot_ioremap.c
@@
-15,8
+15,8
@@
* boot_pte_t is defined only if this all works correctly
*/
* boot_pte_t is defined only if this all works correctly
*/
-#include <linux/config.h>
#undef CONFIG_X86_PAE
#undef CONFIG_X86_PAE
+#undef CONFIG_PARAVIRT
#include <asm/page.h>
#include <asm/pgtable.h>
#include <asm/tlbflush.h>
#include <asm/page.h>
#include <asm/pgtable.h>
#include <asm/tlbflush.h>
@@
-30,8
+30,11
@@
*/
#define BOOT_PTE_PTRS (PTRS_PER_PTE*2)
*/
#define BOOT_PTE_PTRS (PTRS_PER_PTE*2)
-#define boot_pte_index(address) \
- (((address) >> PAGE_SHIFT) & (BOOT_PTE_PTRS - 1))
+
+static unsigned long boot_pte_index(unsigned long vaddr)
+{
+ return __pa(vaddr) >> PAGE_SHIFT;
+}
static inline boot_pte_t* boot_vaddr_to_pte(void *address)
{
static inline boot_pte_t* boot_vaddr_to_pte(void *address)
{