Mercurial > unleashed > wips

changeset 20305:67142683c001

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
make 64-bit integers use "long long" on both 64/32 bit, clean up related headers - remove related _LP64 checks from include/sys/int_* - use 'j' format specifiers for intmax_t - sys/int_limits.h: simplify & replace decimal magic numbers with hex - remove extern "C" from these headers; they have no function decls - sys/types.h: use standard integer types instead of u_longlong_t etc. - greg_t: typedef to intptr_t these cause a number of invalid format specifiers throughout the tree since we are essentially changing the expected specifier for 64-bit numbers from "l" to "ll". the payoff is that it will be "ll" regardless of bit width.
author Lauri Tirkkonen <lotheac@iki.fi>
date Mon, 07 Jan 2019 14:14:18 +0200
parents b02af5be5670
children a691db01ff05
files arch/x86/include/sys/mcontext.h arch/x86/kernel/include/vm/hat_pte.h arch/x86/kernel/krtld/64/kobj_reloc.c arch/x86/kernel/os/trap.c arch/x86/kernel/vm/i86_mmu.c include/sys/int_const.h include/sys/int_fmtio.h include/sys/int_limits.h include/sys/int_types.h include/sys/inttypes.h include/sys/param.h include/sys/types.h kernel/drivers/net/nxge/nxge_rxdma.c kernel/drivers/net/nxge/nxge_txc.c kernel/drivers/net/nxge/nxge_txdma.c kernel/drivers/net/nxge/nxge_zcp.c kernel/drivers/scsi/mr_sas/mr_sas.c kernel/fs/ufs/ufs_alloc.c kernel/fs/ufs/ufs_dir.c usr/src/cmd/mdb/intel/mdb/mdb_kreg.h usr/src/uts/common/io/ntxn/unm_gem.c usr/src/uts/common/io/sata/impl/sata.c usr/src/uts/intel/io/acpica/acpi_enum.c usr/src/uts/intel/io/agpmaster/agpmaster.c
diffstat 24 files changed, 304 insertions(+), 617 deletions(-) [+]
line wrap: on
line diff
--- a/arch/x86/include/sys/mcontext.h	Tue Jan 15 20:06:33 2019 -0500
+++ b/arch/x86/include/sys/mcontext.h	Mon Jan 07 14:14:18 2019 +0200
@@ -59,11 +59,7 @@
 
 #if !defined(_ASM)
 
-#if defined(_LP64) || defined(_I32LPx)
-typedef long	greg_t;
-#else
-typedef int	greg_t;
-#endif
+typedef intptr_t greg_t;
 
 #if defined(_SYSCALL32)
 
--- a/arch/x86/kernel/include/vm/hat_pte.h	Tue Jan 15 20:06:33 2019 -0500
+++ b/arch/x86/kernel/include/vm/hat_pte.h	Mon Jan 07 14:14:18 2019 +0200
@@ -245,11 +245,11 @@
  * In the 64 bit kernel PTE loads are atomic, but need atomic_cas_64 on 32
  * bit kernel.
  */
+#define	FMT_PTE "0x%llx"
 #if defined(__amd64)
 
 #define	IN_VA_HOLE(va)	(mmu.hole_start <= (va) && (va) < mmu.hole_end)
 
-#define	FMT_PTE "0x%lx"
 #define	GET_PTE(ptr)		(*(x86pte_t *)(ptr))
 #define	SET_PTE(ptr, pte)	(*(x86pte_t *)(ptr) = pte)
 #define	CAS_PTE(ptr, x, y)	atomic_cas_64(ptr, x, y)
@@ -258,8 +258,6 @@
 
 #define	IN_VA_HOLE(va)	(__lintzero)
 
-#define	FMT_PTE "0x%llx"
-
 /* on 32 bit kernels, 64 bit loads aren't atomic, use get_pte64() */
 extern x86pte_t get_pte64(x86pte_t *ptr);
 #define	GET_PTE(ptr)	(mmu.pae_hat ? get_pte64(ptr) : *(x86pte32_t *)(ptr))
--- a/arch/x86/kernel/krtld/64/kobj_reloc.c	Tue Jan 15 20:06:33 2019 -0500
+++ b/arch/x86/kernel/krtld/64/kobj_reloc.c	Mon Jan 07 14:14:18 2019 +0200
@@ -262,7 +262,8 @@
 		}
 #endif
 
-		if (do_reloc_krtld(rtype, (unsigned char *)off, &value,
+		if (do_reloc_krtld(rtype, (unsigned char *)off,
+		    (Xword *)&value,
 		    (const char *)mp->strings + symref->st_name,
 		    mp->filename) == 0)
 			err = 1;
--- a/arch/x86/kernel/os/trap.c	Tue Jan 15 20:06:33 2019 -0500
+++ b/arch/x86/kernel/os/trap.c	Mon Jan 07 14:14:18 2019 +0200
@@ -1692,8 +1692,8 @@
 	printf(fmt, "r10", rp->r_r10, "r11", rp->r_r11, "r12", rp->r_r12);
 	printf(fmt, "r13", rp->r_r13, "r14", rp->r_r14, "r15", rp->r_r15);
 
-	printf(fmt, "fsb", rdmsr(MSR_AMD_FSBASE), "gsb", rdmsr(MSR_AMD_GSBASE),
-	    " ds", rp->r_ds);
+	printf(fmt, "fsb", (uintptr_t)rdmsr(MSR_AMD_FSBASE), "gsb",
+	    (uintptr_t)rdmsr(MSR_AMD_GSBASE), " ds", rp->r_ds);
 	printf(fmt, " es", rp->r_es, " fs", rp->r_fs, " gs", rp->r_gs);
 
 	printf(fmt, "trp", rp->r_trapno, "err", rp->r_err, "rip", rp->r_rip);
--- a/arch/x86/kernel/vm/i86_mmu.c	Tue Jan 15 20:06:33 2019 -0500
+++ b/arch/x86/kernel/vm/i86_mmu.c	Mon Jan 07 14:14:18 2019 +0200
@@ -381,7 +381,7 @@
 		break;
 
 	default:
-		panic("unsupported invpcid(%lu)", type);
+		panic("unsupported invpcid(%llu)", type);
 		break;
 	}
 }
--- a/include/sys/int_const.h	Tue Jan 15 20:06:33 2019 -0500
+++ b/include/sys/int_const.h	Mon Jan 07 14:14:18 2019 +0200
@@ -51,12 +51,6 @@
  * squarely behind the fixed sized types.
  */
 
-#include <sys/feature_tests.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /*
  * Constants
  *
@@ -66,54 +60,20 @@
  *	signedness. The suffix used for int64_t and uint64_t (ll and ull)
  *	are for examples only. Implementations are permitted to use other
  *	suffixes.
- *
- * The "CSTYLED" comments are flags to an internal code style analysis tool
- * telling it to silently accept the line which follows.  This internal
- * standard requires a space between arguments, but the historical,
- * non-ANSI-C ``method'' of concatenation can't tolerate those spaces.
  */
-/* CSTYLED */
 #define	__CONCAT__(A,B) A ## B
 
 #define	INT8_C(c)	(c)
 #define	INT16_C(c)	(c)
 #define	INT32_C(c)	(c)
-#ifdef  _LP64
-/* CSTYLED */
-#define	INT64_C(c)	__CONCAT__(c,l)
-#else   /* _ILP32 */
-/* CSTYLED */
-#define	INT64_C(c)	__CONCAT__(c,ll)
-#endif
+#define	INT64_C(c)	__CONCAT__(c,LL)
 
