[kernel] r7015 - dists/sid/linux-2.6.16/debian/patches

[Bastian Blank]

Author: waldi
Date: Sat Jul 15 13:07:34 2006
New Revision: 7015

Modified:
   dists/sid/linux-2.6.16/debian/patches/vserver-vs2.0.2-rc19.patch

Log:
debian/patches/vserver-vs2.0.2-rc19.patch: Make appliable.


Modified: dists/sid/linux-2.6.16/debian/patches/vserver-vs2.0.2-rc19.patch
==============================================================================
--- dists/sid/linux-2.6.16/debian/patches/vserver-vs2.0.2-rc19.patch	(original)
+++ dists/sid/linux-2.6.16/debian/patches/vserver-vs2.0.2-rc19.patch	Sat Jul 15 13:07:34 2006
@@ -20205,13 +20205,14 @@
  	buf->f_bsize = PAGE_CACHE_SIZE;
  	buf->f_namelen = NAME_MAX;
  	spin_lock(&sbinfo->stat_lock);
-@@ -2098,7 +2097,7 @@ static int shmem_fill_super(struct super
+@@ -2098,8 +2097,8 @@ static int shmem_fill_super(struct super
  	sb->s_maxbytes = SHMEM_MAX_BYTES;
  	sb->s_blocksize = PAGE_CACHE_SIZE;
  	sb->s_blocksize_bits = PAGE_CACHE_SHIFT;
 -	sb->s_magic = TMPFS_MAGIC;
 +	sb->s_magic = TMPFS_SUPER_MAGIC;
  	sb->s_op = &shmem_ops;
+ 	sb->s_time_gran = 1;
  
  	inode = shmem_get_inode(sb, S_IFDIR | mode, 0);
 diff -NurpP --minimal linux-2.6.16.13/mm/swapfile.c linux-2.6.16.13-vs2.0.2-rc19/mm/swapfile.c