svn commit: r284602 - head/sys/kern

[Sean Bruno]

Author: sbruno
Date: Fri Jun 19 18:57:36 2015
New Revision: 284602
URL: https://svnweb.freebsd.org/changeset/base/284602

Log:
  Feedback from commit r284535
  
  davide:  imgact_binmisc_clear_entry() needs to use atomic ops to remove
  the enable bit.
  
  kib:  M_NOWAIT is not warranted and comment is invalid.

Modified:
  head/sys/kern/imgact_binmisc.c

Modified: head/sys/kern/imgact_binmisc.c
==============================================================================
--- head/sys/kern/imgact_binmisc.c	Fri Jun 19 17:34:59 2015	(r284601)
+++ head/sys/kern/imgact_binmisc.c	Fri Jun 19 18:57:36 2015	(r284602)
@@ -317,7 +317,7 @@ imgact_binmisc_disable_entry(char *name)
 		return (ENOENT);
 	}
 
-	ibe->ibe_flags &= ~IBF_ENABLED;
+	atomic_clear_32(&ibe->ibe_flags, IBF_ENABLED);
 	sx_sunlock(&interp_list_sx);
 
 	return (0);
@@ -406,8 +406,7 @@ imgact_binmisc_get_all_entries(struct sy
 
 	sx_slock(&interp_list_sx);
 	count = interp_list_entry_count;
-	/* Don't block in malloc() while holding lock. */
-	xbe = malloc(sizeof(*xbe) * count, M_BINMISC, M_NOWAIT|M_ZERO);
+	xbe = malloc(sizeof(*xbe) * count, M_BINMISC, M_ZERO);
 	if (!xbe) {
 		sx_sunlock(&interp_list_sx);
 		return (ENOMEM);