-/* CSTYLED */
-#define	UINT8_C(c)	__CONCAT__(c,u)
-/* CSTYLED */
-#define	UINT16_C(c)	__CONCAT__(c,u)
-/* CSTYLED */
-#define	UINT32_C(c)	__CONCAT__(c,u)
-#ifdef  _LP64
-/* CSTYLED */
-#define	UINT64_C(c)	__CONCAT__(c,ul)
-#else   /* _ILP32 */
-/* CSTYLED */
-#define	UINT64_C(c)	__CONCAT__(c,ull)
-#endif
+#define	UINT8_C(c)	(c)
+#define	UINT16_C(c)	(c)
+#define	UINT32_C(c)	__CONCAT__(c,U)
+#define	UINT64_C(c)	__CONCAT__(c,ULL)
 
-#ifdef  _LP64
-/* CSTYLED */
-#define	INTMAX_C(c)	__CONCAT__(c,l)
-/* CSTYLED */
-#define	UINTMAX_C(c)	__CONCAT__(c,ul)
-#else   /* _ILP32 */
-/* CSTYLED */
-#define	INTMAX_C(c)	__CONCAT__(c,ll)
-/* CSTYLED */
-#define	UINTMAX_C(c)	__CONCAT__(c,ull)
-#endif
-
-#ifdef __cplusplus
-}
-#endif
+#define	INTMAX_C(c)	__CONCAT__(c,LL)
+#define	UINTMAX_C(c)	__CONCAT__(c,ULL)
 
 #endif /* _SYS_INT_CONST_H */
--- a/include/sys/int_fmtio.h	Tue Jan 15 20:06:33 2019 -0500
+++ b/include/sys/int_fmtio.h	Mon Jan 07 14:14:18 2019 +0200
@@ -20,6 +20,7 @@
  * CDDL HEADER END
  */
 /*
+ * Copyright 2019 Lauri Tirkkonen <lotheac@iki.fi>
  * Copyright 2014 Garrett D'Amore <garrett@damore.org>
  *
  * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
@@ -27,7 +28,7 @@
  */
 
 #ifndef _SYS_INT_FMTIO_H
-#define	_SYS_INT_FMTIO_H
+#define _SYS_INT_FMTIO_H
 
 /*
  * This file, <sys/int_fmtio.h>, is part of the Sun Microsystems implementation
@@ -50,10 +51,6 @@
 
 #include <sys/feature_tests.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /*
  * Formatted I/O
  *
@@ -80,288 +77,216 @@
  * fprintf macros for signed integers
  */
 #if defined(_KERNEL)
-#define	_MODF8	""
-#define	_MODF16	""
+#define _MODF8	""
+#define _MODF16	""
 #else
-#define	_MODF8	"hh"
-#define	_MODF16	"h"
+#define _MODF8	"hh"
+#define _MODF16	"h"
 #endif
 
-#define	_PRId	"d"
-#define	_PRIi	"i"
-#define	_PRIo	"o"
-#define	_PRIu	"u"
-#define	_PRIx	"x"
-#define	_PRIX	"X"
+#define _PRId	"d"
+#define _PRIi	"i"
+#define _PRIo	"o"
+#define _PRIu	"u"
+#define _PRIx	"x"
+#define _PRIX	"X"
 
-#define	PRId8			_MODF8 _PRId
-#define	PRIdLEAST8		PRId8
-#define	PRIdFAST8		PRId8
-#define	PRId16			_MODF16 _PRId
-#define	PRIdLEAST16		PRId16
-#define	PRId32			"d"
-#define	PRIdFAST16		PRId32
-#define	PRIdLEAST32		PRId32
-#define	PRIdFAST32		PRId32
-#ifdef  _LP64
-#define	PRId64			"ld"
-#else   /* _ILP32 */
-#define	PRId64			"lld"
-#endif
-#ifdef PRId64
-#define	PRIdLEAST64		PRId64
-#define	PRIdFAST64		PRId64
-#endif
+#define PRId8			_MODF8 _PRId
+#define PRIdLEAST8		PRId8
+#define PRIdFAST8		PRId8
+#define PRId16			_MODF16 _PRId
+#define PRIdLEAST16		PRId16
+#define PRId32			"d"
+#define PRIdFAST16		PRId32
+#define PRIdLEAST32		PRId32
+#define PRIdFAST32		PRId32
+#define PRId64			"lld"
+#define PRIdLEAST64		PRId64
+#define PRIdFAST64		PRId64
 
-#define	PRIi8			_MODF8 _PRIi
-#define	PRIiLEAST8		PRIi8
-#define	PRIiFAST8		PRIi8
-#define	PRIi16			_MODF16 _PRIi
-#define	PRIiLEAST16		PRIi16
-#define	PRIi32			"i"
-#define	PRIiFAST16		PRIi32
-#define	PRIiLEAST32		PRIi32
-#define	PRIiFAST32		PRIi32
-#ifdef  _LP64
-#define	PRIi64			"li"
-#else   /* _ILP32 */
-#define	PRIi64			"lli"
-#endif
-#ifdef PRIi64
-#define	PRIiLEAST64		PRIi64
-#define	PRIiFAST64		PRIi64
-#endif
+#define PRIi8			_MODF8 _PRIi
+#define PRIiLEAST8		PRIi8
+#define PRIiFAST8		PRIi8
+#define PRIi16			_MODF16 _PRIi
+#define PRIiLEAST16		PRIi16
+#define PRIi32			"i"
+#define PRIiFAST16		PRIi32
+#define PRIiLEAST32		PRIi32
+#define PRIiFAST32		PRIi32
+#define PRIi64			"lli"
+#define PRIiLEAST64		PRIi64
+#define PRIiFAST64		PRIi64
 
 /*
  * fprintf macros for unsigned integers
  */
 
-#define	PRIo8			_MODF8 _PRIo
-#define	PRIoLEAST8		PRIo8
-#define	PRIoFAST8		PRIo8
-#define	PRIo16			_MODF16 _PRIo
-#define	PRIoLEAST16		PRIo16
-#define	PRIo32			"o"
-#define	PRIoFAST16		PRIo32
-#define	PRIoLEAST32		PRIo32
-#define	PRIoFAST32		PRIo32
-#ifdef  _LP64
-#define	PRIo64			"lo"
-#else	/* _ILP32 */
-#define	PRIo64			"llo"
-#endif
-#ifdef PRIo64
-#define	PRIoLEAST64		PRIo64
-#define	PRIoFAST64		PRIo64
-#endif
+#define PRIo8			_MODF8 _PRIo
+#define PRIoLEAST8		PRIo8
+#define PRIoFAST8		PRIo8
+#define PRIo16			_MODF16 _PRIo
+#define PRIoLEAST16		PRIo16
+#define PRIo32			"o"
+#define PRIoFAST16		PRIo32
+#define PRIoLEAST32		PRIo32
+#define PRIoFAST32		PRIo32
+#define PRIo64			"llo"
+#define PRIoLEAST64		PRIo64
+#define PRIoFAST64		PRIo64
 
-#define	PRIu8			_MODF8 _PRIu
-#define	PRIuLEAST8		PRIu8
-#define	PRIuFAST8		PRIu8
-#define	PRIu16			_MODF16 _PRIu
-#define	PRIuLEAST16		PRIu16
-#define	PRIu32			"u"
-#define	PRIuFAST16		PRIu32
-#define	PRIuLEAST32		PRIu32
-#define	PRIuFAST32		PRIu32
-#ifdef  _LP64
-#define	PRIu64			"lu"
-#else   /* _ILP32 */
-#define	PRIu64			"llu"
-#endif
-#ifdef PRIu64
-#define	PRIuLEAST64		PRIu64
-#define	PRIuFAST64		PRIu64
-#endif
+#define PRIu8			_MODF8 _PRIu
+#define PRIuLEAST8		PRIu8
+#define PRIuFAST8		PRIu8
+#define PRIu16			_MODF16 _PRIu
+#define PRIuLEAST16		PRIu16
+#define PRIu32			"u"
+#define PRIuFAST16		PRIu32
+#define PRIuLEAST32		PRIu32
+#define PRIuFAST32		PRIu32
+#define PRIu64			"llu"
+#define PRIuLEAST64		PRIu64
+#define PRIuFAST64		PRIu64
 
