From 738d08d5e306e67ba443763fd648a393a48c55d4 Mon Sep 17 00:00:00 2001
From: Richard Braun <rbraun@sceen.net>
Date: Thu, 13 Jun 2013 10:23:07 +0200
Subject: vm/vm_map: fix map entry merging

---
 vm/vm_page.h | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'vm/vm_page.h')

diff --git a/vm/vm_page.h b/vm/vm_page.h
index 205f3d2f..9a59df0a 100644
--- a/vm/vm_page.h
+++ b/vm/vm_page.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2011 Richard Braun.
+ * Copyright (c) 2010, 2011, 2013 Richard Braun.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,6 +22,7 @@
 #include <kern/macros.h>
 #include <kern/param.h>
 #include <kern/types.h>
+#include <vm/vm_object.h>
 
 /*
  * Address/page conversion and rounding macros (not inline functions to
@@ -41,8 +42,17 @@ struct vm_page {
     struct list node;
     unsigned short seg_index;
     unsigned short order;
+
+    union {
+        struct {
+            struct vm_object *object;
+            uint64_t offset;
+        };
+
+        void *slab_priv;
+    };
+
     phys_addr_t phys_addr;
-    void *slab_priv;
 };
 
 static inline phys_addr_t
-- 
cgit v1.2.3