diff options
| author | Vikram Hegde <Vikram.Hegde@Sun.COM> | 2009-08-31 18:00:04 -0700 |
|---|---|---|
| committer | Vikram Hegde <Vikram.Hegde@Sun.COM> | 2009-08-31 18:00:04 -0700 |
| commit | 8e0f2f7787da52bb1c8d614a544cf64dc78ba342 (patch) | |
| tree | ae169694142f4ead32f5bc5f767a96beb61d0509 /usr/src | |
| parent | 0412ba67681b286c1ebbf47f0f457ca926c22684 (diff) | |
| download | illumos-joyent-8e0f2f7787da52bb1c8d614a544cf64dc78ba342.tar.gz | |
6876176 amd_iommu should use PRIx64
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/uts/intel/io/amd_iommu/amd_iommu_impl.c | 4 | ||||
| -rw-r--r-- | usr/src/uts/intel/io/amd_iommu/amd_iommu_page_tables.c | 11 |
2 files changed, 5 insertions, 10 deletions
diff --git a/usr/src/uts/intel/io/amd_iommu/amd_iommu_impl.c b/usr/src/uts/intel/io/amd_iommu/amd_iommu_impl.c index 4410ee1c0d..8deb468c2f 100644 --- a/usr/src/uts/intel/io/amd_iommu/amd_iommu_impl.c +++ b/usr/src/uts/intel/io/amd_iommu/amd_iommu_impl.c @@ -20,7 +20,7 @@ */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -174,7 +174,7 @@ amd_iommu_setup_passthru(amd_iommu_t *iommu) for (gfxp = gfx_devinfo_list; gfxp; gfxp = gfxp->g_next) { gfxp->g_ref++; - dip = gfxp->g_dip + dip = gfxp->g_dip; if (dip) { amd_iommu_set_passthru(iommu, dip); } diff --git a/usr/src/uts/intel/io/amd_iommu/amd_iommu_page_tables.c b/usr/src/uts/intel/io/amd_iommu/amd_iommu_page_tables.c index f4afc0a842..e59a3dde38 100644 --- a/usr/src/uts/intel/io/amd_iommu/amd_iommu_page_tables.c +++ b/usr/src/uts/intel/io/amd_iommu/amd_iommu_page_tables.c @@ -20,7 +20,7 @@ */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -726,13 +726,8 @@ amd_iommu_lookup_pgtable(amd_iommu_t *iommu, amd_iommu_page_table_t *ppt, pdtep = &(ppt->pt_pgtblva[index]); if (AMD_IOMMU_REG_GET64(pdtep, AMD_IOMMU_PTDE_PR) == 0) { if (amd_iommu_debug & AMD_IOMMU_DEBUG_PAGE_TABLES) { -#ifdef _LP64 - cmn_err(CE_NOTE, "Skipping PR=0 pdte: %p", - (void *)(*pdtep)); -#else - cmn_err(CE_NOTE, "Skipping PR=0 pdte: %llx", - *pdtep); -#endif + cmn_err(CE_NOTE, "Skipping PR=0 pdte: 0x%" + PRIx64, *pdtep); } return (NULL); } |