Print this page
8626 make pcplusmp and apix warning-free
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/i86pc/io/apix/apix.c
          +++ new/usr/src/uts/i86pc/io/apix/apix.c
↓ open down ↓ 1598 lines elided ↑ open up ↑
1599 1599  
1600 1600  apix_vector_t *
1601 1601  apix_set_cpu(apix_vector_t *vecp, int new_cpu, int *result)
1602 1602  {
1603 1603          apix_vector_t *newp = NULL;
1604 1604          dev_info_t *dip;
1605 1605          int inum, cap_ptr;
1606 1606          ddi_acc_handle_t handle;
1607 1607          ddi_intr_msix_t *msix_p = NULL;
1608 1608          ushort_t msix_ctrl;
1609      -        uintptr_t off;
1610      -        uint32_t mask;
     1609 +        uintptr_t off = 0;
     1610 +        uint32_t mask = 0;
1611 1611  
1612 1612          ASSERT(LOCK_HELD(&apix_lock));
1613 1613          *result = ENXIO;
1614 1614  
1615 1615          /* Fail if this is an MSI intr and is part of a group. */
1616 1616          if (vecp->v_type == APIX_TYPE_MSI) {
1617 1617                  if (i_ddi_intr_get_current_nintrs(APIX_GET_DIP(vecp)) > 1)
1618 1618                          return (NULL);
1619 1619                  else
1620 1620                          return (apix_grp_set_cpu(vecp, new_cpu, result));
↓ open down ↓ 37 lines elided ↑ open up ↑
1658 1658  
1659 1659  /*
1660 1660   * Set cpu for MSIs
1661 1661   */
1662 1662  apix_vector_t *
1663 1663  apix_grp_set_cpu(apix_vector_t *vecp, int new_cpu, int *result)
1664 1664  {
1665 1665          apix_vector_t *newp, *vp;
1666 1666          uint32_t orig_cpu = vecp->v_cpuid;
1667 1667          int orig_vect = vecp->v_vector;
1668      -        int i, num_vectors, cap_ptr, msi_mask_off;
1669      -        uint32_t msi_pvm;
     1668 +        int i, num_vectors, cap_ptr, msi_mask_off = 0;
     1669 +        uint32_t msi_pvm = 0;
1670 1670          ushort_t msi_ctrl;
1671 1671          ddi_acc_handle_t handle;
1672 1672          dev_info_t *dip;
1673 1673  
1674 1674          APIC_VERBOSE(INTR, (CE_CONT, "apix_grp_set_cpu: oldcpu: %x, vector: %x,"
1675 1675              " newcpu:%x\n", vecp->v_cpuid, vecp->v_vector, new_cpu));
1676 1676  
1677 1677          ASSERT(LOCK_HELD(&apix_lock));
1678 1678  
1679 1679          *result = ENXIO;
↓ open down ↓ 889 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX