diff --git a/[refs] b/[refs] index ea27e51c07f7..1f985dbe5ab5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3a4fa0a25da81600ea0bcd75692ae8ca6050d165 +refs/heads/master: 8518609deeacebafd71855f87cc411adb0c3be4e diff --git a/trunk/mm/nommu.c b/trunk/mm/nommu.c index 42fb84e9e815..8f09333f78e1 100644 --- a/trunk/mm/nommu.c +++ b/trunk/mm/nommu.c @@ -175,7 +175,8 @@ EXPORT_SYMBOL(vfree); void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot) { /* - * kmalloc doesn't like __GFP_HIGHMEM for some reason + * You can't specify __GFP_HIGHMEM with kmalloc() since kmalloc() + * returns only a logical address. */ return kmalloc(size, (gfp_mask | __GFP_COMP) & ~__GFP_HIGHMEM); }