2 files changed, 6 insertions, 6 deletions

diff --git a/include/asm-x86_64/mmu_context.h b/include/asm-x86_64/mmu_context.h
index 16e4be4de0c5..19f0c83d0792 100644
--- a/include/asm-x86_64/mmu_context.h
+++ b/include/asm-x86_64/mmu_context.h
@@ -34,12 +34,12 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
         unsigned cpu = smp_processor_id();
         if (likely(prev != next)) {
                 /* stop flush ipis for the previous mm */
-                clear_bit(cpu, &prev->cpu_vm_mask);
+                cpu_clear(cpu, prev->cpu_vm_mask);
 #ifdef CONFIG_SMP
                 write_pda(mmu_state, TLBSTATE_OK);
                 write_pda(active_mm, next);
 #endif
-                set_bit(cpu, &next->cpu_vm_mask);
+                cpu_set(cpu, next->cpu_vm_mask);
                 load_cr3(next->pgd);
 
                 if (unlikely(next->context.ldt != prev->context.ldt)) 
@@ -50,7 +50,7 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
                 write_pda(mmu_state, TLBSTATE_OK);
                 if (read_pda(active_mm) != next)
                         out_of_line_bug();
-                if(!test_and_set_bit(cpu, &next->cpu_vm_mask)) {
+                if (!cpu_test_and_set(cpu, next->cpu_vm_mask)) {
                         /* We were in lazy tlb mode and leave_mm disabled 
                          * tlb flush IPI delivery. We must reload CR3
                          * to make sure to use no freed page tables.
diff --git a/include/asm-x86_64/pgtable.h b/include/asm-x86_64/pgtable.h
index a617d364d08d..def903287193 100644
--- a/include/asm-x86_64/pgtable.h
+++ b/include/asm-x86_64/pgtable.h
@@ -293,19 +293,19 @@ static inline int ptep_test_and_clear_dirty(struct vm_area_struct *vma, unsigned
 {
         if (!pte_dirty(*ptep))
                 return 0;
-        return test_and_clear_bit(_PAGE_BIT_DIRTY, ptep);
+        return test_and_clear_bit(_PAGE_BIT_DIRTY, &ptep->pte);
 }
 
 static inline int ptep_test_and_clear_young(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep)
 {
         if (!pte_young(*ptep))
                 return 0;
-        return test_and_clear_bit(_PAGE_BIT_ACCESSED, ptep);
+        return test_and_clear_bit(_PAGE_BIT_ACCESSED, &ptep->pte);
 }
 
 static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addr, pte_t *ptep)
 {
-        clear_bit(_PAGE_BIT_RW, ptep);
+        clear_bit(_PAGE_BIT_RW, &ptep->pte);
 }
 
 /*