From bf822712f74891e47587cbe95539b064e206836b Mon Sep 17 00:00:00 2001 From: Marcel Moolenaar Date: Sun, 1 Jun 2003 05:57:58 +0000 Subject: [PATCH] Remove the ia64 hackery in threadinit() that was needed to work around the lameness of the kstack code. The EPC overhaul de-lame-ified the kstack code by removing the need for contigmalloc(). We can now allocate stacks using malloc(). We probably want to make the stacks swappable as well so that we can make it MI. But that's another story. --- sys/kern/kern_kse.c | 14 -------------- sys/kern/kern_thread.c | 14 -------------- 2 files changed, 28 deletions(-) diff --git a/sys/kern/kern_kse.c b/sys/kern/kern_kse.c index 6d61cd6c9874..34ebffbc33af 100644 --- a/sys/kern/kern_kse.c +++ b/sys/kern/kern_kse.c @@ -762,23 +762,9 @@ void threadinit(void) { -#ifndef __ia64__ thread_zone = uma_zcreate("THREAD", sched_sizeof_thread(), thread_ctor, thread_dtor, thread_init, thread_fini, UMA_ALIGN_CACHE, 0); -#else - /* - * XXX the ia64 kstack allocator is really lame and is at the mercy - * of contigmallloc(). This hackery is to pre-construct a whole - * pile of thread structures with associated kernel stacks early - * in the system startup while contigmalloc() still works. Once we - * have them, keep them. Sigh. - */ - thread_zone = uma_zcreate("THREAD", sched_sizeof_thread(), - thread_ctor, thread_dtor, thread_init, thread_fini, - UMA_ALIGN_CACHE, UMA_ZONE_NOFREE); - uma_prealloc(thread_zone, 512); /* XXX arbitary */ -#endif ksegrp_zone = uma_zcreate("KSEGRP", sched_sizeof_ksegrp(), NULL, NULL, ksegrp_init, NULL, UMA_ALIGN_CACHE, 0); diff --git a/sys/kern/kern_thread.c b/sys/kern/kern_thread.c index 6d61cd6c9874..34ebffbc33af 100644 --- a/sys/kern/kern_thread.c +++ b/sys/kern/kern_thread.c @@ -762,23 +762,9 @@ void threadinit(void) { -#ifndef __ia64__ thread_zone = uma_zcreate("THREAD", sched_sizeof_thread(), thread_ctor, thread_dtor, thread_init, thread_fini, UMA_ALIGN_CACHE, 0); -#else - /* - * XXX the ia64 kstack allocator is really lame and is at the mercy - * of contigmallloc(). This hackery is to pre-construct a whole - * pile of thread structures with associated kernel stacks early - * in the system startup while contigmalloc() still works. Once we - * have them, keep them. Sigh. - */ - thread_zone = uma_zcreate("THREAD", sched_sizeof_thread(), - thread_ctor, thread_dtor, thread_init, thread_fini, - UMA_ALIGN_CACHE, UMA_ZONE_NOFREE); - uma_prealloc(thread_zone, 512); /* XXX arbitary */ -#endif ksegrp_zone = uma_zcreate("KSEGRP", sched_sizeof_ksegrp(), NULL, NULL, ksegrp_init, NULL, UMA_ALIGN_CACHE, 0);