-#define	PRIx8			_MODF8 _PRIx
-#define	PRIxLEAST8		PRIx8
-#define	PRIxFAST8		PRIx8
-#define	PRIx16			_MODF16 _PRIx
-#define	PRIxLEAST16		PRIx16
-#define	PRIx32			"x"
-#define	PRIxFAST16		PRIx32
-#define	PRIxLEAST32		PRIx32
-#define	PRIxFAST32		PRIx32
-#ifdef  _LP64
-#define	PRIx64			"lx"
-#else   /* _ILP32 */
-#define	PRIx64			"llx"
-#endif
-#ifdef PRIx64
-#define	PRIxLEAST64		PRIx64
-#define	PRIxFAST64		PRIx64
-#endif
+#define PRIx8			_MODF8 _PRIx
+#define PRIxLEAST8		PRIx8
+#define PRIxFAST8		PRIx8
+#define PRIx16			_MODF16 _PRIx
+#define PRIxLEAST16		PRIx16
+#define PRIx32			"x"
+#define PRIxFAST16		PRIx32
+#define PRIxLEAST32		PRIx32
+#define PRIxFAST32		PRIx32
+#define PRIx64			"llx"
+#define PRIxLEAST64		PRIx64
+#define PRIxFAST64		PRIx64
 
-#define	PRIX8			_MODF8 _PRIX
-#define	PRIXLEAST8		PRIX8
-#define	PRIXFAST8		PRIX8
-#define	PRIX16			_MODF16 _PRIX
-#define	PRIXLEAST16		PRIX16
-#define	PRIX32			"X"
-#define	PRIXFAST16		PRIX32
-#define	PRIXLEAST32		PRIX32
-#define	PRIXFAST32		PRIX32
-#ifdef  _LP64
-#define	PRIX64			"lX"
-#else   /* _ILP32 */
-#define	PRIX64			"llX"
-#endif
-#ifdef PRIX64
-#define	PRIXLEAST64		PRIX64
-#define	PRIXFAST64		PRIX64
-#endif
+#define PRIX8			_MODF8 _PRIX
+#define PRIXLEAST8		PRIX8
+#define PRIXFAST8		PRIX8
+#define PRIX16			_MODF16 _PRIX
+#define PRIXLEAST16		PRIX16
+#define PRIX32			"X"
+#define PRIXFAST16		PRIX32
+#define PRIXLEAST32		PRIX32
+#define PRIXFAST32		PRIX32
+#define PRIX64			"llX"
+#define PRIXLEAST64		PRIX64
+#define PRIXFAST64		PRIX64
 
 /*
  * fprintf macros for pointers
  */
 
-#if defined(_LP64) || defined(_I32LPx)
-#define	PRIdPTR			"ld"
-#define	PRIiPTR			"li"
-#define	PRIoPTR			"lo"
-#define	PRIuPTR			"lu"
-#define	PRIxPTR			"lx"
-#define	PRIXPTR			"lX"
-#else
-#define	PRIdPTR			"d"
-#define	PRIiPTR			"i"
-#define	PRIoPTR			"o"
-#define	PRIuPTR			"u"
-#define	PRIxPTR			"x"
-#define	PRIXPTR			"X"
-#endif /* defined(_LP64) || defined(_I32LPx) */
+#define PRIdPTR			"ld"
+#define PRIiPTR			"li"
+#define PRIoPTR			"lo"
+#define PRIuPTR			"lu"
+#define PRIxPTR			"lx"
+#define PRIXPTR			"lX"
 
 /*
  * fscanf macros for signed integers
  */
-#define	SCNd8			"hhd"
-#define	SCNdLEAST8		SCNd8
-#define	SCNdFAST8		SCNd8
-#define	SCNd16			"hd"
-#define	SCNdLEAST16		SCNd16
-#define	SCNd32			"d"
-#define	SCNdFAST16		SCNd32
-#define	SCNdLEAST32		SCNd32
-#define	SCNdFAST32		SCNd32
-#ifdef PRId64
-#define	SCNd64			PRId64
-#define	SCNdLEAST64		PRId64
-#define	SCNdFAST64		PRId64
-#endif
-#define	SCNdPTR			PRIdPTR
+#define SCNd8			"hhd"
+#define SCNdLEAST8		SCNd8
+#define SCNdFAST8		SCNd8
+#define SCNd16			"hd"
+#define SCNdLEAST16		SCNd16
+#define SCNd32			"d"
+#define SCNdFAST16		SCNd32
+#define SCNdLEAST32		SCNd32
+#define SCNdFAST32		SCNd32
+#define SCNd64			PRId64
+#define SCNdLEAST64		PRId64
+#define SCNdFAST64		PRId64
+#define SCNdPTR			PRIdPTR
 
-#define	SCNi8			"hhi"
-#define	SCNiLEAST8		SCNi8
-#define	SCNiFAST8		SCNi8
-#define	SCNi16			"hi"
-#define	SCNiLEAST16		SCNi16
-#define	SCNi32			"i"
-#define	SCNiFAST16		SCNi32
-#define	SCNiLEAST32		SCNi32
-#define	SCNiFAST32		SCNi32
-#ifdef PRIi64
-#define	SCNi64			PRIi64
-#define	SCNiLEAST64		PRIi64
-#define	SCNiFAST64		PRIi64
-#endif
-#define	SCNiPTR			PRIiPTR
+#define SCNi8			"hhi"
+#define SCNiLEAST8		SCNi8
+#define SCNiFAST8		SCNi8
+#define SCNi16			"hi"
+#define SCNiLEAST16		SCNi16
+#define SCNi32			"i"
+#define SCNiFAST16		SCNi32
+#define SCNiLEAST32		SCNi32
+#define SCNiFAST32		SCNi32
+#define SCNi64			PRIi64
+#define SCNiLEAST64		PRIi64
+#define SCNiFAST64		PRIi64
+#define SCNiPTR			PRIiPTR
 
 /*
  * fscanf macros for unsigned integers
  */
-#define	SCNo8			"hho"
-#define	SCNoLEAST8		SCNo8
-#define	SCNoFAST8		SCNo8
-#define	SCNo16			"ho"
-#define	SCNoLEAST16		SCNo16
-#define	SCNo32			"o"
-#define	SCNoFAST16		SCNo32
-#define	SCNoLEAST32		SCNo32
-#define	SCNoFAST32		SCNo32
-#ifdef PRIo64
-#define	SCNo64			PRIo64
-#define	SCNoLEAST64		PRIo64
-#define	SCNoFAST64		PRIo64
-#endif
-#define	SCNoPTR			PRIoPTR
+#define SCNo8			"hho"
+#define SCNoLEAST8		SCNo8
+#define SCNoFAST8		SCNo8
+#define SCNo16			"ho"
+#define SCNoLEAST16		SCNo16
+#define SCNo32			"o"
+#define SCNoFAST16		SCNo32
+#define SCNoLEAST32		SCNo32
+#define SCNoFAST32		SCNo32
+#define SCNo64			PRIo64
+#define SCNoLEAST64		PRIo64
+#define SCNoFAST64		PRIo64
+#define SCNoPTR			PRIoPTR
 
-#define	SCNu8			"hhu"
-#define	SCNuLEAST8		SCNu8
-#define	SCNuFAST8		SCNu8
-#define	SCNu16			"hu"
-#define	SCNuLEAST16		SCNu16
-#define	SCNu32			"u"
-#define	SCNuFAST16		SCNu32
-#define	SCNuLEAST32		SCNu32
-#define	SCNuFAST32		SCNu32
-#ifdef PRIu64
-#define	SCNu64			PRIu64
-#define	SCNuLEAST64		PRIu64
-#define	SCNuFAST64		PRIu64
-#endif
-#define	SCNuPTR			PRIuPTR
+#define SCNu8			"hhu"
+#define SCNuLEAST8		SCNu8
+#define SCNuFAST8		SCNu8
+#define SCNu16			"hu"
+#define SCNuLEAST16		SCNu16
+#define SCNu32			"u"
+#define SCNuFAST16		SCNu32
+#define SCNuLEAST32		SCNu32
+#define SCNuFAST32		SCNu32
+#define SCNu64			PRIu64
+#define SCNuLEAST64		PRIu64
+#define SCNuFAST64		PRIu64
+#define SCNuPTR			PRIuPTR
 
