2006-01-06 23:32:44

by Brian Gerst

[permalink] [raw]
Subject: [PATCH] x86_64: cleanup enter_lazy_tlb()

Move the #ifdef into the function body.

Signed-off-by: Brian Gerst <[email protected]>

---
commit bcefe96417edca37a3834ba081bc8928cf411183
tree bb6b021c691fa2cbcc85fe6c880a3a548d65bb85
parent 35b05d09cd8b10bebe341d8f315d11497b88f012
author Brian Gerst <[email protected]> Fri, 06 Jan 2006 17:20:20 -0500
committer Brian Gerst <[email protected]> Fri, 06 Jan 2006 17:20:20 -0500

include/asm-x86_64/mmu_context.h | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/include/asm-x86_64/mmu_context.h b/include/asm-x86_64/mmu_context.h
index b630d52..16e4be4 100644
--- a/include/asm-x86_64/mmu_context.h
+++ b/include/asm-x86_64/mmu_context.h
@@ -15,18 +15,13 @@
int init_new_context(struct task_struct *tsk, struct mm_struct *mm);
void destroy_context(struct mm_struct *mm);

-#ifdef CONFIG_SMP
-
static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
{
+#ifdef CONFIG_SMP
if (read_pda(mmu_state) == TLBSTATE_OK)
write_pda(mmu_state, TLBSTATE_LAZY);
-}
-#else
-static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
-{
-}
#endif
+}

static inline void load_cr3(pgd_t *pgd)
{