View | Details | Raw Unified | Return to bug 196622
Collapse All | Expand All

(-)b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h (-7 lines)
Lines 106-118 extern "C" { Link Here
106
#include <vm/vm_object.h>
106
#include <vm/vm_object.h>
107
#include <vm/vm_kern.h>
107
#include <vm/vm_kern.h>
108
#include <vm/vm_map.h>
108
#include <vm/vm_map.h>
109
/* There is clash. vm_map.h defines the two below and vdev_cache.c use them. */
110
#ifdef min_offset
111
#undef min_offset
112
#endif
113
#ifdef max_offset
114
#undef max_offset
115
#endif
116
#include <vm/vm_extern.h>
109
#include <vm/vm_extern.h>
117
#include <vm/vnode_pager.h>
110
#include <vm/vnode_pager.h>
118
111
(-)b/sys/vm/vm_map.h (-2 / +4 lines)
Lines 188-195 struct vm_map { Link Here
188
	vm_flags_t flags;		/* flags for this vm_map */
188
	vm_flags_t flags;		/* flags for this vm_map */
189
	vm_map_entry_t root;		/* Root of a binary search tree */
189
	vm_map_entry_t root;		/* Root of a binary search tree */
190
	pmap_t pmap;			/* (c) Physical map */
190
	pmap_t pmap;			/* (c) Physical map */
191
#define	min_offset	header.start	/* (c) */
191
#ifdef	_KERNEL
192
#define	max_offset	header.end	/* (c) */
192
    vm_offset_t min_offset;	/* (c) */
193
    vm_offset_t max_offset;	/* (c) */
194
#endif	/* _KERNEL */
193
	int busy;
195
	int busy;
194
};
196
};
195
197

Return to bug 196622