diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-02-21 11:06:02 -0500 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-02-21 11:06:02 -0500 |
| commit | b13c4595e014fb6f68b6420bb37af77430f9eafb (patch) | |
| tree | 135be379783c9c8f753bb70d4c8b6960b066fccc | |
| parent | b978c77d453d2388cd1ac4798b90a7bb11a82d91 (diff) | |
| download | rt-patches-b13c4595e014fb6f68b6420bb37af77430f9eafb.tar.gz | |
mm: cosmetic relocate page flags disabled var in struct
Put the pf disable var above the IRQTRACE block instead of below,
so that it is beside the mm stuff. No real functional change.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | mm-Prepare-decoupling-the-page-fault-disabling-logic.patch | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/mm-Prepare-decoupling-the-page-fault-disabling-logic.patch b/mm-Prepare-decoupling-the-page-fault-disabling-logic.patch index 1599371..1c9dde7 100644 --- a/mm-Prepare-decoupling-the-page-fault-disabling-logic.patch +++ b/mm-Prepare-decoupling-the-page-fault-disabling-logic.patch @@ -1,4 +1,4 @@ -From c75b8f0fad2de7ac65ee096748b56798254c3588 Mon Sep 17 00:00:00 2001 +From f607d9d941185d9c42df03e8af9dddcd5ca1e499 Mon Sep 17 00:00:00 2001 From: Ingo Molnar <mingo@elte.hu> Date: Fri, 3 Jul 2009 08:30:37 -0500 Subject: [PATCH] mm: Prepare decoupling the page fault disabling logic @@ -13,17 +13,17 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/include/linux/sched.h b/include/linux/sched.h -index 7d22297..dfdeb99 100644 +index 53e6ffe..bdcdabd 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h -@@ -1438,6 +1438,7 @@ struct task_struct { - /* mutex deadlock detection */ - struct mutex_waiter *blocked_on; - #endif +@@ -1224,6 +1224,7 @@ struct task_struct { + struct plist_node pushable_tasks; + + struct mm_struct *mm, *active_mm; + int pagefault_disabled; - #ifdef CONFIG_TRACE_IRQFLAGS - unsigned int irq_events; - unsigned long hardirq_enable_ip; + #if defined(SPLIT_RSS_COUNTING) + struct task_rss_stat rss_stat; + #endif diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h index d512d98..9c7e38a 100644 --- a/include/linux/uaccess.h @@ -70,10 +70,10 @@ index d512d98..9c7e38a 100644 #ifndef ARCH_HAS_NOCACHE_UACCESS diff --git a/kernel/fork.c b/kernel/fork.c -index f88bd98..fe228fd 100644 +index 4c14942..0a1b8d1 100644 --- a/kernel/fork.c +++ b/kernel/fork.c -@@ -1118,6 +1118,7 @@ static struct task_struct *copy_process(unsigned long clone_flags, +@@ -1098,6 +1098,7 @@ static struct task_struct *copy_process(unsigned long clone_flags, p->hardirq_context = 0; p->softirq_context = 0; #endif @@ -82,10 +82,10 @@ index f88bd98..fe228fd 100644 p->lockdep_depth = 0; /* no locks held yet */ p->curr_chain_key = 0; diff --git a/mm/memory.c b/mm/memory.c -index 3e88b30..2c58057 100644 +index 90f674e..17056a3 100644 --- a/mm/memory.c +++ b/mm/memory.c -@@ -3011,6 +3011,35 @@ unlock: +@@ -3107,6 +3107,35 @@ unlock: return 0; } @@ -122,5 +122,5 @@ index 3e88b30..2c58057 100644 * By the time we get here, we already hold the mm semaphore */ -- -1.7.1.1 +1.7.4 |