From 5c17d5e02f01fcf3c21b75046865e1e7fd207752 Mon Sep 17 00:00:00 2001 From: Ben Gras Date: Tue, 13 Apr 2010 11:08:08 +0000 Subject: [PATCH] vm: include no-caching bits in PTF_ALLFLAGS for flags sanity check. --- servers/vm/arch/i386/pagetable.c | 3 +-- servers/vm/arch/i386/pagetable.h | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/servers/vm/arch/i386/pagetable.c b/servers/vm/arch/i386/pagetable.c index cc3e8f776..4fa248311 100644 --- a/servers/vm/arch/i386/pagetable.c +++ b/servers/vm/arch/i386/pagetable.c @@ -855,8 +855,7 @@ PUBLIC void pt_init(phys_bytes usedlimit) I386_VM_PRESENT | I386_VM_USER | I386_VM_WRITE | global_bit; if(flags & VMMF_UNCACHED) - kern_mappings[index].flags |= - I386_VM_PWT | I386_VM_PCD; + kern_mappings[index].flags |= PTF_NOCACHE; if(addr % I386_PAGE_SIZE) panic("VM: addr unaligned: %d", addr); if(len % I386_PAGE_SIZE) diff --git a/servers/vm/arch/i386/pagetable.h b/servers/vm/arch/i386/pagetable.h index c1eacc8a2..68d54c20c 100644 --- a/servers/vm/arch/i386/pagetable.h +++ b/servers/vm/arch/i386/pagetable.h @@ -30,11 +30,12 @@ typedef struct { #define PTF_USER I386_VM_USER #define PTF_GLOBAL I386_VM_GLOBAL #define PTF_MAPALLOC I386_VM_PTAVAIL1 /* Page allocated by pt code. */ +#define PTF_NOCACHE (I386_VM_PWT | I386_VM_PCD) /* For arch-specific PT routines to check if no bits outside * the regular flags are set. */ -#define PTF_ALLFLAGS (PTF_WRITE|PTF_PRESENT|PTF_USER|PTF_GLOBAL) +#define PTF_ALLFLAGS (PTF_WRITE|PTF_PRESENT|PTF_USER|PTF_GLOBAL|PTF_NOCACHE) #if SANITYCHECKS #define PT_SANE(p) { pt_sanitycheck((p), __FILE__, __LINE__); } -- 2.44.0