diff --git a/[refs] b/[refs]
index 1db086a93598..eefc20221011 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d4f3e9b735c72823aab597bfa4860d184658a609
+refs/heads/master: 298969727e7b855d53f3becfa92c055914082ec4
diff --git a/trunk/net/ipv4/tcp_lp.c b/trunk/net/ipv4/tcp_lp.c
index 649ebaed1df1..308fb7e071c5 100644
--- a/trunk/net/ipv4/tcp_lp.c
+++ b/trunk/net/ipv4/tcp_lp.c
@@ -327,7 +327,7 @@ static struct tcp_congestion_ops tcp_lp = {
 
 static int __init tcp_lp_register(void)
 {
-	BUG_ON(sizeof(struct lp) > ICSK_CA_PRIV_SIZE);
+	BUILD_BUG_ON(sizeof(struct lp) > ICSK_CA_PRIV_SIZE);
 	return tcp_register_congestion_control(&tcp_lp);
 }