diff options
| author | John Levon <john.levon@joyent.com> | 2019-05-20 14:28:30 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-05-22 14:57:24 +0000 |
| commit | c3377ee9a5b3bff76dbf51347a8de3d215eb6cca (patch) | |
| tree | a25e6e2ef6a0822cb88190fd7c261be5a0692350 /usr/src/cmd/lp | |
| parent | 3f1d0a2eaba951f44d96bed559e6ed4487ec298c (diff) | |
| download | illumos-joyent-c3377ee9a5b3bff76dbf51347a8de3d215eb6cca.tar.gz | |
11048 need a way to disable SMT
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Patrick Mooney <patrick.mooney@joyent.com>
Reviewed by: Andy Fiddaman <omnios@citrus-it.co.uk>
Reviewed by: Gergo Doma <domag02@gmail.com>
Approved by: Gordon Ross <gwr@nexenta.com>
Diffstat (limited to 'usr/src/cmd/lp')
| -rw-r--r-- | usr/src/cmd/lp/cmd/lpadmin/do_printer.c | 3 | ||||
| -rw-r--r-- | usr/src/cmd/lp/cmd/lpsched/exec.c | 3 | ||||
| -rw-r--r-- | usr/src/cmd/lp/include/printers.h | 13 |
3 files changed, 11 insertions, 8 deletions
diff --git a/usr/src/cmd/lp/cmd/lpadmin/do_printer.c b/usr/src/cmd/lp/cmd/lpadmin/do_printer.c index c26c59e39a..6b2472f175 100644 --- a/usr/src/cmd/lp/cmd/lpadmin/do_printer.c +++ b/usr/src/cmd/lp/cmd/lpadmin/do_printer.c @@ -40,9 +40,6 @@ #include <bsm/devices.h> #include "lp.h" #include "class.h" -#if defined PS_FAULTED -#undef PS_FAULTED -#endif #include "printers.h" #include "msgs.h" diff --git a/usr/src/cmd/lp/cmd/lpsched/exec.c b/usr/src/cmd/lp/cmd/lpsched/exec.c index 4bd1da4a91..521a55eaa1 100644 --- a/usr/src/cmd/lp/cmd/lpsched/exec.c +++ b/usr/src/cmd/lp/cmd/lpsched/exec.c @@ -29,9 +29,6 @@ #include <pwd.h> #include <zone.h> -#if defined PS_FAULTED -#undef PS_FAULTED -#endif /* PS_FAULTED */ #include <dial.h> #include <stdlib.h> diff --git a/usr/src/cmd/lp/include/printers.h b/usr/src/cmd/lp/include/printers.h index baf8698645..ff66ead90c 100644 --- a/usr/src/cmd/lp/include/printers.h +++ b/usr/src/cmd/lp/include/printers.h @@ -25,14 +25,23 @@ /* * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. + * Copyright 2019 Joyent, Inc. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #if !defined(_LP_PRINTERS_H) #define _LP_PRINTERS_H /* + * The following conflicts are also defined in sys/processor.h. + */ +#if defined PS_FAULTED +#undef PS_FAULTED +#endif +#if defined PS_DISABLED +#undef PS_DISABLED +#endif + +/* * Define the following to support administrator configurable * streams modules: */ |