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>

*** 22,31 ****
--- 22,32 ----
   * Copyright (c) 1992, 2010, Oracle and/or its affiliates. All rights reserved.
   */
  /*
   * Copyright (c) 2010, Intel Corporation.
   * All rights reserved.
+  * Copyright (c) 2014, Joyent, Inc. All rights reserved.
   */
  
  /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */
  /*      All Rights Reserved   */
  
*** 621,634 ****
  
  void
  map_addr(caddr_t *addrp, size_t len, offset_t off, int vacalign, uint_t flags)
  {
          struct proc *p = curproc;
!         caddr_t userlimit = (flags & _MAP_LOW32) ?
!             (caddr_t)_userlimit32 : p->p_as->a_userlimit;
! 
!         map_addr_proc(addrp, len, off, vacalign, userlimit, curproc, flags);
  }
  
  /*ARGSUSED*/
  int
  map_addr_vacalign_check(caddr_t addr, u_offset_t off)
--- 622,633 ----
  
  void
  map_addr(caddr_t *addrp, size_t len, offset_t off, int vacalign, uint_t flags)
  {
          struct proc *p = curproc;
!         map_addr_proc(addrp, len, off, vacalign,
!             map_userlimit(p, p->p_as, flags), curproc, flags);
  }
  
  /*ARGSUSED*/
  int
  map_addr_vacalign_check(caddr_t addr, u_offset_t off)