diff options
| author | John Levon <john.levon@joyent.com> | 2018-01-22 22:05:38 +0000 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2018-04-10 10:37:19 -0400 |
| commit | 74ecdb5171c9f3673b9393b1a3dc6f3a65e93895 (patch) | |
| tree | 3c16ae772368de5b6eec80945340deb2b38d91d0 /usr/src/uts/common/sys/sysmacros.h | |
| parent | 1d9a8ab82e5abe86cb1e43c502f88c7c655658fd (diff) | |
| download | illumos-joyent-74ecdb5171c9f3673b9393b1a3dc6f3a65e93895.tar.gz | |
8956 Implement KPTI
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Reviewed by: Robert Mustacchi <rm@joyent.com>
Approved by: Gordon Ross <gwr@nexenta.com>
Diffstat (limited to 'usr/src/uts/common/sys/sysmacros.h')
| -rw-r--r-- | usr/src/uts/common/sys/sysmacros.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/usr/src/uts/common/sys/sysmacros.h b/usr/src/uts/common/sys/sysmacros.h index 394a716a02..6f5882b54b 100644 --- a/usr/src/uts/common/sys/sysmacros.h +++ b/usr/src/uts/common/sys/sysmacros.h @@ -27,6 +27,8 @@ * Use is subject to license terms. * * Copyright 2013 Nexenta Systems, Inc. All rights reserved. + * + * Copyright 2018 Joyent Inc. */ #ifndef _SYS_SYSMACROS_H @@ -367,12 +369,9 @@ extern unsigned char bcd_to_byte[256]; #error One of _BIT_FIELDS_LTOH or _BIT_FIELDS_HTOL must be defined #endif /* _BIT_FIELDS_LTOH */ -/* avoid any possibility of clashing with <stddef.h> version */ -#if (defined(_KERNEL) || defined(_FAKE_KERNEL)) && !defined(_KMEMUSER) - +#if !defined(ARRAY_SIZE) #define ARRAY_SIZE(x) (sizeof (x) / sizeof (x[0])) - -#endif /* _KERNEL, !_KMEMUSER */ +#endif #ifdef __cplusplus } |