From 8d1185c26052d8fcf55e894d2616b89079216029 Mon Sep 17 00:00:00 2001 From: Arjan van de Ven Date: Fri, 25 Jul 2008 19:45:37 -0700 Subject: [PATCH] --- yaml --- r: 106197 b: refs/heads/master c: 4c8573e25f27b60b495aaa23089032f685ffd5ba h: refs/heads/master i: 106195: c795c0d9b77ecf64945f61fe8d9227564ac48b73 v: v3 --- [refs] | 2 +- trunk/mm/vmalloc.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 559244dac660..0a82be552d99 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b8c512f6190e313df69060bae4a161c5c044e272 +refs/heads/master: 4c8573e25f27b60b495aaa23089032f685ffd5ba diff --git a/trunk/mm/vmalloc.c b/trunk/mm/vmalloc.c index 35f293816294..85b9a0d2c877 100644 --- a/trunk/mm/vmalloc.c +++ b/trunk/mm/vmalloc.c @@ -381,16 +381,14 @@ static void __vunmap(const void *addr, int deallocate_pages) return; if ((PAGE_SIZE-1) & (unsigned long)addr) { - printk(KERN_ERR "Trying to vfree() bad address (%p)\n", addr); - WARN_ON(1); + WARN(1, KERN_ERR "Trying to vfree() bad address (%p)\n", addr); return; } area = remove_vm_area(addr); if (unlikely(!area)) { - printk(KERN_ERR "Trying to vfree() nonexistent vm area (%p)\n", + WARN(1, KERN_ERR "Trying to vfree() nonexistent vm area (%p)\n", addr); - WARN_ON(1); return; }