--- src/sys/sys/tls.h	2005/03/28 03:33:08	1.5
+++ src/sys/sys/tls.h	2005/03/29 19:26:20	1.6
@@ -1,7 +1,32 @@
 /*
- * SYS/TLS.H
- *
- *	Implements the architecture independant TLS info structure.
+ * Copyright (c) 2005 The DragonFly Project.  All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name of The DragonFly Project nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific, prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
  *
  * $DragonFly$
  */
@@ -16,20 +41,6 @@ struct tls_info {
 	int size;
 };
 
-struct tls_tcb {
-	struct tls_tcb *tcb_base;	/* self pointer (data at -OFFSET) */
-	void *dtv_base;		/* RTLD tls_get_addr info base */
-	void *reserved[6];
-};
-
-#define RTLD_STATIC_TLS_ALIGN           16
-#define RTLD_STATIC_TLS_ALIGN_MASK      (RTLD_STATIC_TLS_ALIGN - 1)
-
-/*
- * flags for _rtld_allocate_tls() and allocate_tls()
- */
-#define RTLD_ALLOC_TLS_FREE_OLD		0x0001
-
 #ifndef _KERNEL
 int sys_set_tls_area(int which, struct tls_info *info, size_t infosize);
 int sys_get_tls_area(int which, struct tls_info *info, size_t infosize);