From 2dff565ec8a9c5aa2c4ee8b70fb4d809d9f4f78f Mon Sep 17 00:00:00 2001 From: Jesper Nilsson Date: Wed, 24 Jun 2009 15:13:41 +0900 Subject: [PATCH] --- yaml --- r: 161629 b: refs/heads/master c: fe87f94f341a4b4097285b46f003059b26eb59bf h: refs/heads/master i: 161627: b3dbf2102e72399867c6504a3e94ecb4ac6b861c v: v3 --- [refs] | 2 +- trunk/arch/cris/include/asm/mmu_context.h | 3 ++- trunk/arch/cris/mm/fault.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6f6d23425e87..4c553fc00e02 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 405d967dc70002991f8fc35c20e0d3cbc7614f63 +refs/heads/master: fe87f94f341a4b4097285b46f003059b26eb59bf diff --git a/trunk/arch/cris/include/asm/mmu_context.h b/trunk/arch/cris/include/asm/mmu_context.h index 72ba08dcfd18..1d45fd6365b7 100644 --- a/trunk/arch/cris/include/asm/mmu_context.h +++ b/trunk/arch/cris/include/asm/mmu_context.h @@ -17,7 +17,8 @@ extern void switch_mm(struct mm_struct *prev, struct mm_struct *next, * registers like cr3 on the i386 */ -extern volatile DEFINE_PER_CPU(pgd_t *,current_pgd); /* defined in arch/cris/mm/fault.c */ +/* defined in arch/cris/mm/fault.c */ +DECLARE_PER_CPU(pgd_t *, current_pgd); static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk) { diff --git a/trunk/arch/cris/mm/fault.c b/trunk/arch/cris/mm/fault.c index f925115e3250..4a7cdd9ea1ee 100644 --- a/trunk/arch/cris/mm/fault.c +++ b/trunk/arch/cris/mm/fault.c @@ -29,7 +29,7 @@ extern void die_if_kernel(const char *, struct pt_regs *, long); /* current active page directory */ -volatile DEFINE_PER_CPU(pgd_t *,current_pgd); +DEFINE_PER_CPU(pgd_t *, current_pgd); unsigned long cris_signal_return_page; /*