svn commit: r327697 - head/sys/sys

Pedro F. Giffuni pfg at FreeBSD.org
Mon Jan 8 15:41:49 UTC 2018


Author: pfg
Date: Mon Jan  8 15:41:48 2018
New Revision: 327697
URL: https://svnweb.freebsd.org/changeset/base/327697

Log:
  malloc(9): drop the __result_use_check attribute for the kernel allocator.
  
  The __result_use_check attribute was brought to the kernel malloc in
  r281203 for consistency with the userland malloc.
  
  For the case of the M_WAITOK flag, the kernel malloc(), realloc(), and
  reallocf() cannot return NULL so in that case the __result_use_check
  attribute makes no sense.
  
  We don't have any way of conditionalizing such attributes so just drop it.
  
  MFC after:	3 days

Modified:
  head/sys/sys/malloc.h

Modified: head/sys/sys/malloc.h
==============================================================================
--- head/sys/sys/malloc.h	Mon Jan  8 13:43:12 2018	(r327696)
+++ head/sys/sys/malloc.h	Mon Jan  8 15:41:48 2018	(r327697)
@@ -176,7 +176,7 @@ void	*contigmalloc(unsigned long size, struct malloc_t
 	    __alloc_size(1) __alloc_align(6);
 void	free(void *addr, struct malloc_type *type);
 void	*malloc(unsigned long size, struct malloc_type *type, int flags)
-	    __malloc_like __result_use_check __alloc_size(1);
+	    __malloc_like __alloc_size(1);
 void	*mallocarray(size_t nmemb, size_t size, struct malloc_type *type,
 	    int flags) __malloc_like __result_use_check
 	    __alloc_size(1) __alloc_size(2);
@@ -187,7 +187,7 @@ void	malloc_type_freed(struct malloc_type *type, unsig
 void	malloc_type_list(malloc_type_list_func_t *, void *);
 void	malloc_uninit(void *);
 void	*realloc(void *addr, unsigned long size, struct malloc_type *type,
-	    int flags) __result_use_check __alloc_size(2);
+	    int flags) __alloc_size(2);
 void	*reallocf(void *addr, unsigned long size, struct malloc_type *type,
 	    int flags) __alloc_size(2);
 


More information about the svn-src-head mailing list