Author: sparky Date: Fri Jun 23 19:16:09 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- sync with main ck patch
---- Files affected:
SOURCES:
kernel-desktop-fcache.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: SOURCES/kernel-desktop-fcache.patch
diff -u SOURCES/kernel-desktop-fcache.patch:1.1
SOURCES/kernel-desktop-fcache.patch:1.2
--- SOURCES/kernel-desktop-fcache.patch:1.1 Wed Jun 21 16:01:56 2006
+++ SOURCES/kernel-desktop-fcache.patch Fri Jun 23 21:16:04 2006
@@ -1727,11 +1727,11 @@
diff -Nur linux-2.6.17/include/linux/bio.h
linux-2.6.17.fcache/include/linux/bio.h
--- linux-2.6.17/include/linux/bio.h 2006-06-18 03:49:35.000000000 +0200
+++ linux-2.6.17.fcache/include/linux/bio.h 2006-06-21 15:58:45.000000000
+0200
-@@ -124,6 +124,7 @@
- #define BIO_BOUNCED 5 /* bio is a bounce bio */
+@@ -124,6 +124,7 @@ struct bio {
#define BIO_USER_MAPPED 6 /* contains user pages */
#define BIO_EOPNOTSUPP 7 /* not supported */
-+#define BIO_NOMERGE 8 /* bio not mergeable */
+ #define BIO_SUSPEND2 8 /* Suspend2 bio - for corruption checking */
++#define BIO_NOMERGE 9 /* bio not mergeable */
#define bio_flagged(bio, flag) ((bio)->bi_flags & (1 << (flag)))
/*
@@ -1780,4 +1780,16 @@
+#endif /* CONFIG_BLK_FCACHE */
#endif /* __KERNEL__ */
+
+--- linux-2.6.17-ck1.orig/include/linux/sysctl.h 2006-06-18
15:32:49.000000000 +1000
++++ linux-2.6.17-ck1/include/linux/sysctl.h 2006-06-18 15:34:43.000000000
+1000
+@@ -148,6 +148,9 @@ enum
+ KERN_ACPI_VIDEO_FLAGS=71, /* int: flags for setting up video after ACPI
sleep */
+ KERN_IA64_UNALIGNED=72, /* int: ia64 unaligned userland trap enable */
+ KERN_MAX_LOCK_DEPTH=80,
++ KERN_INTERACTIVE=83, /* interactive tasks can have cpu bursts */
++ KERN_COMPUTE=84, /* adjust timeslices for a compute server */
++ KERN_ISO_CPU=85, /* percent cpu SCHED_ISO tasks run SCHED_RR */
+ };
+
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/kernel-desktop-fcache.patch?r1=1.1&r2=1.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
