# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxxxxx>
# Date 1180947924 -3600
# Node ID cb5094f46707122699e4dd791601cdc4497f3497
# Parent 3bf38ecef9001bf40ee6a43c4dbe4b463ed087f7
Imported patch fixaddr-top.patch from xen-unstable.hg 15200:bd3d6b4c52ec
---
arch/i386/mm/pgtable.c | 12 ++++++++++++
include/asm-i386/fixmap.h | 4 +++-
include/asm-i386/page.h | 2 +-
3 files changed, 16 insertions(+), 2 deletions(-)
diff -r 3bf38ecef900 -r cb5094f46707 arch/i386/mm/pgtable.c
--- a/arch/i386/mm/pgtable.c Mon Jun 04 10:05:24 2007 +0100
+++ b/arch/i386/mm/pgtable.c Mon Jun 04 10:05:24 2007 +0100
@@ -12,6 +12,7 @@
#include <linux/slab.h>
#include <linux/pagemap.h>
#include <linux/spinlock.h>
+#include <linux/module.h>
#include <asm/system.h>
#include <asm/pgtable.h>
@@ -137,6 +138,10 @@ void set_pmd_pfn(unsigned long vaddr, un
__flush_tlb_one(vaddr);
}
+static int nr_fixmaps = 0;
+unsigned long __FIXADDR_TOP = 0xfffff000;
+EXPORT_SYMBOL(__FIXADDR_TOP);
+
void __set_fixmap (enum fixed_addresses idx, unsigned long phys, pgprot_t
flags)
{
unsigned long address = __fix_to_virt(idx);
@@ -146,6 +151,13 @@ void __set_fixmap (enum fixed_addresses
return;
}
set_pte_pfn(address, phys >> PAGE_SHIFT, flags);
+ nr_fixmaps++;
+}
+
+void set_fixaddr_top(unsigned long top)
+{
+ BUG_ON(nr_fixmaps > 0);
+ __FIXADDR_TOP = top - PAGE_SIZE;
}
pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address)
diff -r 3bf38ecef900 -r cb5094f46707 include/asm-i386/fixmap.h
--- a/include/asm-i386/fixmap.h Mon Jun 04 10:05:24 2007 +0100
+++ b/include/asm-i386/fixmap.h Mon Jun 04 10:05:24 2007 +0100
@@ -19,7 +19,7 @@
* Leave one empty page between vmalloc'ed areas and
* the start of the fixmap.
*/
-#define __FIXADDR_TOP 0xfffff000
+extern unsigned long __FIXADDR_TOP;
#ifndef __ASSEMBLY__
#include <linux/kernel.h>
@@ -94,6 +94,8 @@ extern void __set_fixmap (enum fixed_add
extern void __set_fixmap (enum fixed_addresses idx,
unsigned long phys, pgprot_t flags);
+extern void set_fixaddr_top(unsigned long top);
+
#define set_fixmap(idx, phys) \
__set_fixmap(idx, phys, PAGE_KERNEL)
/*
diff -r 3bf38ecef900 -r cb5094f46707 include/asm-i386/page.h
--- a/include/asm-i386/page.h Mon Jun 04 10:05:24 2007 +0100
+++ b/include/asm-i386/page.h Mon Jun 04 10:05:24 2007 +0100
@@ -122,7 +122,7 @@ extern int page_is_ram(unsigned long pag
#define PAGE_OFFSET ((unsigned long)__PAGE_OFFSET)
#define VMALLOC_RESERVE ((unsigned long)__VMALLOC_RESERVE)
-#define MAXMEM (-__PAGE_OFFSET-__VMALLOC_RESERVE)
+#define MAXMEM (__FIXADDR_TOP-__PAGE_OFFSET-__VMALLOC_RESERVE)
#define __pa(x) ((unsigned long)(x)-PAGE_OFFSET)
#define __va(x) ((void *)((unsigned
long)(x)+PAGE_OFFSET))
#define pfn_to_kaddr(pfn) __va((pfn) << PAGE_SHIFT)
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home