diff options
| author | Richard Lowe <richlowe@richlowe.net> | 2011-06-21 12:45:54 +0000 |
|---|---|---|
| committer | Richard Lowe <richlowe@richlowe.net> | 2011-07-02 22:16:32 -0400 |
| commit | 22f8947a1416b076cf4aa9fbd8f682377902dca8 (patch) | |
| tree | 40a7917beb808bce27ef075b932ab9253c2be873 /usr/src | |
| parent | e1a4c0430caa0e0071c566d0eafe9719a3d73439 (diff) | |
| download | illumos-joyent-22f8947a1416b076cf4aa9fbd8f682377902dca8.tar.gz | |
starfire/idn: Don't cast pointers directly to int
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/uts/sun4u/starfire/io/idn.c | 3 | ||||
| -rw-r--r-- | usr/src/uts/sun4u/starfire/sys/idn.h | 3 | ||||
| -rw-r--r-- | usr/src/uts/sun4u/starfire/sys/idn_smr.h | 5 |
3 files changed, 6 insertions, 5 deletions
diff --git a/usr/src/uts/sun4u/starfire/io/idn.c b/usr/src/uts/sun4u/starfire/io/idn.c index 9f1136b938..fd988517f7 100644 --- a/usr/src/uts/sun4u/starfire/io/idn.c +++ b/usr/src/uts/sun4u/starfire/io/idn.c @@ -4745,7 +4745,8 @@ static char _bd2hexascii[] = { mutex_enter(&snoop_mutex); \ if (snoop_data == NULL) { \ snoop_data = (struct snoop_buffer *) \ - (((uint_t)snoop_buffer + 0xf) & ~0xf); \ + (((uint_t)(uintptr_t)snoop_buffer + 0xf) & \ + ~0xf); \ } \ snoop_data[snoop_index].io = ((in) == 0) ? 'o' : 'i'; \ snoop_data[snoop_index].board = \ diff --git a/usr/src/uts/sun4u/starfire/sys/idn.h b/usr/src/uts/sun4u/starfire/sys/idn.h index 61fa088897..256e4c6e0b 100644 --- a/usr/src/uts/sun4u/starfire/sys/idn.h +++ b/usr/src/uts/sun4u/starfire/sys/idn.h @@ -2200,7 +2200,8 @@ typedef struct idn_mboxmsg { typedef idn_mboxmsg_t idn_mboxq_t[1]; #define IDN_CKSUM_MBOX_COUNT \ - (((int)&((idn_mboxhdr_t *)(0))->mh_svr_ready) / 2) + (((int)(uintptr_t) \ + &((idn_mboxhdr_t *)(0))->mh_svr_ready) / 2) #define IDN_CKSUM_MBOX(h) \ (IDN_CHECKSUM ? \ idn_cksum((ushort_t *)(h), IDN_CKSUM_MBOX_COUNT) : 0) diff --git a/usr/src/uts/sun4u/starfire/sys/idn_smr.h b/usr/src/uts/sun4u/starfire/sys/idn_smr.h index 3deccf8d25..8cef0a7bcf 100644 --- a/usr/src/uts/sun4u/starfire/sys/idn_smr.h +++ b/usr/src/uts/sun4u/starfire/sys/idn_smr.h @@ -29,8 +29,6 @@ #ifndef _SYS_IDN_SMR_H #define _SYS_IDN_SMR_H -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/sysmacros.h> #ifdef __cplusplus @@ -64,7 +62,8 @@ typedef uint_t smr_offset_t; #define IDN_BUF2DATA(b, o) ((caddr_t)((uintptr_t)(b) + (uintptr_t)(o))) #define IDN_BUF2HDR(b) ((smr_pkthdr_t *)(b)) -#define IDN_CKSUM_PKT_COUNT (((int)&((smr_pkthdr_t *)(0))->b_cksum) / 2) +#define IDN_CKSUM_PKT_COUNT (((int)(uintptr_t) \ + &((smr_pkthdr_t *)(0))->b_cksum) / 2) #define IDN_CKSUM_PKT(h) \ (IDN_CHECKSUM ? \ idn_cksum((ushort_t *)(h), IDN_CKSUM_PKT_COUNT) : 0) |