Author: wolvverine Date: Wed Jun 29 09:32:22 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- for 2.6.39
---- Files affected:
packages/kernel:
kernel-tuxonice.patch (1.23 -> 1.24)
---- Diffs:
================================================================
Index: packages/kernel/kernel-tuxonice.patch
diff -u packages/kernel/kernel-tuxonice.patch:1.23
packages/kernel/kernel-tuxonice.patch:1.24
--- packages/kernel/kernel-tuxonice.patch:1.23 Fri Mar 25 15:33:15 2011
+++ packages/kernel/kernel-tuxonice.patch Wed Jun 29 11:32:17 2011
@@ -2239,7 +2239,7 @@
obj-$(CONFIG_CRYPTO_MICHAEL_MIC) += michael_mic.o
obj-$(CONFIG_CRYPTO_CRC32C) += crc32c.o
+obj-$(CONFIG_CRYPTO_LZF) += lzf.o
- obj-$(CONFIG_CRYPTO_AUTHENC) += authenc.o
+ obj-$(CONFIG_CRYPTO_AUTHENC) += authenc.o authencesn.o
obj-$(CONFIG_CRYPTO_LZO) += lzo.o
obj-$(CONFIG_CRYPTO_RNG2) += rng.o
diff --git a/crypto/lzf.c b/crypto/lzf.c
@@ -2799,9 +2799,9 @@
--- a/fs/drop_caches.c
+++ b/fs/drop_caches.c
@@ -8,6 +8,7 @@
- #include <linux/writeback.h>
#include <linux/sysctl.h>
#include <linux/gfp.h>
+ #include "internal.h"
+#include <linux/module.h>
/* A global variable is a bit ugly, but it keeps the code simple */
@@ -3203,13 +3203,13 @@
__REQ_MIXED_MERGE, /* merge of different types, fail separately */
__REQ_SECURE, /* secure discard (used with __REQ_DISCARD) */
+ __REQ_TOI, /* TuxOnIce I/O */
+ __REQ_ON_PLUG, /* on plug list */
__REQ_NR_BITS, /* stops here */
};
-
@@ -191,5 +192,6 @@ enum rq_flag_bits {
- #define REQ_IO_STAT (1 << __REQ_IO_STAT)
#define REQ_MIXED_MERGE (1 << __REQ_MIXED_MERGE)
- #define REQ_SECURE (1 << __REQ_SECURE)
+ #define REQ_SECURE (1 << __REQ_SECURE
+ #define REQ_ON_PLUG (1 << __REQ_ON_PLUG)
+#define REQ_TOI (1 << __REQ_TOI)
#endif /* __LINUX_BLK_TYPES_H */
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-tuxonice.patch?r1=1.23&r2=1.24&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
