Changeset 97872 in vbox for trunk

Timestamp:

Dec 27, 2022 6:26:41 PM (2 years ago)

Author:

vboxsync

Message:

IPRT/alloc-r0drv-linux.c: nits

File:

• trunk/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c (modified) (2 diffs)

trunk/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c

@@ -274 +274 @@
         fFlags |= RTMEMHDR_FLAG_EXEC_VM_AREA;
 
-# else  /* !RTMEMALLOC_EXEC_HEAP */
-# error "you don not want to go here..."
+# else  /* !RTMEMALLOC_EXEC_HEAP && !RTMEMALLOC_EXEC_VM_AREA */
+#  error "you do not want to go here..."
         pHdr = (PRTMEMHDR)__vmalloc(cb + sizeof(*pHdr), GFP_KERNEL | __GFP_HIGHMEM | __GFP_NOWARN, MY_PAGE_KERNEL_EXEC);
-# endif /* !RTMEMALLOC_EXEC_HEAP */
+# endif /* !RTMEMALLOC_EXEC_HEAP && !RTMEMALLOC_EXEC_VM_AREA */
 
 #elif defined(PAGE_KERNEL_EXEC) && defined(CONFIG_X86_PAE)
@@ -303 +303 @@
             fFlags |= RTMEMHDR_FLAG_KMALLOC;
             pHdr = kmalloc(cb + sizeof(*pHdr),
-                           (fFlags & RTMEMHDR_FLAG_ANY_CTX_ALLOC) ? (GFP_ATOMIC | __GFP_NOWARN)
-                                                                  : (GFP_KERNEL | __GFP_NOWARN));
+                           fFlags & RTMEMHDR_FLAG_ANY_CTX_ALLOC ? GFP_ATOMIC | __GFP_NOWARN : GFP_KERNEL | __GFP_NOWARN);
             if (RT_UNLIKELY(   !pHdr
                             && cb > PAGE_SIZE