-#define	SCNx8			"hhx"
-#define	SCNxLEAST8		SCNx8
-#define	SCNxFAST8		SCNx8
-#define	SCNx16			"hx"
-#define	SCNxLEAST16		SCNx16
-#define	SCNx32			"x"
-#define	SCNxFAST16		SCNx32
-#define	SCNxLEAST32		SCNx32
-#define	SCNxFAST32		SCNx32
-#ifdef PRIx64
-#define	SCNx64			PRIx64
-#define	SCNxLEAST64		PRIx64
-#define	SCNxFAST64		PRIx64
-#endif
-#define	SCNxPTR			PRIxPTR
+#define SCNx8			"hhx"
+#define SCNxLEAST8		SCNx8
+#define SCNxFAST8		SCNx8
+#define SCNx16			"hx"
+#define SCNxLEAST16		SCNx16
+#define SCNx32			"x"
+#define SCNxFAST16		SCNx32
+#define SCNxLEAST32		SCNx32
+#define SCNxFAST32		SCNx32
+#define SCNx64			PRIx64
+#define SCNxLEAST64		PRIx64
+#define SCNxFAST64		PRIx64
+#define SCNxPTR			PRIxPTR
 
-#define	SCNX8			"hhX"
-#define	SCNXLEAST8		SCNX8
-#define	SCNXFAST8		SCNX8
-#define	SCNX16			"hX"
-#define	SCNXLEAST16		SCNX16
-#define	SCNX32			"X"
-#define	SCNXFAST16		SCNX32
-#define	SCNXLEAST32		SCNX32
-#define	SCNXFAST32		SCNX32
-#ifdef PRIX64
-#define	SCNX64			PRIX64
-#define	SCNXLEAST64		PRIX64
-#define	SCNXFAST64		PRIX64
-#endif
-#define	SCNXPTR			PRIXPTR
+#define SCNX8			"hhX"
+#define SCNXLEAST8		SCNX8
+#define SCNXFAST8		SCNX8
+#define SCNX16			"hX"
+#define SCNXLEAST16		SCNX16
+#define SCNX32			"X"
+#define SCNXFAST16		SCNX32
+#define SCNXLEAST32		SCNX32
+#define SCNXFAST32		SCNX32
+#define SCNX64			PRIX64
+#define SCNXLEAST64		PRIX64
+#define SCNXFAST64		PRIX64
+#define SCNXPTR			PRIXPTR
 
-/*
- * The following macros define I/O formats for intmax_t and uintmax_t.
- */
-#if !defined(_LP64)
-#define	PRIdMAX			"lld"
-#define	PRIiMAX			"lli"
-#define	PRIoMAX			"llo"
-#define	PRIxMAX			"llx"
-#define	PRIuMAX			"llu"
-#define	PRIXMAX			"llX"
-#else
-#define	PRIdMAX			"ld"
-#define	PRIiMAX			"li"
-#define	PRIoMAX			"lo"
-#define	PRIxMAX			"lx"
-#define	PRIuMAX			"lu"
-#define	PRIXMAX			"lX"
-#endif	/* !defined(_LP64) */
+/* intmax_t / uintmax_t */
+#define PRIdMAX			"jd"
+#define PRIiMAX			"ji"
+#define PRIoMAX			"jo"
+#define PRIxMAX			"jx"
+#define PRIuMAX			"ju"
+#define PRIXMAX			"jX"
 
-#define	SCNdMAX			PRIdMAX
-#define	SCNiMAX			PRIiMAX
-#define	SCNoMAX			PRIoMAX
-#define	SCNxMAX			PRIxMAX
-#define	SCNuMAX			PRIuMAX
-#define	SCNXMAX			PRIXMAX
-
-#ifdef __cplusplus
-}
-#endif
+#define SCNdMAX			PRIdMAX
+#define SCNiMAX			PRIiMAX
+#define SCNoMAX			PRIoMAX
+#define SCNxMAX			PRIxMAX
+#define SCNuMAX			PRIuMAX
+#define SCNXMAX			PRIXMAX
 
 #endif /* _SYS_INT_FMTIO_H */
--- a/include/sys/int_limits.h	Tue Jan 15 20:06:33 2019 -0500
+++ b/include/sys/int_limits.h	Mon Jan 07 14:14:18 2019 +0200
@@ -20,6 +20,7 @@
  * CDDL HEADER END
  */
 /*
+ * Copyright 2019 Lauri Tirkkonen <lotheac@iki.fi>
  * Copyright 2014 Garrett D'Amore <garrett@damore.org>
  *
  * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
@@ -27,7 +28,7 @@
  */
 
 #ifndef _SYS_INT_LIMITS_H
-#define	_SYS_INT_LIMITS_H
+#define _SYS_INT_LIMITS_H
 
 /*
  * This file, <sys/int_limits.h>, is part of the Sun Microsystems implementation
@@ -55,10 +56,6 @@
 
 #include <sys/feature_tests.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /*
  * Limits
  *
@@ -80,83 +77,63 @@
  * where the ABI specifies "char" as unsigned when the translation mode is
  * not ANSI-C.
  */
-#define	INT8_MAX	(127)
-#define	INT16_MAX	(32767)
-#define	INT32_MAX	(2147483647)
-#if defined(_LP64)
-#define	INT64_MAX	(9223372036854775807L)
-#else
-#define	INT64_MAX	(9223372036854775807LL)
-#endif
+#define INT8_MIN		(-0x7f - 1)
+#define INT16_MIN		(-0x7fff - 1)
+#define INT32_MIN		(-0x7fffffff - 1)
+#define INT64_MIN		(-0x7fffffffffffffffLL - 1)
 
-#define	UINT8_MAX	(255U)
-#define	UINT16_MAX	(65535U)
-#define	UINT32_MAX	(4294967295U)
-#if defined(_LP64)
-#define	UINT64_MAX	(18446744073709551615UL)
-#else
-#define	UINT64_MAX	(18446744073709551615ULL)
-#endif
+#define INT8_MAX		0x7f
+#define INT16_MAX		0x7fff
+#define INT32_MAX		0x7fffffff
+#define INT64_MAX		0x7fffffffffffffffLL
 
-#ifdef INT64_MAX
-#define	INTMAX_MAX	INT64_MAX
-#else
-#define	INTMAX_MAX	INT32_MAX
-#endif
+#define UINT8_MAX		0xff
+#define UINT16_MAX		0xffff
+#define UINT32_MAX		0xffffffffU
+#define UINT64_MAX		0xffffffffffffffffULL
 
-#ifdef UINT64_MAX
-#define	UINTMAX_MAX	UINT64_MAX
-#else
-#define	UINTMAX_MAX	UINT32_MAX
-#endif
+#define INT_LEAST8_MIN		INT8_MIN
+#define INT_LEAST16_MIN		INT16_MIN
+#define INT_LEAST32_MIN		INT32_MIN
+#define INT_LEAST64_MIN		INT64_MIN
 
-#define	INT_LEAST8_MAX	INT8_MAX
-#define	INT_LEAST16_MAX INT16_MAX
-#define	INT_LEAST32_MAX INT32_MAX
-#ifdef INT64_MAX
-#define	INT_LEAST64_MAX INT64_MAX
-#endif
+#define INT_LEAST8_MAX		INT8_MAX
+#define INT_LEAST16_MAX		INT16_MAX
+#define INT_LEAST32_MAX		INT32_MAX
+#define INT_LEAST64_MAX		INT64_MAX
 
