mm: Prepare decoupling the page fault disabling logic

Add a pagefault_disabled variable to task_struct to allow decoupling
the pagefault-disabled logic from the preempt count.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Anders Roxell <anders.roxell@linaro.org>

1 files changed, 30 insertions, 0 deletions

diff --git a/mm/memory.c b/mm/memory.c
index 90fb265b32b6..922073f7d1c5 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -3244,6 +3244,36 @@ unlock:
 	return 0;
 }
 
+void pagefault_disable(void)
+{
+	preempt_count_inc();
+	current->pagefault_disabled++;
+	/*
+	 * make sure to have issued the store before a pagefault
+	 * can hit.
+	 */
+	barrier();
+}
+EXPORT_SYMBOL(pagefault_disable);
+
+void pagefault_enable(void)
+{
+#ifndef CONFIG_PREEMPT
+	/*
+	 * make sure to issue those last loads/stores before enabling
+	 * the pagefault handler again.
+	 */
+	barrier();
+	current->pagefault_disabled--;
+	preempt_count_dec();
+#else
+	barrier();
+	current->pagefault_disabled--;
+	preempt_enable();
+#endif
+}
+EXPORT_SYMBOL(pagefault_enable);
+
 /*
  * By the time we get here, we already hold the mm semaphore
  *