2002-10-01 02:35:26

by David Gibson

[permalink] [raw]
Subject: [TRIVIAL] Squash highmem related warnings

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
[email protected] | solution which is simple, neat and
| wrong.
http://www.ozlabs.org/people/dgibson