-#define	UINT_LEAST8_MAX	UINT8_MAX
-#define	UINT_LEAST16_MAX UINT16_MAX
-#define	UINT_LEAST32_MAX UINT32_MAX
-#ifdef UINT64_MAX
-#define	UINT_LEAST64_MAX UINT64_MAX
-#endif
+#define UINT_LEAST8_MAX		UINT8_MAX
+#define UINT_LEAST16_MAX	UINT16_MAX
+#define UINT_LEAST32_MAX	UINT32_MAX
+#define UINT_LEAST64_MAX	UINT64_MAX
 
-#define	INT_FAST8_MAX	INT8_MAX
-#define	INT_FAST16_MAX INT16_MAX
-#define	INT_FAST32_MAX INT32_MAX
-#ifdef INT64_MAX
-#define	INT_FAST64_MAX INT64_MAX
-#endif
+#define INT_FAST8_MIN		INT8_MIN
+#define INT_FAST16_MIN		INT16_MIN
+#define INT_FAST32_MIN		INT32_MIN
+#define INT_FAST64_MIN		INT64_MIN
+
+#define INT_FAST8_MAX		INT8_MAX
+#define INT_FAST16_MAX		INT16_MAX
+#define INT_FAST32_MAX		INT32_MAX
+#define INT_FAST64_MAX		INT64_MAX
 
-#define	UINT_FAST8_MAX	UINT8_MAX
-#define	UINT_FAST16_MAX UINT16_MAX
-#define	UINT_FAST32_MAX UINT32_MAX
-#ifdef UINT64_MAX
-#define	UINT_FAST64_MAX UINT64_MAX
-#endif
+#define UINT_FAST8_MAX		UINT8_MAX
+#define UINT_FAST16_MAX		UINT16_MAX
+#define UINT_FAST32_MAX		UINT32_MAX
+#define UINT_FAST64_MAX		UINT64_MAX
+
+#define INTMAX_MIN		INT64_MIN
+#define INTMAX_MAX		INT64_MAX
+#define UINTMAX_MAX		UINT64_MAX
 
-/*
- * The following 2 macros are provided for testing whether the types
- * intptr_t and uintptr_t (integers large enough to hold a void *) are
- * defined in this header. They are needed in case the architecture can't
- * represent a pointer in any standard integral type.
- */
 #if defined(_LP64) || defined(_I32LPx)
-#define	INTPTR_MAX	INT64_MAX
-#define	UINTPTR_MAX	UINT64_MAX
+#define INTPTR_MIN		(-0x7fffffffffffffffL - 1)
+#define INTPTR_MAX		0x7fffffffffffffffL
+#define UINTPTR_MAX		0xffffffffffffffffUL
 #else
-#define	INTPTR_MAX	INT32_MAX
-#define	UINTPTR_MAX	UINT32_MAX
-#endif
-
-/* Maximum limits of ptrdiff_t defined in <sys/types.h> */
-#if defined(_LP64) || defined(_I32LPx)
-#define	PTRDIFF_MAX	9223372036854775807L
-#else
-#define	PTRDIFF_MAX	2147483647
+#define INTPTR_MIN		(-0x7fffffffL - 1)
+#define INTPTR_MAX		0x7fffffffL
+#define UINTPTR_MAX		0xffffffffUL
 #endif
 
 /*
@@ -166,104 +143,38 @@
  * does <limits.h>. The value of SIZE_MAX should not deviate
  * from the value of ULONG_MAX defined <sys/types.h>.
  */
-#if defined(_LP64)
-#define	SIZE_MAX	18446744073709551615UL
-#else
-#define	SIZE_MAX	4294967295UL
-#endif
+#define SIZE_MAX		UINTPTR_MAX
 
-/* Maximum limit of sig_atomic_t defined in <sys/types.h> */
-#ifndef SIG_ATOMIC_MAX
-#define	SIG_ATOMIC_MAX	2147483647
-#endif
+/* Limits of ptrdiff_t defined in <sys/types.h> */
+#define PTRDIFF_MIN		INTPTR_MIN
+#define PTRDIFF_MAX		INTPTR_MAX
 
-/*
- * Maximum limit of wchar_t. The WCHAR_* macros are also
- * defined in <iso/wchar_iso.h>, but inclusion of that header
- * will break ISO/IEC C namespace.
- */
-#ifndef	WCHAR_MAX
-#define	WCHAR_MAX	2147483647
+/* Limits of sig_atomic_t defined in <sys/types.h> */
+#ifndef SIG_ATOMIC_MIN
+#define SIG_ATOMIC_MIN		INT32_MIN
 #endif
-
-/* Maximum limit of wint_t */
-#ifndef WINT_MAX
-#define	WINT_MAX	2147483647
+#ifndef SIG_ATOMIC_MAX
+#define SIG_ATOMIC_MAX		INT32_MAX
 #endif
 
 /*
- * It is probably a bug in the POSIX specification (IEEE-1003.1-1990) that
- * when including <limits.h> that the suffix _MAX is reserved but not the
- * suffix _MIN.  However, until that issue is resolved....
- */
-#if defined(__EXTENSIONS__) || !defined(__XOPEN_OR_POSIX) || defined(_XPG6)
-
-#define	INT8_MIN	(-128)
-#define	INT16_MIN	(-32767-1)
-#define	INT32_MIN	(-2147483647-1)
-#if defined(_LP64)
-#define	INT64_MIN	(-9223372036854775807L-1)
-#else
-#define	INT64_MIN	(-9223372036854775807LL-1)
-#endif
-
-#ifdef INT64_MIN
-#define	INTMAX_MIN	INT64_MIN
-#else
-#define	INTMAX_MIN	INT32_MIN
-#endif
-
-#define	INT_LEAST8_MIN	INT8_MIN
-#define	INT_LEAST16_MIN	INT16_MIN
-#define	INT_LEAST32_MIN INT32_MIN
-#ifdef INT64_MIN
-#define	INT_LEAST64_MIN	INT64_MIN
-#endif
-
-#define	INT_FAST8_MIN	INT8_MIN
-#define	INT_FAST16_MIN	INT16_MIN
-#define	INT_FAST32_MIN INT32_MIN
-#ifdef INT64_MIN
-#define	INT_FAST64_MIN	INT64_MIN
-#endif
-
-/* Minimum value of a pointer-holding signed integer type */
-#if defined(_LP64) || defined(_I32LPx)
-#define	INTPTR_MIN	INT64_MIN
-#else
-#define	INTPTR_MIN	INT32_MIN
-#endif
-
-/* Minimum limits of ptrdiff_t defined in <sys/types.h> */
-#if defined(_LP64) || defined(_I32LPx)
-#define	PTRDIFF_MIN	(-9223372036854775807L-1L)
-#else
-#define	PTRDIFF_MIN	(-2147483647-1)
-#endif
-
-/* Minimum limit of sig_atomic_t defined in <sys/types.h> */
-#ifndef	SIG_ATOMIC_MIN
-#define	SIG_ATOMIC_MIN	(-2147483647-1)
-#endif
-
-/*
- * Minimum limit of wchar_t. The WCHAR_* macros are also
+ * Limits of wchar_t. The WCHAR_* macros are also
  * defined in <iso/wchar_iso.h>, but inclusion of that header
  * will break ISO/IEC C namespace.
  */
-#ifndef	WCHAR_MIN
-#define	WCHAR_MIN	(-2147483647-1)
+#ifndef WCHAR_MIN
+#define WCHAR_MIN		INT32_MIN
+#endif
+#ifndef WCHAR_MAX
+#define WCHAR_MAX		INT32_MAX
 #endif
 
