diff options
| author | John Sonnenschein <johns@joyent.com> | 2012-05-17 18:26:57 +0000 |
|---|---|---|
| committer | John Sonnenschein <johns@joyent.com> | 2012-05-17 18:26:57 +0000 |
| commit | 04b244dd661c24b510ac22936decfc0972d202d3 (patch) | |
| tree | 3ebfef98afc303fddf3415d6fba64e8682f495e8 /usr/src/uts/sun4u | |
| parent | eac250589e41f1b705e1b7427b02b3379aac9f9e (diff) | |
| parent | a69187741b83640a90dd8586195456dd50c016a8 (diff) | |
| download | illumos-joyent-20120517.tar.gz | |
Merge git.joyent.com:illumos-joyent20120517
Diffstat (limited to 'usr/src/uts/sun4u')
| -rw-r--r-- | usr/src/uts/sun4u/lw8/io/sgenv.c | 2 | ||||
| -rw-r--r-- | usr/src/uts/sun4u/starfire/sys/idn.h | 8 | ||||
| -rw-r--r-- | usr/src/uts/sun4u/sys/pci/pcisch.h | 16 |
3 files changed, 11 insertions, 15 deletions
diff --git a/usr/src/uts/sun4u/lw8/io/sgenv.c b/usr/src/uts/sun4u/lw8/io/sgenv.c index b44d118def..7b5971bf57 100644 --- a/usr/src/uts/sun4u/lw8/io/sgenv.c +++ b/usr/src/uts/sun4u/lw8/io/sgenv.c @@ -1708,8 +1708,6 @@ sgenv_get_board_info_data(void) DCMN_ERR_EVENT(CE_NOTE, "%s: entered.", f); - ASSERT(board_cache != NULL); - if (first_time) { sgenv_set_valid_node_positions(node_present); first_time = FALSE; diff --git a/usr/src/uts/sun4u/starfire/sys/idn.h b/usr/src/uts/sun4u/starfire/sys/idn.h index a117529afb..14034c0fe4 100644 --- a/usr/src/uts/sun4u/starfire/sys/idn.h +++ b/usr/src/uts/sun4u/starfire/sys/idn.h @@ -3429,10 +3429,10 @@ struct idn_gkstat_named { (x)[2] = (uint_t)(a2), (x)[3] = (uint_t)(a3)) #define GET_XARGS(x, a0, a1, a2, a3) \ - (((a0) ? *(uint_t *)(a0) = (x)[0] : 1), \ - ((a1) ? *(uint_t *)(a1) = (x)[1] : 1), \ - ((a2) ? *(uint_t *)(a2) = (x)[2] : 1), \ - ((a3) ? *(uint_t *)(a3) = (x)[3] : 1)) + ((*(uint_t *)(a0) = (x)[0]), \ + (*(uint_t *)(a1) = (x)[1]), \ + (*(uint_t *)(a2) = (x)[2]), \ + (*(uint_t *)(a3) = (x)[3])) #define CLR_XARGS(x) \ ((x)[0] = (x)[1] = (x)[2] = (x)[3] = 0) diff --git a/usr/src/uts/sun4u/sys/pci/pcisch.h b/usr/src/uts/sun4u/sys/pci/pcisch.h index 2bb9b7db0c..061d770ad9 100644 --- a/usr/src/uts/sun4u/sys/pci/pcisch.h +++ b/usr/src/uts/sun4u/sys/pci/pcisch.h @@ -26,8 +26,6 @@ #ifndef _SYS_PCISCH_H #define _SYS_PCISCH_H -#pragma ident "%Z%%M% %I% %E% SMI" - #ifdef __cplusplus extern "C" { #endif @@ -504,13 +502,13 @@ typedef struct pcix_err_tbl { */ #define TLBTAG_CONTEXT_SHIFT 25 #define TLBTAG_ERRSTAT_SHIFT 23 -#define TLBTAG_CONTEXT_BITS (0xfffull << TLBTAG_CONTEXT_SHIFT) -#define TLBTAG_ERRSTAT_BITS (0x3ull << TLBTAG_ERRSTAT_SHIFT) -#define TLBTAG_ERR_BIT (0x1ull << 22) -#define TLBTAG_WRITABLE_BIT (0x1ull << 21) -#define TLBTAG_STREAM_BIT (0x1ull << 20) -#define TLBTAG_PGSIZE_BIT (0x1ull << 19) -#define TLBTAG_PCIVPN_BITS 0x7ffffull +#define TLBTAG_CONTEXT_BITS (0xffful << TLBTAG_CONTEXT_SHIFT) +#define TLBTAG_ERRSTAT_BITS (0x3ul << TLBTAG_ERRSTAT_SHIFT) +#define TLBTAG_ERR_BIT (0x1ul << 22) +#define TLBTAG_WRITABLE_BIT (0x1ul << 21) +#define TLBTAG_STREAM_BIT (0x1ul << 20) +#define TLBTAG_PGSIZE_BIT (0x1ul << 19) +#define TLBTAG_PCIVPN_BITS 0x7fffful #define TLBTAG_ERRSTAT_PROT 0 #define TLBTAG_ERRSTAT_INVALID 1 |