memory_bm_test_bit_index() need 3 args

Julien DÉCHARNE <[email protected]> Mon, 4 Jun 2012 02:08:10 +0200
Newsgroups gmane.linux.swsusp.devel
Message-ID <[email protected]>
Hi,

I try to compile branch tuxonice-3.3 from github (last commit Friday 1 Jun.)
I believe there's a typo in include/linux/tuxonice.h, because with
CONFIG_TOI_ZRAM_SUPPORT defined, macro PagePrecompressed(page, cpu) expand as :

(precompressed_map ? \
	memory_bm_test_bit_index(precompressed_map, page_to_pfn(page)) : 0, cpu)

This seems more correct :

(precompressed_map ? \                                                 
	memory_bm_test_bit_index(precompressed_map, page_to_pfn(page), cpu) : 0)


... At least as far I understand. Anyway branch tuxonice-head won't compile with
CONFIG_TOI_ZRAM_SUPPORT defined (first error is too few arguments for
memory_bm_test_bit_index()). On the other hand, without this typo branch
tuxonice-3.3 compile, boot and run. I have cycled suspend/resume without any
problems - so far.

By the way, thanks for your work Nigel, and please continue !

_______________________________________________
TuxOnIce-devel mailing list
[email protected]
http://lists.tuxonice.net/listinfo/tuxonice-devel
typo_include_linux_tuxonice_h.patch (text/plain, 683 B)
diff --git i/include/linux/tuxonice.h w/include/linux/tuxonice.h
index 81ba1f4..b4cd933 100644
--- i/include/linux/tuxonice.h
+++ w/include/linux/tuxonice.h
@@ -14,7 +14,7 @@ extern struct memory_bitmap *precompressed_map;
 #ifdef CONFIG_TOI_ZRAM_SUPPORT
 extern void memory_bm_set_bit(struct memory_bitmap *bm, unsigned long pfn);
 #define PagePrecompressed(page, cpu) (precompressed_map ? \
-		memory_bm_test_bit_index(precompressed_map, page_to_pfn(page)) : 0, cpu)
+		memory_bm_test_bit_index(precompressed_map, page_to_pfn(page), cpu) : 0)
 #define SetPagePrecompressed(page) \
 	(memory_bm_set_bit(precompressed_map, page_to_pfn(page)))
 #define ClearPagePrecompressed(page) \
signature.asc (application/pgp-signature, 198 B)
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)

iEYEARECAAYFAk/L/GoACgkQA+uP/ToGvd7m/gCgxt7uuNYIH6zc+Y3Sz3kV4Df2
UAEAoLvjjpAC6WDruLaHdK42d1OwJZVj
=lbzV
-----END PGP SIGNATURE-----