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 ↓ 16 lines elided ↑ open up ↑
  17   17   * fields enclosed by brackets "[]" replaced with your own identifying
  18   18   * information: Portions Copyright [yyyy] [name of copyright owner]
  19   19   *
  20   20   * CDDL HEADER END
  21   21   */
  22   22  /*
  23   23   * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  24   24   * Use is subject to license terms.
  25   25   */
  26   26  
  27      -#pragma ident   "%Z%%M% %I%     %E% SMI"
  28      -
  29   27  #include <sys/types.h>
  30   28  #include <sys/t_lock.h>
  31   29  #include <sys/param.h>
  32   30  #include <sys/cred.h>
  33   31  #include <sys/debug.h>
  34   32  #include <sys/inline.h>
  35   33  #include <sys/kmem.h>
  36   34  #include <sys/proc.h>
  37   35  #include <sys/regset.h>
  38   36  #include <sys/sysmacros.h>
↓ open down ↓ 265 lines elided ↑ open up ↑
 304  302                  if (pwp->wp_oprot != 0) {       /* if page exists */
 305  303                          struct seg *seg;
 306  304                          uint_t oprot;
 307  305                          int err, retrycnt = 0;
 308  306  
 309  307                          AS_LOCK_EXIT(as, &as->a_lock);
 310  308                          AS_LOCK_ENTER(as, &as->a_lock, RW_WRITER);
 311  309                  retry:
 312  310                          seg = as_segat(as, addr);
 313  311                          ASSERT(seg != NULL);
 314      -                        SEGOP_GETPROT(seg, addr, 0, &oprot);
      312 +                        (void) segop_getprot(seg, addr, 0, &oprot);
 315  313                          if (prot != oprot) {
 316      -                                err = SEGOP_SETPROT(seg, addr, PAGESIZE, prot);
      314 +                                err = segop_setprot(seg, addr, PAGESIZE, prot);
 317  315                                  if (err == IE_RETRY) {
 318  316                                          ASSERT(retrycnt == 0);
 319  317                                          retrycnt++;
 320  318                                          goto retry;
 321  319                                  }
 322  320                          }
 323  321                          AS_LOCK_EXIT(as, &as->a_lock);
 324  322                  } else
 325  323                          AS_LOCK_EXIT(as, &as->a_lock);
 326  324  
↓ open down ↓ 72 lines elided ↑ open up ↑
 399  397          pwp = p->p_wprot;
 400  398          while (pwp != NULL) {
 401  399  
 402  400                  vaddr = pwp->wp_vaddr;
 403  401                  retrycnt = 0;
 404  402          retry:
 405  403                  ASSERT(pwp->wp_flags & WP_SETPROT);
 406  404                  if ((seg = as_segat(as, vaddr)) != NULL &&
 407  405                      !(pwp->wp_flags & WP_NOWATCH)) {
 408  406                          prot = pwp->wp_prot;
 409      -                        err = SEGOP_SETPROT(seg, vaddr, PAGESIZE, prot);
      407 +                        err = segop_setprot(seg, vaddr, PAGESIZE, prot);
 410  408                          if (err == IE_RETRY) {
 411  409                                  ASSERT(retrycnt == 0);
 412  410                                  retrycnt++;
 413  411                                  goto retry;
 414  412                          }
 415  413                  }
 416  414  
 417  415                  next = pwp->wp_list;
 418  416  
 419  417                  if (pwp->wp_read + pwp->wp_write + pwp->wp_exec == 0) {
↓ open down ↓ 1325 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX