svn commit: r249327 - in head/sys: net netinet sys

[Gleb Smirnoff]

Author: glebius
Date: Wed Apr 10 08:09:25 2013
New Revision: 249327
URL: http://svnweb.freebsd.org/changeset/base/249327

Log:
  Fix build.

Modified:
  head/sys/net/if_llatbl.h
  head/sys/net/if_var.h
  head/sys/netinet/in_var.h
  head/sys/sys/socketvar.h

Modified: head/sys/net/if_llatbl.h
==============================================================================
--- head/sys/net/if_llatbl.h	Wed Apr 10 07:01:17 2013	(r249326)
+++ head/sys/net/if_llatbl.h	Wed Apr 10 08:09:25 2013	(r249327)
@@ -43,7 +43,7 @@ struct rt_addrinfo;
 struct llentry;
 LIST_HEAD(llentries, llentry);
 
-extern struct rwlock lltable_rwlock;
+extern struct rwlock_padalign lltable_rwlock;
 #define	LLTABLE_RLOCK()		rw_rlock(&lltable_rwlock)
 #define	LLTABLE_RUNLOCK()	rw_runlock(&lltable_rwlock)
 #define	LLTABLE_WLOCK()		rw_wlock(&lltable_rwlock)

Modified: head/sys/net/if_var.h
==============================================================================
--- head/sys/net/if_var.h	Wed Apr 10 07:01:17 2013	(r249326)
+++ head/sys/net/if_var.h	Wed Apr 10 08:09:25 2013	(r249327)
@@ -832,7 +832,7 @@ struct ifmultiaddr {
 
 #ifdef _KERNEL
 
-extern	struct rwlock ifnet_rwlock;
+extern	struct rwlock_padalign ifnet_rwlock;
 extern	struct sx ifnet_sxlock;
 
 #define	IFNET_LOCK_INIT() do {						\

Modified: head/sys/netinet/in_var.h
==============================================================================
--- head/sys/netinet/in_var.h	Wed Apr 10 07:01:17 2013	(r249326)
+++ head/sys/netinet/in_var.h	Wed Apr 10 08:09:25 2013	(r249327)
@@ -116,7 +116,7 @@ VNET_DECLARE(u_long, in_ifaddrhmask);		/
 #define INADDR_HASH(x) \
 	(&V_in_ifaddrhashtbl[INADDR_HASHVAL(x) & V_in_ifaddrhmask])
 
-extern	struct rwlock in_ifaddr_lock;
+extern	struct rwlock_padalign in_ifaddr_lock;
 
 #define	IN_IFADDR_LOCK_ASSERT()	rw_assert(&in_ifaddr_lock, RA_LOCKED)
 #define	IN_IFADDR_RLOCK()	rw_rlock(&in_ifaddr_lock)

Modified: head/sys/sys/socketvar.h
==============================================================================
--- head/sys/sys/socketvar.h	Wed Apr 10 07:01:17 2013	(r249326)
+++ head/sys/sys/socketvar.h	Wed Apr 10 08:09:25 2013	(r249327)
@@ -133,7 +133,7 @@ struct socket {
  * avoid defining a lock order between listen and accept sockets
  * until such time as it proves to be a good idea.
  */
-extern struct mtx accept_mtx;
+extern struct mtx_padalign accept_mtx;
 #define	ACCEPT_LOCK_ASSERT()		mtx_assert(&accept_mtx, MA_OWNED)
 #define	ACCEPT_UNLOCK_ASSERT()		mtx_assert(&accept_mtx, MA_NOTOWNED)
 #define	ACCEPT_LOCK()			mtx_lock(&accept_mtx)