diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-14 07:59:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-14 07:59:32 -0700 |
| commit | 7dfd54a905be0242bd604557d543c3a2d7b0a540 (patch) | |
| tree | 75906d8bf8d835ae570667ea4d9311d9b443a77a /arch/x86/mm/highmem_32.c | |
| parent | 6512c0d62589c9f4da00328518e492ddd1c01c7f (diff) | |
| parent | 565b0c1f100408ccbcb04ba458a14da454cb271d (diff) | |
| download | linux-7dfd54a905be0242bd604557d543c3a2d7b0a540.tar.gz linux-7dfd54a905be0242bd604557d543c3a2d7b0a540.tar.bz2 linux-7dfd54a905be0242bd604557d543c3a2d7b0a540.zip | |
Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, highmem_32.c: Clean up comment
x86, pgtable.h: Clean up types
x86: Clean up dump_pagetable()
Diffstat (limited to 'arch/x86/mm/highmem_32.c')
| -rw-r--r-- | arch/x86/mm/highmem_32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c index 2112ed55e7ea..1617958a3805 100644 --- a/arch/x86/mm/highmem_32.c +++ b/arch/x86/mm/highmem_32.c @@ -24,7 +24,7 @@ void kunmap(struct page *page) * no global lock is needed and because the kmap code must perform a global TLB * invalidation when the kmap pool wraps. * - * However when holding an atomic kmap is is not legal to sleep, so atomic + * However when holding an atomic kmap it is not legal to sleep, so atomic * kmaps are appropriate for short, tight code paths only. */ void *kmap_atomic_prot(struct page *page, enum km_type type, pgprot_t prot) |