diff --git a/[refs] b/[refs]
index 6371eeb2257d..24f2460bdca0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 46a350ef9803a2526a128c55cdb27dd73b2ad966
+refs/heads/master: e74ca2b49b8a38e9ba0bc039a00498c21140f1d6
diff --git a/trunk/mm/swap_state.c b/trunk/mm/swap_state.c
index d7af296833fc..e0e1583f32c2 100644
--- a/trunk/mm/swap_state.c
+++ b/trunk/mm/swap_state.c
@@ -148,8 +148,7 @@ int add_to_swap(struct page * page, gfp_t gfp_mask)
 	swp_entry_t entry;
 	int err;
 
-	if (!PageLocked(page))
-		BUG();
+	BUG_ON(!PageLocked(page));
 
 	for (;;) {
 		entry = get_swap_page();