diff options
| author | Richard Braun <rbraun@sceen.net> | 2013-06-13 10:23:07 +0200 |
|---|---|---|
| committer | Richard Braun <rbraun@sceen.net> | 2013-07-06 19:02:10 +0200 |
| commit | 738d08d5e306e67ba443763fd648a393a48c55d4 (patch) | |
| tree | a5e1b6acd666d3ea0bb2ff5bc0725e50f69076f0 /vm/vm_page.h | |
| parent | 48374912a30ae97b725ec99499b8f3ca683b6f8a (diff) | |
vm/vm_map: fix map entry merging
Diffstat (limited to 'vm/vm_page.h')
| -rw-r--r-- | vm/vm_page.h | 14 |
1 files changed, 12 insertions, 2 deletions
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 |