-/* Minimum limit of wint_t */
-#ifndef	WINT_MIN
-#define	WINT_MIN	(-2147483647-1)
+/* Limits of wint_t */
+#ifndef WINT_MIN
+#define WINT_MIN		INT32_MIN
 #endif
-
-#endif	/* defined(__EXTENSIONS__) || !defined(__XOPEN_OR_POSIX) ... */
-
-#ifdef __cplusplus
-}
+#ifndef WINT_MAX
+#define WINT_MAX		INT32_MAX
 #endif
 
 #endif /* _SYS_INT_LIMITS_H */
--- a/include/sys/int_types.h	Tue Jan 15 20:06:33 2019 -0500
+++ b/include/sys/int_types.h	Mon Jan 07 14:14:18 2019 +0200
@@ -20,6 +20,7 @@
  * CDDL HEADER END
  */
 /*
+ * Copyright 2019 Lauri Tirkkonen <lotheac@iki.fi>
  * Copyright 2014 Garrett D'Amore <garrett@damore.org>
  *
  * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
@@ -27,7 +28,7 @@
  */
 
 #ifndef _SYS_INT_TYPES_H
-#define	_SYS_INT_TYPES_H
+#define _SYS_INT_TYPES_H
 
 /*
  * This file, <sys/int_types.h>, is part of the Sun Microsystems implementation
@@ -54,10 +55,6 @@
 
 #include <sys/feature_tests.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /*
  * Basic / Extended integer types
  *
@@ -78,21 +75,13 @@
 #endif
 typedef short			int16_t;
 typedef int			int32_t;
-#define	_INT64_TYPE
-#ifdef	_LP64
-typedef long			int64_t;
-#else	/* _ILP32 */
-typedef	long long		int64_t;
-#endif
+#define _INT64_TYPE
+typedef long long		int64_t;
 
 typedef unsigned char		uint8_t;
 typedef unsigned short		uint16_t;
 typedef unsigned int		uint32_t;
-#ifdef	_LP64
-typedef unsigned long		uint64_t;
-#else	/* _ILP32 */
 typedef unsigned long long	uint64_t;
-#endif
 
 /*
  * intmax_t and uintmax_t are to be the longest (in number of bits) signed
@@ -115,8 +104,8 @@
 typedef long			intptr_t;
 typedef unsigned long		uintptr_t;
 #else
-typedef	int			intptr_t;
-typedef	unsigned int		uintptr_t;
+typedef int			intptr_t;
+typedef unsigned int		uintptr_t;
 #endif
 
 /*
@@ -130,18 +119,18 @@
 #endif
 typedef int			int_fast16_t;
 typedef int			int_fast32_t;
-#ifdef	_LP64
+#ifdef _LP64
 typedef long			int_fast64_t;
-#else	/* _ILP32 */
+#else /* _ILP32 */
 typedef long long		int_fast64_t;
 #endif
 
 typedef unsigned char		uint_fast8_t;
 typedef unsigned int		uint_fast16_t;
 typedef unsigned int		uint_fast32_t;
-#ifdef	_LP64
+#ifdef _LP64
 typedef unsigned long		uint_fast64_t;
-#else	/* _ILP32 */
+#else /* _ILP32 */
 typedef unsigned long long	uint_fast64_t;
 #endif
 
@@ -156,23 +145,19 @@
 #endif
 typedef short			int_least16_t;
 typedef int			int_least32_t;
-#ifdef	_LP64
+#ifdef _LP64
 typedef long			int_least64_t;
-#else	/* _ILP32 */
+#else /* _ILP32 */
 typedef long long		int_least64_t;
 #endif
 
 typedef unsigned char		uint_least8_t;
 typedef unsigned short		uint_least16_t;
 typedef unsigned int		uint_least32_t;
-#ifdef	_LP64
+#ifdef _LP64
 typedef unsigned long		uint_least64_t;
-#else	/* _ILP32 */
+#else /* _ILP32 */
 typedef unsigned long long	uint_least64_t;
 #endif
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _SYS_INT_TYPES_H */
--- a/include/sys/inttypes.h	Tue Jan 15 20:06:33 2019 -0500
+++ b/include/sys/inttypes.h	Mon Jan 07 14:14:18 2019 +0200
@@ -39,10 +39,8 @@
 
 #include <sys/feature_tests.h>
 #include <sys/int_types.h>
-#if !defined(_XOPEN_SOURCE) || defined(_XPG6) || defined(__EXTENSIONS__)
 #include <sys/int_limits.h>
 #include <sys/int_const.h>
 #include <sys/int_fmtio.h>
-#endif
 
 #endif /* _SYS_INTTYPES_H */
--- a/include/sys/param.h	Tue Jan 15 20:06:33 2019 -0500
+++ b/include/sys/param.h	Mon Jan 07 14:14:18 2019 +0200
@@ -253,13 +253,8 @@
 #ifdef	_SYSCALL32
 #define	MAXOFF32_T	0x7fffffff
 #endif
-#ifdef	_LP64
-#define	MAXOFF_T	0x7fffffffffffffffl
-#define	MAXOFFSET_T	0x7fffffffffffffffl
-#else
 #define	MAXOFF_T	0x7fffffffffffffffLL
-#define	MAXOFFSET_T 	0x7fffffffffffffffLL
-#endif	/* _LP64 */
+#define	MAXOFFSET_T	MAXOFF_T
 
 #define	btodb(bytes)			/* calculates (bytes / DEV_BSIZE) */ \
 	((unsigned long)(bytes) >> DEV_BSHIFT)
--- a/include/sys/types.h	Tue Jan 15 20:06:33 2019 -0500
+++ b/include/sys/types.h	Mon Jan 07 14:14:18 2019 +0200
@@ -109,38 +109,22 @@
 
 #ifndef _OFF_T
 #define	_OFF_T
-
-#if defined(_LP64)
-typedef long		off_t;		/* offsets within files */
-#else
-typedef longlong_t	off_t;		/* offsets within files */
-#endif
-typedef off_t off64_t;
-
+typedef int64_t		off_t;		/* offsets within files */
+typedef off_t		off64_t;	/* compat alias */
 #endif /* _OFF_T */
 
-#if defined(_LP64)
-typedef ulong_t		ino_t;		/* expanded inode type	*/
-typedef long		blkcnt_t;	/* count of file blocks */
-typedef ulong_t		fsblkcnt_t;	/* count of file system blocks */
-typedef ulong_t		fsfilcnt_t;	/* count of files */
-#else
-typedef u_longlong_t	ino_t;		/* expanded inode type	*/
-typedef longlong_t	blkcnt_t;	/* count of file blocks */
-typedef u_longlong_t	fsblkcnt_t;	/* count of file system blocks */
-typedef u_longlong_t	fsfilcnt_t;	/* count of files */
-#endif
+typedef uint64_t	ino_t;		/* expanded inode type	*/
+typedef int64_t		blkcnt_t;	/* count of file blocks */
+typedef uint64_t	fsblkcnt_t;	/* count of file system blocks */
+typedef uint64_t	fsfilcnt_t;	/* count of files */
 
-typedef	ino_t		ino64_t;	/* expanded inode type */
-typedef	blkcnt_t	blkcnt64_t;	/* count of file blocks */
-typedef	fsblkcnt_t	fsblkcnt64_t;	/* count of file system blocks */
-typedef	fsfilcnt_t	fsfilcnt64_t;	/* count of files */
+/* compat aliases */
+typedef ino_t		ino64_t;
+typedef blkcnt_t	blkcnt64_t;
+typedef fsblkcnt_t	fsblkcnt64_t;
+typedef fsfilcnt_t	fsfilcnt64_t;
 
-#ifdef _LP64
-typedef	int		blksize_t;	/* used for block sizes */
-#else
-typedef	long		blksize_t;	/* used for block sizes */
-#endif
+typedef int32_t		blksize_t;	/* used for block sizes */
 
 #if defined(__XOPEN_OR_POSIX)
 typedef enum { _B_FALSE, _B_TRUE } boolean_t;
