D25282.id73183.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D25282.id73183.diff
View Options

	Index: sys/vm/vm_map.c
	===================================================================
	--- sys/vm/vm_map.c
	+++ sys/vm/vm_map.c
	@@ -2377,21 +2377,14 @@
	* the specified address; if necessary,
	* it splits the entry into two.
	*/
	-#define vm_map_clip_start(map, entry, startaddr) \
	-{ \
	- if (startaddr > entry->start) \
	- _vm_map_clip_start(map, entry, startaddr); \
	-}
	-
	-/*
	- * This routine is called only when it is known that
	- * the entry must be split.
	- */
	static inline void
	-_vm_map_clip_start(vm_map_t map, vm_map_entry_t entry, vm_offset_t start)
	+vm_map_clip_start(vm_map_t map, vm_map_entry_t entry, vm_offset_t start)
	{
	vm_map_entry_t new_entry;

	+ if (startaddr <= entry->start)
	+ return;
	+
	VM_MAP_ASSERT_LOCKED(map);
	KASSERT(entry->end > start && entry->start < start,
	("_vm_map_clip_start: invalid clip of entry %p", entry));
	@@ -2435,21 +2428,14 @@
	* the specified address; if necessary,
	* it splits the entry into two.
	*/
	-#define vm_map_clip_end(map, entry, endaddr) \
	-{ \
	- if ((endaddr) < (entry->end)) \
	- _vm_map_clip_end((map), (entry), (endaddr)); \
	-}
	-
	-/*
	- * This routine is called only when it is known that
	- * the entry must be split.
	- */
	static inline void
	-_vm_map_clip_end(vm_map_t map, vm_map_entry_t entry, vm_offset_t end)
	+vm_map_clip_end(vm_map_t map, vm_map_entry_t entry, vm_offset_t end)
	{
	vm_map_entry_t new_entry;

	+ if (endaddr >= entry->end)
	+ return;
	+
	VM_MAP_ASSERT_LOCKED(map);
	KASSERT(entry->start < end && entry->end > end,
	("_vm_map_clip_end: invalid clip of entry %p", entry));