diff options
| author | John Sonnenschein <johns@joyent.com> | 2011-10-03 21:04:40 +0000 |
|---|---|---|
| committer | John Sonnenschein <johns@joyent.com> | 2011-10-03 21:04:40 +0000 |
| commit | 4171a80dc48c62297457d0820f26cac6516e068a (patch) | |
| tree | 5e20c8b91e74482baeed81d9cda1af2f63207b82 /usr/src/uts/intel/sys/segments.h | |
| parent | cb866ae1d95a57b3ac6bf38040e40ed0cd4fe835 (diff) | |
| parent | ed22c7109fc5dd9e1b7a5d0333bdc7ad2718e2ab (diff) | |
| download | illumos-joyent-4171a80dc48c62297457d0820f26cac6516e068a.tar.gz | |
[OS-663] Post-6.5 Illumos sync
Merge https://github.com/illumos/illumos-gate
Conflicts:
exception_lists/packaging
usr/src/cmd/dtrace/test/cmd/scripts/dtest.pl
usr/src/cmd/dtrace/test/tst/common/usdt/tst.badguess.ksh
usr/src/cmd/dtrace/test/tst/common/usdt/tst.enabled2.ksh
usr/src/cmd/dtrace/test/tst/common/usdt/tst.guess32.ksh
usr/src/cmd/dtrace/test/tst/common/usdt/tst.guess64.ksh
usr/src/cmd/dtrace/test/tst/common/usdt/tst.include.ksh
usr/src/cmd/dtrace/test/tst/common/usdt/tst.nodtrace.ksh
usr/src/cmd/dtrace/test/tst/common/usdt/tst.noreap.ksh
usr/src/cmd/dtrace/test/tst/common/usdt/tst.noreapring.ksh
usr/src/cmd/dtrace/test/tst/common/usdt/tst.reap.ksh
usr/src/cmd/lp/Makefile
usr/src/cmd/lp/cmd/lpadmin/options.c
usr/src/cmd/lp/cmd/lpfilter.c
usr/src/cmd/lp/cmd/lpforms.c
usr/src/cmd/lp/cmd/lpusers.c
usr/src/cmd/lp/lib/lp/isterminfo.c
usr/src/cmd/lp/lib/lp/tidbit.c
usr/src/cmd/terminfo/att.ti
usr/src/cmd/zpool/zpool_main.c
usr/src/common/dis/i386/dis_tables.c
usr/src/lib/libdtrace/common/dt_options.c
usr/src/lib/libzfs/common/libzfs_dataset.c
usr/src/man/man1m/dladm.1m
usr/src/man/man1m/flowadm.1m
usr/src/man/man1m/zoneadm.1m
usr/src/man/man1m/zonecfg.1m
usr/src/pkg/manifests/print-lp-print-client-commands.mf
usr/src/pkg/manifests/print-lp.mf
usr/src/uts/common/fs/zfs/sys/zio.h
usr/src/uts/common/fs/zfs/zio.c
usr/src/uts/i86pc/ml/mach_offsets.in
usr/src/uts/intel/amd64/ml/mach_offsets.in
usr/src/uts/intel/sys/tss.h
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 408cc29867..e0bc76a023 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(); |