diff options
author | Jesper Nilsson <jesper.nilsson@axis.com> | 2009-06-24 02:13:41 -0400 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2009-06-24 02:13:41 -0400 |
commit | fe87f94f341a4b4097285b46f003059b26eb59bf (patch) | |
tree | 9b64106a0d829b4518b974600f4abef04e3f9a2f | |
parent | 405d967dc70002991f8fc35c20e0d3cbc7614f63 (diff) |
CRIS: Change DEFINE_PER_CPU of current_pgd to be non volatile.
The DEFINE_PER_CPU of current_pgd was on CRIS defined using volatile,
which is not needed. Remove volatile.
Tested on an ARTPEC-3 (CRISv32) board.
tj: extern DEFINE_PER_CPU() replaced with DECLARE_PER_CPU()
[ Impact: code cleanup ]
Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
-rw-r--r-- | arch/cris/include/asm/mmu_context.h | 3 | ||||
-rw-r--r-- | arch/cris/mm/fault.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/cris/include/asm/mmu_context.h b/arch/cris/include/asm/mmu_context.h index 72ba08dcfd18..1d45fd6365b7 100644 --- a/arch/cris/include/asm/mmu_context.h +++ b/arch/cris/include/asm/mmu_context.h | |||
@@ -17,7 +17,8 @@ extern void switch_mm(struct mm_struct *prev, struct mm_struct *next, | |||
17 | * registers like cr3 on the i386 | 17 | * registers like cr3 on the i386 |
18 | */ | 18 | */ |
19 | 19 | ||
20 | extern volatile DEFINE_PER_CPU(pgd_t *,current_pgd); /* defined in arch/cris/mm/fault.c */ | 20 | /* defined in arch/cris/mm/fault.c */ |
21 | DECLARE_PER_CPU(pgd_t *, current_pgd); | ||
21 | 22 | ||
22 | static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk) | 23 | static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk) |
23 | { | 24 | { |
diff --git a/arch/cris/mm/fault.c b/arch/cris/mm/fault.c index f925115e3250..4a7cdd9ea1ee 100644 --- a/arch/cris/mm/fault.c +++ b/arch/cris/mm/fault.c | |||
@@ -29,7 +29,7 @@ extern void die_if_kernel(const char *, struct pt_regs *, long); | |||
29 | 29 | ||
30 | /* current active page directory */ | 30 | /* current active page directory */ |
31 | 31 | ||
32 | volatile DEFINE_PER_CPU(pgd_t *,current_pgd); | 32 | DEFINE_PER_CPU(pgd_t *, current_pgd); |
33 | unsigned long cris_signal_return_page; | 33 | unsigned long cris_signal_return_page; |
34 | 34 | ||
35 | /* | 35 | /* |