@@ -185,10 +169,10 @@
 	uint32_t	_l[4];
 } upad128_t;
 
-typedef	longlong_t	offset_t;
-typedef	u_longlong_t	uoff_t;
-typedef u_longlong_t	len_t;
-typedef	u_longlong_t	diskaddr_t;
+typedef off_t		offset_t;
+typedef uint64_t	uoff_t;
+typedef uint64_t	len_t;
+typedef uint64_t	diskaddr_t;
 #if (defined(_KERNEL) || defined(_KMEMUSER) || defined(_BOOT))
 typedef	uint64_t	paddr_t;
 #endif
--- a/kernel/drivers/net/nxge/nxge_rxdma.c	Tue Jan 15 20:06:33 2019 -0500
+++ b/kernel/drivers/net/nxge/nxge_rxdma.c	Mon Jan 07 14:14:18 2019 +0200
@@ -4871,13 +4871,8 @@
 			cs.bits.hdw.rbrlogpage = 1;
 		else if (err_id == NXGE_FM_EREPORT_RDMC_CFIGLOGPAGE)
 			cs.bits.hdw.cfiglogpage = 1;
-#if defined(__i386)
 		cmn_err(CE_NOTE, "!Write 0x%llx to RX_DMA_CTL_STAT_DBG_REG\n",
 		    cs.value);
-#else
-		cmn_err(CE_NOTE, "!Write 0x%lx to RX_DMA_CTL_STAT_DBG_REG\n",
-		    cs.value);
-#endif
 		RXDMA_REG_WRITE64(nxgep->npi_handle, RX_DMA_CTL_STAT_DBG_REG,
 		    chan, cs.value);
 		break;
@@ -4891,15 +4886,9 @@
 			cdfs.bits.ldw.zcp_eop_err = (1 << nxgep->mac.portnum);
 		else if (err_id == NXGE_FM_EREPORT_RDMC_IPP_EOP_ERR)
 			cdfs.bits.ldw.ipp_eop_err = (1 << nxgep->mac.portnum);
-#if defined(__i386)
 		cmn_err(CE_NOTE,
 		    "!Write 0x%llx to RX_CTL_DAT_FIFO_STAT_DBG_REG\n",
 		    cdfs.value);
-#else
-		cmn_err(CE_NOTE,
-		    "!Write 0x%lx to RX_CTL_DAT_FIFO_STAT_DBG_REG\n",
-		    cdfs.value);
-#endif
 		NXGE_REG_WR64(nxgep->npi_handle,
 		    RX_CTL_DAT_FIFO_STAT_DBG_REG, cdfs.value);
 		break;
--- a/kernel/drivers/net/nxge/nxge_txc.c	Tue Jan 15 20:06:33 2019 -0500
+++ b/kernel/drivers/net/nxge/nxge_txc.c	Mon Jan 07 14:14:18 2019 +0200
@@ -534,13 +534,8 @@
 			ro_ecc_ctl.bits.ldw.single_bit_err = 1;
 		else
 			ro_ecc_ctl.bits.ldw.double_bit_err = 1;
-#if defined(__i386)
 		cmn_err(CE_NOTE, "!Write 0x%llx to TXC_ROECC_CTL_REG\n",
 		    ro_ecc_ctl.value);
-#else
-		cmn_err(CE_NOTE, "!Write 0x%lx to TXC_ROECC_CTL_REG\n",
-		    ro_ecc_ctl.value);
-#endif
 		TXC_FZC_CNTL_REG_WRITE64(nxgep->npi_handle, TXC_ROECC_CTL_REG,
 		    portn, ro_ecc_ctl.value);
 		break;
@@ -553,13 +548,8 @@
 			sf_ecc_ctl.bits.ldw.single_bit_err = 1;
 		else
 			sf_ecc_ctl.bits.ldw.double_bit_err = 1;
-#if defined(__i386)
 		cmn_err(CE_NOTE, "!Write 0x%llx to TXC_SFECC_CTL_REG\n",
 		    sf_ecc_ctl.value);
-#else
-		cmn_err(CE_NOTE, "!Write 0x%lx to TXC_SFECC_CTL_REG\n",
-		    sf_ecc_ctl.value);
-#endif
 		TXC_FZC_CNTL_REG_WRITE64(nxgep->npi_handle, TXC_SFECC_CTL_REG,
 		    portn, sf_ecc_ctl.value);
 		break;
@@ -568,13 +558,8 @@
 		    &txcs.value);
 		nxge_txc_inject_port_err(portn, &txcs,
 		    TXC_INT_STAT_REORDER_ERR);
-#if defined(__i386)
 		cmn_err(CE_NOTE, "!Write 0x%llx to TXC_INT_STAT_DBG_REG\n",
 		    txcs.value);
-#else
-		cmn_err(CE_NOTE, "!Write 0x%lx to TXC_INT_STAT_DBG_REG\n",
-		    txcs.value);
-#endif
 		NXGE_REG_WR64(nxgep->npi_handle, TXC_INT_STAT_DBG_REG,
 		    txcs.value);
 		break;
--- a/kernel/drivers/net/nxge/nxge_txdma.c	Tue Jan 15 20:06:33 2019 -0500
+++ b/kernel/drivers/net/nxge/nxge_txdma.c	Mon Jan 07 14:14:18 2019 +0200
@@ -2140,11 +2140,7 @@
 		ipp_status_t status;
 
 		(void) npi_ipp_get_status(handle, nxgep->function_num, &status);
-#if defined(__i386)
 		printf("\n\tIPP status 0x%llux\n", (uint64_t)status.value);
-#else
-		printf("\n\tIPP status 0x%lux\n", (uint64_t)status.value);
-#endif
 	}
 }
 
@@ -3671,13 +3667,8 @@
 			tdi.bits.ldw.conf_part_err = 1;
 		else if (err_id == NXGE_FM_EREPORT_TDMC_PKT_PRT_ERR)
 			tdi.bits.ldw.pkt_part_err = 1;
-#if defined(__i386)
 		cmn_err(CE_NOTE, "!Write 0x%llx to TDMC_INTR_DBG_REG\n",
 		    tdi.value);
-#else
-		cmn_err(CE_NOTE, "!Write 0x%lx to TDMC_INTR_DBG_REG\n",
-		    tdi.value);
-#endif
 		TXDMA_REG_WRITE64(nxgep->npi_handle, TDMC_INTR_DBG_REG,
 		    chan, tdi.value);
 
--- a/kernel/drivers/net/nxge/nxge_zcp.c	Tue Jan 15 20:06:33 2019 -0500
+++ b/kernel/drivers/net/nxge/nxge_zcp.c	Mon Jan 07 14:14:18 2019 +0200
@@ -371,13 +371,8 @@
 			zcps.bits.ldw.slv_tt_index_err = 1;
 		if (err_id == NXGE_FM_EREPORT_ZCP_TT_INDEX_ERR)
 			zcps.bits.ldw.zcp_tt_index_err = 1;
-#if defined(__i386)
 		cmn_err(CE_NOTE, "!Write 0x%llx to ZCP_INT_STAT_TEST_REG\n",
 		    zcps.value);
-#else
-		cmn_err(CE_NOTE, "!Write 0x%lx to ZCP_INT_STAT_TEST_REG\n",
-		    zcps.value);
-#endif
 		NXGE_REG_WR64(nxgep->npi_handle, ZCP_INT_STAT_TEST_REG,
 		    zcps.value);
 		break;
