Author: sparky Date: Sat Nov 18 22:28:03 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated
---- Files affected:
SOURCES:
kernel-desktop-nock-compat.patch (1.3 -> 1.4)
---- Diffs:
================================================================
Index: SOURCES/kernel-desktop-nock-compat.patch
diff -u SOURCES/kernel-desktop-nock-compat.patch:1.3
SOURCES/kernel-desktop-nock-compat.patch:1.4
--- SOURCES/kernel-desktop-nock-compat.patch:1.3 Sat Jul 1 00:27:20 2006
+++ SOURCES/kernel-desktop-nock-compat.patch Sat Nov 18 23:27:58 2006
@@ -1,22 +1,12 @@
---- 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 */
+--- linux-2.6.18-ck1.orig/include/linux/sysctl.h 2006-09-21
20:03:59.000000000 +1000
++++ linux-2.6.18-ck1/include/linux/sysctl.h 2006-09-21 20:05:38.000000000
+1000
+@@ -150,6 +150,9 @@ enum
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 */
+ KERN_COMPAT_LOG=73, /* int: print compat layer messages */
+ KERN_MAX_LOCK_DEPTH=74,
++ KERN_INTERACTIVE=75, /* interactive tasks can have cpu bursts */
++ KERN_COMPUTE=76, /* adjust timeslices for a compute server */
++ KERN_ISO_CPU=77, /* percent cpu SCHED_ISO tasks run SCHED_RR */
};
---- linux-2.6.17-ck1.orig/include/linux/bio.h 2006-03-20 20:11:41.000000000
+1100
-+++ linux-2.6.17-ck1/include/linux/bio.h 2006-06-18 15:34:44.000000000
+1000
-@@ -124,6 +124,7 @@ struct bio {
- #define BIO_BOUNCED 5 /* bio is a bounce bio */
- #define BIO_USER_MAPPED 6 /* contains user pages */
- #define BIO_EOPNOTSUPP 7 /* not supported */
-+#define BIO_NOMERGE 8 /* bio not mergeable */
- #define bio_flagged(bio, flag) ((bio)->bi_flags & (1 << (flag)))
-
- /*
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/kernel-desktop-nock-compat.patch?r1=1.3&r2=1.4&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
