aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2013-01-10 09:50:51 +0100
committerSteven Rostedt <rostedt@goodmis.org>2013-02-04 13:52:17 -0500
commit5498f7d9f1d1ceb90e5cfbdd4f705cab831f76f2 (patch)
tree284eebc2d17599f5094cca4e88c292c8a371b4fc
parent425faf876a8999a668f3be9300fd5464550645bd (diff)
mm: swap: Initialize local locks early
Cc: stable-rt@vger.kernel.org Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
-rw-r--r--mm/swap.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/mm/swap.c b/mm/swap.c
index 2051da9c48e2..62dc70c757d3 100644
--- a/mm/swap.c
+++ b/mm/swap.c
@@ -767,6 +767,15 @@ unsigned pagevec_lookup_tag(struct pagevec *pvec, struct address_space *mapping,
}
EXPORT_SYMBOL(pagevec_lookup_tag);
+/* Early setup for the local locks */
+static int __init swap_init_locks(void)
+{
+ local_irq_lock_init(rotate_lock);
+ local_irq_lock_init(swap_lock);
+ return 1;
+}
+early_initcall(swap_init_locks);
+
/*
* Perform any setup for the swap system
*/
@@ -774,9 +783,6 @@ void __init swap_setup(void)
{
unsigned long megs = totalram_pages >> (20 - PAGE_SHIFT);
- local_irq_lock_init(rotate_lock);
- local_irq_lock_init(swap_lock);
-
#ifdef CONFIG_SWAP
bdi_init(swapper_space.backing_dev_info);
#endif