Attachment 151505 Details for Bug 196622 – Patch to correct min_offset and max_offset

[patch] Patch to correct min_offset and max_offset

vm_map_fix.diff (text/plain), 1.15 KB, created by tjj5036 on 2015-01-12 21:37:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tjj5036

Created: 2015-01-12 21:37:14 UTC

Size: 1.15 KB

patch

obsolete

>diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h
>index 5102040..6dff3bf 100644
>--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h
>+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h
>@@ -106,13 +106,6 @@ extern "C" {
> #include <vm/vm_object.h>
> #include <vm/vm_kern.h>
> #include <vm/vm_map.h>
>-/* There is clash. vm_map.h defines the two below and vdev_cache.c use them. */
>-#ifdef min_offset
>-#undef min_offset
>-#endif
>-#ifdef max_offset
>-#undef max_offset
>-#endif
> #include <vm/vm_extern.h>
> #include <vm/vnode_pager.h>
> 
>diff --git a/sys/vm/vm_map.h b/sys/vm/vm_map.h
>index 3bf7a67..5705934 100644
>--- a/sys/vm/vm_map.h
>+++ b/sys/vm/vm_map.h
>@@ -188,8 +188,10 @@ struct vm_map {
> 	vm_flags_t flags;		/* flags for this vm_map */
> 	vm_map_entry_t root;		/* Root of a binary search tree */
> 	pmap_t pmap;			/* (c) Physical map */
>-#define	min_offset	header.start	/* (c) */
>-#define	max_offset	header.end	/* (c) */
>+#ifdef	_KERNEL
>+    vm_offset_t min_offset;	/* (c) */
>+    vm_offset_t max_offset;	/* (c) */
>+#endif	/* _KERNEL */
> 	int busy;
> };
>

Actions: View | Diff

Attachments on bug 196622: 151505