diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2013-02-13 10:59:53 +0100 |
|---|---|---|
| committer | Steven Rostedt <rostedt@rostedt.homelinux.com> | 2013-05-20 13:47:12 -0400 |
| commit | 68114035b14469a7969ae791cbbd47f8c975a1d3 (patch) | |
| tree | e090bec8c0aac223daeca4719cbaa4e9cfdf3255 | |
| parent | 12b6ad258318c7413c6a4bee626ccd83be435d98 (diff) | |
| download | linux-rt-68114035b14469a7969ae791cbbd47f8c975a1d3.tar.gz | |
x86/32: Use kmap switch for non highmem as well
Even with CONFIG_HIGHMEM=n we need to take care of the "atomic"
mappings which are installed via iomap_atomic.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: stable-rt@vger.kernel.org
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
| -rw-r--r-- | arch/x86/kernel/process_32.c | 2 | ||||
| -rw-r--r-- | include/linux/sched.h | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c index 20f15731ec90..66ee59039965 100644 --- a/arch/x86/kernel/process_32.c +++ b/arch/x86/kernel/process_32.c @@ -340,7 +340,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p) task_thread_info(next_p)->flags & _TIF_WORK_CTXSW_NEXT)) __switch_to_xtra(prev_p, next_p, tss); -#if defined CONFIG_PREEMPT_RT_FULL && defined CONFIG_HIGHMEM +#ifdef CONFIG_PREEMPT_RT_FULL /* * Save @prev's kmap_atomic stack */ diff --git a/include/linux/sched.h b/include/linux/sched.h index 380e5039a9bd..41c097989f60 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -1608,9 +1608,11 @@ struct task_struct { struct rcu_head put_rcu; int softirq_nestcnt; #endif -#if defined CONFIG_PREEMPT_RT_FULL && defined CONFIG_HIGHMEM +#ifdef CONFIG_PREEMPT_RT_FULL +# if defined CONFIG_HIGHMEM || defined CONFIG_X86_32 int kmap_idx; pte_t kmap_pte[KM_TYPE_NR]; +# endif #endif #ifdef CONFIG_DEBUG_PREEMPT |