--- a/kernel/drivers/scsi/mr_sas/mr_sas.c	Tue Jan 15 20:06:33 2019 -0500
+++ b/kernel/drivers/scsi/mr_sas/mr_sas.c	Mon Jan 07 14:14:18 2019 +0200
@@ -629,7 +629,7 @@
 		if (reglength > DEFAULT_MFI_MEM_SZ) {
 			reglength = DEFAULT_MFI_MEM_SZ;
 			con_log(CL_DLEVEL1, (CE_NOTE,
-			    "mr_sas: register length to map is 0x%lx bytes",
+			    "mr_sas: register length to map is 0x%llx bytes",
 			    reglength));
 		}
 		if (ddi_regs_map_setup(instance->dip,
--- a/kernel/fs/ufs/ufs_alloc.c	Tue Jan 15 20:06:33 2019 -0500
+++ b/kernel/fs/ufs/ufs_alloc.c	Mon Jan 07 14:14:18 2019 +0200
@@ -677,7 +677,7 @@
 			mutex_exit(&ufsvfsp->vfs_lock);
 			brelse(bp);
 			(void) ufs_fault(ITOV(ip), "free: freeing free block, "
-			    "dev:0x%lx, block:%ld, ino:%lu, fs:%s",
+			    "dev:0x%lx, block:%ld, ino:%llu, fs:%s",
 			    ip->i_dev, bno, ip->i_number, fs->fs_fsmnt);
 			return;
 		}
@@ -710,7 +710,7 @@
 				(void) ufs_fault(ITOV(ip),
 				    "free: freeing free frag, "
 				    "dev:0x%lx, blk:%ld, cg:%d, "
-				    "ino:%lu, fs:%s",
+				    "ino:%llu, fs:%s",
 				    ip->i_dev,
 				    bno + i,
 				    cgp->cg_cgx,
--- a/kernel/fs/ufs/ufs_dir.c	Tue Jan 15 20:06:33 2019 -0500
+++ b/kernel/fs/ufs/ufs_dir.c	Mon Jan 07 14:14:18 2019 +0200
@@ -2829,7 +2829,7 @@
 static void
 dirbad(struct inode *ip, char *how, off_t offset)
 {
-	cmn_err(CE_NOTE, "%s: bad dir ino %d at offset %ld: %s",
+	cmn_err(CE_NOTE, "%s: bad dir ino %d at offset %lld: %s",
 	    ip->i_fs->fs_fsmnt, (int)ip->i_number, offset, how);
 }
 
--- a/usr/src/cmd/mdb/intel/mdb/mdb_kreg.h	Tue Jan 15 20:06:33 2019 -0500
+++ b/usr/src/cmd/mdb/intel/mdb/mdb_kreg.h	Mon Jan 07 14:14:18 2019 +0200
@@ -38,11 +38,7 @@
 #endif
 
 #ifndef _ASM
-#ifdef __amd64
-typedef uint64_t kreg_t;
-#else	/* __amd64 */
-typedef uint32_t kreg_t;
-#endif	/* __amd64 */
+typedef uintptr_t kreg_t;
 #endif	/* !_ASM */
 
 #define	KREG_NGREG	KDIREG_NGREG
--- a/usr/src/uts/common/io/ntxn/unm_gem.c	Tue Jan 15 20:06:33 2019 -0500
+++ b/usr/src/uts/common/io/ntxn/unm_gem.c	Mon Jan 07 14:14:18 2019 +0200
@@ -948,7 +948,7 @@
 			    0xA0 + ((adapter->ahw.pci_func - 4) * 0x10);
 		vector2M(adapter);
 	} else {
-		cmn_err(CE_WARN, "%s%d: invalid pci regs map size %ld\n",
+		cmn_err(CE_WARN, "%s%d: invalid pci regs map size %lld\n",
 		    adapter->name, adapter->instance, regsize);
 		ddi_regs_map_free(&adapter->regs_handle);
 		return (DDI_FAILURE);
--- a/usr/src/uts/common/io/sata/impl/sata.c	Tue Jan 15 20:06:33 2019 -0500
+++ b/usr/src/uts/common/io/sata/impl/sata.c	Mon Jan 07 14:14:18 2019 +0200
@@ -12841,13 +12841,8 @@
 	}
 
 	if (sdinfo->satadrv_type == SATA_DTYPE_ATADISK) {
-#ifdef __i386
 		(void) sprintf(msg_buf, "\tcapacity = %llu sectors\n",
 		    sdinfo->satadrv_capacity);
-#else
-		(void) sprintf(msg_buf, "\tcapacity = %lu sectors\n",
-		    sdinfo->satadrv_capacity);
-#endif
 		cmn_err(CE_CONT, "?%s", msg_buf);
 	}
 }
--- a/usr/src/uts/intel/io/acpica/acpi_enum.c	Tue Jan 15 20:06:33 2019 -0500
+++ b/usr/src/uts/intel/io/acpica/acpi_enum.c	Mon Jan 07 14:14:18 2019 +0200
@@ -387,22 +387,6 @@
 			cmn_err(CE_NOTE, "!parse_resources() "\
 			    "ADDRESS 64 OTHER");
 		}
-#ifdef _LP64
-		cmn_err(CE_NOTE, "!parse_resources() "\
-		    "%s "\
-		    "MinAddressFixed 0x%X, "\
-		    "MaxAddressFixed 0x%X, "\
-		    "Minimum 0x%lX, "\
-		    "Maximum 0x%lX, "\
-		    "length: 0x%lX\n",
-		    addr64.ProducerConsumer == ACPI_CONSUMER ?
-		    "CONSUMER" : "PRODUCER",
-		    addr64.MinAddressFixed,
-		    addr64.MaxAddressFixed,
-		    addr64.Address.Minimum,
-		    addr64.Address.Maximum,
-		    addr64.Address.AddressLength);
-#else
 		cmn_err(CE_NOTE, "!parse_resources() "\
 		    "%s "\
 		    "MinAddressFixed 0x%X, "\
@@ -417,7 +401,6 @@
 		    addr64.Address.Minimum,
 		    addr64.Address.Maximum,
 		    addr64.Address.AddressLength);
-#endif
 	}
 	if (addr64.ProducerConsumer == ACPI_PRODUCER ||
 	    (addr64.ResourceType != ACPI_MEMORY_RANGE &&
--- a/usr/src/uts/intel/io/agpmaster/agpmaster.c	Tue Jan 15 20:06:33 2019 -0500
+++ b/usr/src/uts/intel/io/agpmaster/agpmaster.c	Mon Jan 07 14:14:18 2019 +0200
@@ -184,7 +184,7 @@
 	off_t apersize;
 
 	apersize = AGPM_READ(agpmaster, PGTBL_CTL);
-	AGPM_DEBUG((CE_NOTE, "i965_apersize: PGTBL_CTL = %lx", apersize));
+	AGPM_DEBUG((CE_NOTE, "i965_apersize: PGTBL_CTL = %llx", apersize));
 	switch (apersize & GTT_SIZE_MASK) {
 	case GTT_2MB:
 		apersize = 2048;
@@ -241,7 +241,7 @@
 		AGPM_DEBUG((CE_WARN,
 		    "i3XX_apersize: no memory allocated for GTT"));
 	}
-	AGPM_DEBUG((CE_NOTE, "i3xx_apersize: apersize = %ldM", apersize));
+	AGPM_DEBUG((CE_NOTE, "i3xx_apersize: apersize = %lldM", apersize));
 	return (apersize);
 }
 
@@ -341,7 +341,7 @@
 	/* get graphics memory base address from GMADR */
 	value = pci_config_get32(pci_acc_hdl, gmadr_off);
 	APER_BASE(agpmaster) = value & GTT_BASE_MASK;
-	AGPM_DEBUG((CE_NOTE, "set_gtt_mmio: aperbase = 0x%x, apersize = %ldM, "
+	AGPM_DEBUG((CE_NOTE, "set_gtt_mmio: aperbase = 0x%x, apersize = %lldM, "
 	    "gtt_addr = %p, mmio_base = %p", APER_BASE(agpmaster), apersize,
 	    (void *)GTT_ADDR(agpmaster), (void *)MMIO_BASE(agpmaster)));
 	return (0);