Date: Tue, 1 Oct 2002 12:40:55 +1000
From: David Gibson <david@gibson.dropbear.id.au>
To: Linus Torvalds <torvalds@transmeta.com>
Cc: linux-kernel@vger.kernel.org
Subject: [TRIVIAL] Squash highmem related warnings
Message-ID: <20021001024055.GO10265@zax>
Mail-Followup-To: David Gibson <david@gibson.dropbear.id.au>,
	Linus Torvalds <torvalds@transmeta.com>, linux-kernel@vger.kernel.org
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.4i
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1308
Lines: 30

Linus, please apply.  This adds to the non-highmem version of
kunmap_atomic() a dummy reference to its arguments.  This can prevent
unused variable warnings in its callers, such as in
put_aio_ring_event() in fs/aio.c.

diff -urN /home/dgibson/kernel/linuxppc-2.5/include/linux/highmem.h linux-bluefish/include/linux/highmem.h
--- /home/dgibson/kernel/linuxppc-2.5/include/linux/highmem.h	2002-09-20 14:36:09.000000000 +1000
+++ linux-bluefish/include/linux/highmem.h	2002-10-01 12:17:11.000000000 +1000
@@ -25,7 +25,8 @@
 #define kunmap(page) do { (void) (page); } while (0)
 
 #define kmap_atomic(page, idx)		page_address(page)
-#define kunmap_atomic(addr, idx)	do { } while (0)
+#define kunmap_atomic(addr, idx)	do { /* avoid unused variable warnings in caller: */ \
+					     (void)(addr); } while (0)
 #define kmap_atomic_to_page(ptr)	virt_to_page(ptr)
 
 #endif /* CONFIG_HIGHMEM */


-- 
David Gibson			| For every complex problem there is a
david@gibson.dropbear.id.au	| solution which is simple, neat and
				| wrong.
http://www.ozlabs.org/people/dgibson
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/