xnu-4570.31.3.tar.gz

[apple/xnu.git] / osfmk / i386 / tss.h

diff --git a/osfmk/i386/tss.h b/osfmk/i386/tss.h
index 85dc5333b5c1bae10d21b1d2a89aa7836e4fdd61..eab037c242db91d9c13915a794797bf0db328759 100644 (file)
--- a/osfmk/i386/tss.h
+++ b/osfmk/i386/tss.h
@@ -1,23 +1,29 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @OSF_COPYRIGHT@
@@ -99,11 +105,13 @@ struct i386_tss {
  * Although this is defined as a 64-bit stack, the space is also used in
  * 32-bit legacy mode. For 64-bit the stack is 16-byte aligned.
  */
+
 struct sysenter_stack {
-       uint64_t        stack[16];      /* Space for a 64-bit frame and some */
+       uint64_t        sysestack[64];  /* Space for a 64-bit frame and some */
        uint64_t        top;            /* Top and pointer to ISS in PCS */
 };
 
+#pragma pack(4)
 struct x86_64_tss {
        uint32_t        reserved1;
        uint64_t        rsp0;           /* stack pointer for CPL0 */
@@ -124,4 +132,5 @@ struct x86_64_tss {
        uint16_t        io_bit_map_offset;
                                        /* offset to IO permission bit map */
 };
+#pragma pack()
 #endif /* _I386_TSS_H_ */