Print this page
patch lower-case-segops

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/os/watchpoint.c
          +++ new/usr/src/uts/common/os/watchpoint.c
↓ open down ↓ 299 lines elided ↑ open up ↑
 300  300                  if (pwp->wp_oprot != 0) {       /* if page exists */
 301  301                          struct seg *seg;
 302  302                          uint_t oprot;
 303  303                          int err, retrycnt = 0;
 304  304  
 305  305                          AS_LOCK_EXIT(as, &as->a_lock);
 306  306                          AS_LOCK_ENTER(as, &as->a_lock, RW_WRITER);
 307  307                  retry:
 308  308                          seg = as_segat(as, addr);
 309  309                          ASSERT(seg != NULL);
 310      -                        SEGOP_GETPROT(seg, addr, 0, &oprot);
      310 +                        segop_getprot(seg, addr, 0, &oprot);
 311  311                          if (prot != oprot) {
 312      -                                err = SEGOP_SETPROT(seg, addr, PAGESIZE, prot);
      312 +                                err = segop_setprot(seg, addr, PAGESIZE, prot);
 313  313                                  if (err == IE_RETRY) {
 314  314                                          ASSERT(retrycnt == 0);
 315  315                                          retrycnt++;
 316  316                                          goto retry;
 317  317                                  }
 318  318                          }
 319  319                          AS_LOCK_EXIT(as, &as->a_lock);
 320  320                  } else
 321  321                          AS_LOCK_EXIT(as, &as->a_lock);
 322  322  
↓ open down ↓ 72 lines elided ↑ open up ↑
 395  395          pwp = p->p_wprot;
 396  396          while (pwp != NULL) {
 397  397  
 398  398                  vaddr = pwp->wp_vaddr;
 399  399                  retrycnt = 0;
 400  400          retry:
 401  401                  ASSERT(pwp->wp_flags & WP_SETPROT);
 402  402                  if ((seg = as_segat(as, vaddr)) != NULL &&
 403  403                      !(pwp->wp_flags & WP_NOWATCH)) {
 404  404                          prot = pwp->wp_prot;
 405      -                        err = SEGOP_SETPROT(seg, vaddr, PAGESIZE, prot);
      405 +                        err = segop_setprot(seg, vaddr, PAGESIZE, prot);
 406  406                          if (err == IE_RETRY) {
 407  407                                  ASSERT(retrycnt == 0);
 408  408                                  retrycnt++;
 409  409                                  goto retry;
 410  410                          }
 411  411                  }
 412  412  
 413  413                  next = pwp->wp_list;
 414  414  
 415  415                  if (pwp->wp_read + pwp->wp_write + pwp->wp_exec == 0) {
↓ open down ↓ 1324 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX