From 15f618f2f66d1f0aa363caddc92797afa6aeece9 Mon Sep 17 00:00:00 2001 From: "Figo.zhang" Date: Mon, 29 Jun 2009 12:02:55 +0800 Subject: [PATCH] --- yaml --- r: 158721 b: refs/heads/master c: 565b0c1f100408ccbcb04ba458a14da454cb271d h: refs/heads/master i: 158719: 1301b2df38f94690a4123a7fa388df051aa8d193 v: v3 --- [refs] | 2 +- trunk/arch/x86/mm/highmem_32.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 44d6e21fb037..ed9b6325f427 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ce0c0f9eec2f377055e8b23c6fa192202381e022 +refs/heads/master: 565b0c1f100408ccbcb04ba458a14da454cb271d diff --git a/trunk/arch/x86/mm/highmem_32.c b/trunk/arch/x86/mm/highmem_32.c index 58f621e81919..0c6f43cee25d 100644 --- a/trunk/arch/x86/mm/highmem_32.c +++ b/trunk/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)