diff options
| author | Keith M Wesolowski <wesolows@foobazco.org> | 2013-05-29 21:16:24 +0000 |
|---|---|---|
| committer | Keith M Wesolowski <wesolows@foobazco.org> | 2013-05-29 21:16:28 +0000 |
| commit | 3473893ed8fb9230af75cbb23e51e11ec794c64e (patch) | |
| tree | 01a2b044fd9ffcd5f3191bb548bd6d0a2ae2fa3d | |
| parent | 8ce6db120ea01061c25287455272c819c2950e1e (diff) | |
| parent | 2974b68dd4245e041051c854ef990e47c8271e71 (diff) | |
| download | illumos-joyent-3473893ed8fb9230af75cbb23e51e11ec794c64e.tar.gz | |
[illumos-gate merge]release-20130530
commit 2974b68dd4245e041051c854ef990e47c8271e71
3680 Want a library to allow programatic access to the pci database (fix sparc pkg)
3701 Chelsio Terminator 4 NIC driver for illumos (fix sparc pkg)
3676 dt_print_enum hardcodes a value of zero (fix sparc lint)
| -rw-r--r-- | exception_lists/packaging | 6 | ||||
| -rw-r--r-- | usr/src/lib/libdtrace/common/dt_print.c | 2 | ||||
| -rw-r--r-- | usr/src/pkg/manifests/driver-network-cxgbe.mf | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/exception_lists/packaging b/exception_lists/packaging index 56707cd0f6..a9eef935af 100644 --- a/exception_lists/packaging +++ b/exception_lists/packaging @@ -986,8 +986,10 @@ usr/lib/amd64/llib-lsaveargs.ln i386 # libpcidb is private # usr/include/pcidb.h -usr/lib/amd64/libpcidb.so -usr/lib/amd64/llib-lpcidb.ln +usr/lib/amd64/libpcidb.so i386 +usr/lib/amd64/llib-lpcidb.ln i386 +usr/lib/sparcv9/libpcidb.so sparc +usr/lib/sparcv9/llib-lpcidb.ln sparc usr/lib/libpcidb.so usr/lib/llib-lpcidb usr/lib/llib-lpcidb.ln diff --git a/usr/src/lib/libdtrace/common/dt_print.c b/usr/src/lib/libdtrace/common/dt_print.c index ccfa3da39d..e258f9ac54 100644 --- a/usr/src/lib/libdtrace/common/dt_print.c +++ b/usr/src/lib/libdtrace/common/dt_print.c @@ -493,9 +493,11 @@ dt_print_enum(ctf_id_t base, ulong_t off, dt_printarg_t *pap) value = *(uint8_t *)addr; break; case sizeof (uint16_t): + /* LINTED - alignment */ value = *(uint16_t *)addr; break; case sizeof (int32_t): + /* LINTED - alignment */ value = *(int32_t *)addr; break; default: diff --git a/usr/src/pkg/manifests/driver-network-cxgbe.mf b/usr/src/pkg/manifests/driver-network-cxgbe.mf index 5e75c3e528..2570eb4c17 100644 --- a/usr/src/pkg/manifests/driver-network-cxgbe.mf +++ b/usr/src/pkg/manifests/driver-network-cxgbe.mf @@ -20,7 +20,7 @@ set name=pkg.description \ set name=pkg.summary value="Chelsio Terminator 4 10GE NIC Driver" set name=info.classification \ value=org.opensolaris.category.2008:Drivers/Networking -set name=variant.arch value=$(ARCH) +set name=variant.arch value=i386 dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys |