Print this page
OS-3602 lxbrand LTP recv* tests failing on MSG_ERRQUEUE flag
OS-3600 lxbrand 32bit cannot boot with OS-3594 fix
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Reviewed by: Bryan Cantrill <bryan@joyent.com>

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/i86pc/vm/vm_machdep.c
          +++ new/usr/src/uts/i86pc/vm/vm_machdep.c
↓ open down ↓ 16 lines elided ↑ open up ↑
  17   17   * information: Portions Copyright [yyyy] [name of copyright owner]
  18   18   *
  19   19   * CDDL HEADER END
  20   20   */
  21   21  /*
  22   22   * Copyright (c) 1992, 2010, Oracle and/or its affiliates. All rights reserved.
  23   23   */
  24   24  /*
  25   25   * Copyright (c) 2010, Intel Corporation.
  26   26   * All rights reserved.
       27 + * Copyright (c) 2014, Joyent, Inc. All rights reserved.
  27   28   */
  28   29  
  29   30  /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */
  30   31  /*      All Rights Reserved   */
  31   32  
  32   33  /*
  33   34   * Portions of this source code were derived from Berkeley 4.3 BSD
  34   35   * under license from the Regents of the University of California.
  35   36   */
  36   37  
↓ open down ↓ 579 lines elided ↑ open up ↑
 616  617          if (mapped_red)
 617  618                  segkp_unmap_red();
 618  619  
 619  620          return (res);
 620  621  }
 621  622  
 622  623  void
 623  624  map_addr(caddr_t *addrp, size_t len, offset_t off, int vacalign, uint_t flags)
 624  625  {
 625  626          struct proc *p = curproc;
 626      -        caddr_t userlimit = (flags & _MAP_LOW32) ?
 627      -            (caddr_t)_userlimit32 : p->p_as->a_userlimit;
 628      -
 629      -        map_addr_proc(addrp, len, off, vacalign, userlimit, curproc, flags);
      627 +        map_addr_proc(addrp, len, off, vacalign,
      628 +            map_userlimit(p, p->p_as, flags), curproc, flags);
 630  629  }
 631  630  
 632  631  /*ARGSUSED*/
 633  632  int
 634  633  map_addr_vacalign_check(caddr_t addr, u_offset_t off)
 635  634  {
 636  635          return (0);
 637  636  }
 638  637  
 639  638  /*
↓ open down ↓ 3349 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX