diff options
| author | Dave Jones <davej@redhat.com> | 2006-06-29 22:01:54 +0200 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-06-29 22:01:54 +0200 |
| commit | 55b4d6a52195a8f277ffddf755ddaff359878f41 (patch) | |
| tree | 06a3183a562f8da4688f65023f7a18dcad702956 /include/asm-ppc/pgtable.h | |
| parent | [AGPGART] Make AGP depend on PCI (diff) | |
| parent | [PATCH] KConfig: Spellchecking 'similarity' and 'independent' (diff) | |
| download | linux-55b4d6a52195a8f277ffddf755ddaff359878f41.tar.xz linux-55b4d6a52195a8f277ffddf755ddaff359878f41.zip | |
Merge ../linus
Conflicts:
drivers/char/agp/Kconfig
Diffstat (limited to 'include/asm-ppc/pgtable.h')
| -rw-r--r-- | include/asm-ppc/pgtable.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/asm-ppc/pgtable.h b/include/asm-ppc/pgtable.h index 570b355162fa..51fa7c662917 100644 --- a/include/asm-ppc/pgtable.h +++ b/include/asm-ppc/pgtable.h @@ -4,7 +4,6 @@ #include <asm-generic/4level-fixup.h> -#include <linux/config.h> #ifndef __ASSEMBLY__ #include <linux/sched.h> @@ -663,7 +662,7 @@ static inline int __ptep_test_and_clear_young(unsigned int context, unsigned lon return (old & _PAGE_ACCESSED) != 0; } #define ptep_test_and_clear_young(__vma, __addr, __ptep) \ - __ptep_test_and_clear_young((__vma)->vm_mm->context, __addr, __ptep) + __ptep_test_and_clear_young((__vma)->vm_mm->context.id, __addr, __ptep) #define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_DIRTY static inline int ptep_test_and_clear_dirty(struct vm_area_struct *vma, |