Skip to content
Permalink
Browse files

More cleanup.

  • Loading branch information...
b-man committed Jul 17, 2015
1 parent 5ce8c76 commit 4f9498aa1671fdbe0e3285a1daab0231325066b0
Showing with 1 addition and 10 deletions.
  1. +0 −1 bsd/kern/pthread_synch.c
  2. +0 −4 osfmk/console/arm/serial_console.c
  3. +1 −5 security/mac_label.c
@@ -446,7 +446,6 @@ bsdthread_terminate(__unused struct proc *p, struct bsdthread_terminate_args *u
return(EINVAL);
}
}
kprintf("bsdthread_terminate(): terminating thread %p\n", current_thread());
(void) thread_terminate(current_thread());
if (sem != MACH_PORT_NULL) {
kret = semaphore_signal_internal_trap(sem);
@@ -251,13 +251,9 @@ console_ring_try_empty(void)
void
cnputc(char c)
{
// disable_preemption();
// hw_lock_lock(&cnputc_lock);
console_buf_t *cbp;
/* Put directly if console ring is not initialized */
_cnputc(c);
// hw_lock_unlock(&cnputc_lock);
// enable_preemption();
return;
}

@@ -56,7 +56,7 @@ mac_labelzone_alloc(int flags)
{
struct label *l;

if (flags & MAC_NOWAIT)
if (flags & MAC_NOWAIT)
l = (struct label *) zalloc_noblock(zone_label);
else
l = (struct label *) zalloc(zone_label);
@@ -66,8 +66,6 @@ mac_labelzone_alloc(int flags)
bzero(l, sizeof(struct label));
l->l_flags = MAC_FLAG_INITIALIZED;

// kprintf("mac_labelzone_alloc(): allocated mac label %p for thread %p\n", l, current_thread());

return (l);
}

@@ -86,8 +84,6 @@ mac_labelzone_free(struct label *l)
panic("Free of uninitialized label\n");
bzero(l, sizeof(struct label));
zfree(zone_label, l);

// kprintf("mac_labelzone_free(): released mac label for thread %p\n", current_thread());
}

/*

0 comments on commit 4f9498a

Please sign in to comment.
You can’t perform that action at this time.