---

yaml --- r: 161629 b: refs/heads/master c: fe87f94 h: refs/heads/master i: 161627: b3dbf21 v: v3
git-mirror · Jun 24, 2009 · 2dff565 · 2dff565
1 parent ed7528d
commit 2dff565
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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;
 
 /*