Merge branches 'master' and 'suser_to_priv'

Conflicts:

	sys/netinet/ip_carp.c
	sys/platform/pc64/amd64/machdep.c

diff --cc sys/dev/misc/syscons/syscons.c
Simple merge

diff --cc sys/dev/netif/cx/cx.c
Simple merge

diff --cc sys/dev/netif/wi/if_wi.c
Simple merge

diff --cc sys/dev/netif/wl/if_wl.c
Simple merge

diff --cc sys/kern/vfs_syscalls.c
Simple merge

diff --cc sys/kern/vfs_vnops.c
Simple merge

diff --cc sys/net/bridge/if_bridge.c
Simple merge

diff --cc sys/netinet/in.c
Simple merge

diff --cc sys/netinet/ip_carp.c
index 8cfa4e0,cf9747c..789110f
--- 1/sys/netinet/ip_carp.c
--- 2/sys/netinet/ip_carp.c
+++ b/sys/netinet/ip_carp.c
@@@ -1798,16 -1730,13 +1799,16 @@@ carp_ioctl(struct ifnet *ifp, u_long cm
                break;
  
        case SIOCSVH:
-               error = suser_cred(cr, NULL_CRED_OKAY);
+               error = priv_check_cred(cr, PRIV_ROOT, NULL_CRED_OKAY);
                if (error)
                        break;
 -              if ((error = copyin(ifr->ifr_data, &carpr, sizeof carpr)))
 +              error = copyin(ifr->ifr_data, &carpr, sizeof(carpr));
 +              if (error)
                        break;
 +
                error = 1;
 -              if (sc->sc_state != INIT && carpr.carpr_state != sc->sc_state) {
 +              if ((ifp->if_flags & IFF_RUNNING) &&
 +                  sc->sc_state != INIT && carpr.carpr_state != sc->sc_state) {
                        switch (carpr.carpr_state) {
                        case BACKUP:
                                callout_stop(&sc->sc_ad_tmo);
@@@ -1875,13 -1804,11 +1876,12 @@@
                carpr.carpr_vhid = sc->sc_vhid;
                carpr.carpr_advbase = sc->sc_advbase;
                carpr.carpr_advskew = sc->sc_advskew;
- 
-               error = suser_cred(cr, NULL_CRED_OKAY);
+               error = priv_check_cred(cr, PRIV_ROOT, NULL_CRED_OKAY);
                if (error == 0) {
                        bcopy(sc->sc_key, carpr.carpr_key,
 -                          sizeof(carpr.carpr_key));
 +                            sizeof(carpr.carpr_key));
                }
 +
                error = copyout(&carpr, ifr->ifr_data, sizeof(carpr));
                break;
  

diff --cc sys/netinet/ip_output.c
Simple merge

diff --cc sys/netinet/tcp_subr.c
Simple merge

diff --cc sys/netinet6/in6.c
Simple merge

diff --cc sys/netinet6/in6_src.c
Simple merge

diff --cc sys/netinet6/ip6_input.c
Simple merge

diff --cc sys/netproto/ipx/ipx_usrreq.c
index 0b90a0f,0326f32..4a0f6c1
--- 1/sys/netproto/ipx/ipx_usrreq.c
--- 2/sys/netproto/ipx/ipx_usrreq.c
+++ b/sys/netproto/ipx/ipx_usrreq.c
@@@ -595,9 -596,9 +596,9 @@@ static in
  ripx_attach(struct socket *so, int proto, struct pru_attach_info *ai)
  {
        int error = 0;
 -      struct ipxpcb *ipxp = sotoipxpcb(so);
 +      struct ipxpcb *ipxp;
  
-       if ((error = suser_cred(ai->p_ucred, NULL_CRED_OKAY)) != 0)
+       if ((error = priv_check_cred(ai->p_ucred, PRIV_ROOT, NULL_CRED_OKAY)) != 0)
                return (error);
        crit_enter();
        error = ipx_pcballoc(so, &ipxrawpcb);

diff --cc sys/platform/pc64/amd64/machdep.c
index 7879650,ba4a3e0..ef52ecc
--- 1/sys/platform/pc64/amd64/machdep.c
--- 2/sys/platform/pc64/amd64/machdep.c
+++ b/sys/platform/pc64/amd64/machdep.c
@@@ -2240,10 -2239,11 +2241,10 @@@ set_dbregs(struct lwp *lp, struct dbre
                 * from within kernel mode?
                 */
  
-               if (suser_cred(ucred, 0) != 0) {
+               if (priv_check_cred(ucred, PRIV_ROOT, 0) != 0) {
 -#if JG
 -                      if (dbregs->dr7 & 0x3) {
 +                      if (dbregs->dr[7] & 0x3) {
                                /* dr0 is enabled */
 -                              if (dbregs->dr0 >= VM_MAX_USER_ADDRESS)
 +                              if (dbregs->dr[0] >= VM_MAX_USER_ADDRESS)
                                        return (EINVAL);
                        }
  

diff --cc sys/vfs/hammer/hammer.h
Simple merge

diff --cc sys/vm/vm_swap.c
Simple merge