Author: zbyniu Date: Wed May 7 23:44:43 2008 GMT
Module: SOURCES Tag: LINUX_2_6
---- Log message:
- updated for 2.6.25
---- Files affected:
SOURCES:
kernel-suspend2-headers.patch (1.1.2.4 -> 1.1.2.5)
---- Diffs:
================================================================
Index: SOURCES/kernel-suspend2-headers.patch
diff -u SOURCES/kernel-suspend2-headers.patch:1.1.2.4
SOURCES/kernel-suspend2-headers.patch:1.1.2.5
--- SOURCES/kernel-suspend2-headers.patch:1.1.2.4 Sun Jan 20 12:15:39 2008
+++ SOURCES/kernel-suspend2-headers.patch Thu May 8 01:44:38 2008
@@ -16,14 +16,13 @@
#include <asm/io.h>
--- a/kernel/printk.c 2007-10-02 14:01:04.780023500 +0200
+++ b/kernel/printk.c 2007-10-02 14:09:40.140231500 +0200
-@@ -28,10 +28,10 @@
+@@ -28,9 +28,9 @@
#include <linux/delay.h>
#include <linux/smp.h>
#include <linux/security.h>
+#include <linux/suspend.h>
#include <linux/bootmem.h>
#include <linux/syscalls.h>
- #include <linux/jiffies.h>
-#include <linux/suspend.h>
#include <asm/uaccess.h>
@@ -47,23 +46,17 @@
#include <asm/uaccess.h>
#include <asm/unistd.h>
---- a/include/linux/fs.h.org 2008-01-20 11:56:05.845456959 +0100
-+++ b/include/linux/fs.h 2008-01-20 11:56:23.109653995 +0100
-@@ -119,6 +119,9 @@
- #define MS_VERBOSE 32768 /* War is peace. Verbosity is silence.
- MS_VERBOSE is deprecated. */
- #define MS_SILENT 32768
-+
-+#define MS_FROZEN (1<<23) /* Frozen by freeze_filesystems() */
-+
- #define MS_POSIXACL (1<<16) /* VFS does not apply the umask */
- #define MS_UNBINDABLE (1<<17) /* change to unbindable */
- #define MS_PRIVATE (1<<18) /* change to private */
-@@ -126,7 +129,6 @@
- #define MS_SHARED (1<<20) /* change to shared */
+--- e/include/linux/fs.h 2008-05-07 11:39:56.000000000 +0000
++++ e/include/linux/fs.h 2008-05-07 11:43:49.907309587 +0000
+@@ -127,10 +127,10 @@
#define MS_RELATIME (1<<21) /* Update atime relative to mtime/ctime. */
#define MS_KERNMOUNT (1<<22) /* this is a kern_mount call */
--#define MS_FROZEN (1<<23) /* Frozen by freeze_filesystems() */
+ #define MS_I_VERSION (1<<23) /* Update inode I_version field */
+-#define MS_FROZEN (1<<24) /* Frozen by freeze_filesystems() */
#define MS_ACTIVE (1<<30)
#define MS_NOUSER (1<<31)
++#define MS_FROZEN (1<<29) /* Frozen by freeze_filesystems() */
+ /*
+ * Superblock flags that can be altered by MS_REMOUNT
+ */
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-suspend2-headers.patch?r1=1.1.2.4&r2=1.1.2.5&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
