diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-11 17:01:10 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-11 17:01:10 -0500 |
| commit | 5ea8d3759244590defd369828c965101c97b65e1 (patch) | |
| tree | 534f4fea14ee177f12ad16304f159aaefb7f1f8f /arch/x86/mm/gup.c | |
| parent | f2d6cff7f5255985939fb752daee4fab397ed61d (diff) | |
| parent | 681ee44d40d7c93b42118320e4620d07d8704fd6 (diff) | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, apic: Don't use logical-flat mode when CPU hotplug may exceed 8 CPUs
x86-32: Make AT_VECTOR_SIZE_ARCH=2
x86/agp: Fix amd64-agp module initialization regression
x86, doc: Fix minor spelling error in arch/x86/mm/gup.c
Diffstat (limited to 'arch/x86/mm/gup.c')
| -rw-r--r-- | arch/x86/mm/gup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mm/gup.c b/arch/x86/mm/gup.c index 71da1bca13cb..738e6593799d 100644 --- a/arch/x86/mm/gup.c +++ b/arch/x86/mm/gup.c | |||
| @@ -18,7 +18,7 @@ static inline pte_t gup_get_pte(pte_t *ptep) | |||
| 18 | #else | 18 | #else |
| 19 | /* | 19 | /* |
| 20 | * With get_user_pages_fast, we walk down the pagetables without taking | 20 | * With get_user_pages_fast, we walk down the pagetables without taking |
| 21 | * any locks. For this we would like to load the pointers atoimcally, | 21 | * any locks. For this we would like to load the pointers atomically, |
| 22 | * but that is not possible (without expensive cmpxchg8b) on PAE. What | 22 | * but that is not possible (without expensive cmpxchg8b) on PAE. What |
| 23 | * we do have is the guarantee that a pte will only either go from not | 23 | * we do have is the guarantee that a pte will only either go from not |
| 24 | * present to present, or present to not present or both -- it will not | 24 | * present to present, or present to not present or both -- it will not |