diff options
| author | Richard Lowe <richlowe@richlowe.net> | 2011-08-28 03:26:41 +0100 |
|---|---|---|
| committer | Richard Lowe <richlowe@richlowe.net> | 2011-08-28 03:26:41 +0100 |
| commit | a998aee3ad23d3b696a5b746f105a316292befb8 (patch) | |
| tree | 4c0a05b33ddd5029c2dce5feee02042bc902c8aa /usr/src/uts/intel/sys/segments.h | |
| parent | 40c4bb03fc41bb96a590067dbc9edfc2ad829c33 (diff) | |
| parent | e1b84cb03d8fd1ef230a385429f6b768687ff944 (diff) | |
| download | illumos-joyent-a998aee3ad23d3b696a5b746f105a316292befb8.tar.gz | |
Merge branch 'master' of http://github.com/illumos/illumos-gate into gcc/upgrade
Conflicts:
usr/src/cmd/lp/cmd/lpadmin/options.c
usr/src/cmd/man/src/man.c
Diffstat (limited to 'usr/src/uts/intel/sys/segments.h')
| -rw-r--r-- | usr/src/uts/intel/sys/segments.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/usr/src/uts/intel/sys/segments.h b/usr/src/uts/intel/sys/segments.h index 6031bdd59f..165fe40e00 100644 --- a/usr/src/uts/intel/sys/segments.h +++ b/usr/src/uts/intel/sys/segments.h @@ -1,6 +1,9 @@ /* * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. */ +/* + * Copyright 2011 Joyent, Inc. All rights reserved. + */ #ifndef _SYS_SEGMENTS_H #define _SYS_SEGMENTS_H @@ -662,10 +665,10 @@ extern user_desc_t ucs32_on; extern user_desc_t ucs32_off; #endif /* __amd64 */ -extern struct tss *ktss0; +extern tss_t *ktss0; #if defined(__i386) -extern struct tss *dftss0; +extern tss_t *dftss0; #endif /* __i386 */ extern void div0trap(), dbgtrap(), nmiint(), brktrap(), ovflotrap(); |