packages: kernel/kernel-toshiba_acpi.patch, kernel/kernel-tuxonice-headers....

[baggins]

Author: baggins                      Date: Sun Jul 10 22:37:10 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated for linux 3.0-rc6

---- Files affected:
packages/kernel:
   kernel-toshiba_acpi.patch (1.6 -> 1.7) , kernel-tuxonice-headers.patch (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: packages/kernel/kernel-toshiba_acpi.patch
diff -u packages/kernel/kernel-toshiba_acpi.patch:1.6 packages/kernel/kernel-toshiba_acpi.patch:1.7
--- packages/kernel/kernel-toshiba_acpi.patch:1.6	Sat Oct 23 18:51:55 2010
+++ packages/kernel/kernel-toshiba_acpi.patch	Mon Jul 11 00:37:04 2011
@@ -1,6 +1,6 @@
 ---- linux-2.6/drivers/platform/x86/toshiba_acpi.c.orig	2008-08-30 22:12:50.000000000 -0700
 +++ linux-2.6/drivers/platform/x86/toshiba_acpi.c	2008-08-31 12:03:07.000000000 -0700
-@@ -28,12 +28,26 @@
+@@ -28,14 +28,28 @@
   *	Yasushi Nagato - changes for linux kernel 2.4 -> 2.5
   *	Rob Miller - TV out and hotkeys help
   *
@@ -22,6 +22,8 @@
   *  TODO
   *
   */
+ 
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
  
 -#define TOSHIBA_ACPI_VERSION	"0.19"
 +#define TOSHIBA_ACPI_VERSION	"experimental-dev-toshiba-test-5"

================================================================
Index: packages/kernel/kernel-tuxonice-headers.patch
diff -u packages/kernel/kernel-tuxonice-headers.patch:1.6 packages/kernel/kernel-tuxonice-headers.patch:1.7
--- packages/kernel/kernel-tuxonice-headers.patch:1.6	Thu Mar 17 09:27:18 2011
+++ packages/kernel/kernel-tuxonice-headers.patch	Mon Jul 11 00:37:04 2011
@@ -1,51 +1,50 @@
 --- a/kernel/printk.c	2007-10-02 14:01:04.780023500 +0200
 +++ b/kernel/printk.c	2007-10-02 14:09:40.140231500 +0200
-@@ -30,9 +30,9 @@
+@@ -30,10 +30,10 @@
  #include <linux/delay.h>
  #include <linux/smp.h>
  #include <linux/security.h>
 +#include <linux/suspend.h>
  #include <linux/bootmem.h>
+ #include <linux/memblock.h>
  #include <linux/syscalls.h>
 -#include <linux/suspend.h>
  #include <linux/kexec.h>
- 
- #include <asm/uaccess.h>
---- 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
-@@ -207,11 +207,14 @@
+ #include <linux/kdb.h>
+ #include <linux/ratelimit.h>
+--- a/include/linux/fs.h	2008-05-07 11:39:56.000000000 +0000
++++ b/include/linux/fs.h	2008-05-07 11:43:49.907309587 +0000
+@@ -207,12 +207,15 @@
  #define MS_KERNMOUNT	(1<<22) /* this is a kern_mount call */
  #define MS_I_VERSION	(1<<23) /* Update inode I_version field */
  #define MS_STRICTATIME	(1<<24) /* Always perform atime updates */
 -#define MS_FROZEN	(1<<25)	/* Frozen by freeze_filesystems() */
+ #define MS_NOSEC	(1<<28)
  #define MS_BORN		(1<<29)
  #define MS_ACTIVE	(1<<30)
  #define MS_NOUSER	(1<<31)
  
 +
 +
-+#define MS_FROZEN	(1<<28) /* Frozen by freeze_filesystems() */
++#define MS_FROZEN	(1<<27) /* Frozen by freeze_filesystems() */
 +
  /*
   * Superblock flags that can be altered by MS_REMOUNT
   */
-
---- e/include/linux/fs.h.orig	2009-07-20 14:35:32.000000000 +0200
-+++ e/include/linux/fs.h	2009-07-20 14:37:27.086666353 +0200
 @@ -230,6 +230,8 @@
  
  /* Inode flags - they have nothing to superblock flags now */
  
-+#define S_ATOMIC_COPY	4096	/* Pages mapped with this inode need to be
++#define S_ATOMIC_COPY	8192	/* Pages mapped with this inode need to be
 +				  atomically copied (gem) */
  #define S_SYNC		1	/* Writes are synced at once */
  #define S_NOATIME	2	/* Do not update access times */
  #define S_APPEND	4	/* Append-only file */
 @@ -240,8 +242,6 @@
- #define S_PRIVATE	512	/* Inode is fs-internal */
  #define S_IMA		1024	/* Inode has an associated IMA struct */
  #define S_AUTOMOUNT	2048	/* Automount/referral quasi-directory */
--#define S_ATOMIC_COPY	4096	/* Pages mapped with this inode need to be
+ #define S_NOSEC		4096	/* no suid or xattr security attributes */
+-#define S_ATOMIC_COPY	8192	/* Pages mapped with this inode need to be
 -				   atomically copied (gem) */
  
  /*
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-toshiba_acpi.patch?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-tuxonice-headers.patch?r1=1.6&r2=1.7&f=u