From 00e36dabb4cdef51095aece46e451f2fab4c13c1 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Wed, 12 Feb 2025 02:09:44 +0100 Subject: Use MACRO_BEGIN/END This notably fixes at least a SAVE_HINT call. --- vm/vm_fault.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'vm/vm_fault.c') diff --git a/vm/vm_fault.c b/vm/vm_fault.c index b53592f0..c16f5e34 100644 --- a/vm/vm_fault.c +++ b/vm/vm_fault.c @@ -1637,33 +1637,37 @@ kern_return_t vm_fault_wire_fast( */ #undef RELEASE_PAGE -#define RELEASE_PAGE(m) { \ +#define RELEASE_PAGE(m) \ +MACRO_BEGIN \ PAGE_WAKEUP_DONE(m); \ vm_page_lock_queues(); \ vm_page_unwire(m); \ vm_page_unlock_queues(); \ -} +MACRO_END #undef UNLOCK_THINGS -#define UNLOCK_THINGS { \ +#define UNLOCK_THINGS \ +MACRO_BEGIN \ object->paging_in_progress--; \ vm_object_unlock(object); \ -} +MACRO_END #undef UNLOCK_AND_DEALLOCATE -#define UNLOCK_AND_DEALLOCATE { \ +#define UNLOCK_AND_DEALLOCATE \ +MACRO_BEGIN \ UNLOCK_THINGS; \ vm_object_deallocate(object); \ -} +MACRO_END /* * Give up and have caller do things the hard way. */ -#define GIVE_UP { \ +#define GIVE_UP \ +MACRO_BEGIN \ UNLOCK_AND_DEALLOCATE; \ return(KERN_FAILURE); \ -} +MACRO_END /* -- cgit v1.2.3