Print this page
8368 remove warlock leftovers from usr/src/uts

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/io/1394/nx1394.c
          +++ new/usr/src/uts/common/io/1394/nx1394.c
↓ open down ↓ 301 lines elided ↑ open up ↑
 302  302   *    handle request up the device by calling ddi_dma_allochdl().
 303  303   */
 304  304  static int
 305  305  nx1394_dma_allochdl(dev_info_t *dip, dev_info_t *rdip, ddi_dma_attr_t *attr,
 306  306      int (*waitfnp)(caddr_t), caddr_t arg, ddi_dma_handle_t *handlep)
 307  307  {
 308  308          s1394_hal_t *hal;
 309  309          ddi_dma_attr_t *hal_attr;
 310  310          int status;
 311  311  
 312      -        _NOTE(SCHEME_PROTECTS_DATA("unique (per thread)", ddi_dma_attr_t))
 313      -
 314  312          TNF_PROBE_0_DEBUG(nx1394_dma_allochdl_enter, S1394_TNF_SL_NEXUS_STACK,
 315  313              "");
 316  314  
 317  315          /*
 318  316           * If hal calls ddi_dma_alloc_handle, dip == rdip == hal dip.
 319  317           * Unfortunately, we cannot verify this (by way of looking up for hal
 320  318           * dip) here because h1394_attach() may happen much later.
 321  319           */
 322  320          if (dip != rdip) {
 323  321                  hal = s1394_dip_to_hal(ddi_get_parent(rdip));
↓ open down ↓ 241 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX