SOURCES (LINUX_2_6): linux-2.6-suspend2.patch, kernel-suspend2-headers.patc...

pluto pluto at pld-linux.org
Mon Sep 8 14:46:36 CEST 2008 

Author: pluto                        Date: Mon Sep  8 12:46:36 2008 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- updated.

---- Files affected:
SOURCES:
   linux-2.6-suspend2.patch (1.1.2.2.2.7 -> 1.1.2.2.2.8) , kernel-suspend2-headers.patch (1.1.2.6 -> 1.1.2.7) 

---- Diffs:

================================================================
Index: SOURCES/linux-2.6-suspend2.patch
diff -u SOURCES/linux-2.6-suspend2.patch:1.1.2.2.2.7 SOURCES/linux-2.6-suspend2.patch:1.1.2.2.2.8
--- SOURCES/linux-2.6-suspend2.patch:1.1.2.2.2.7	Mon Jul 14 19:54:21 2008
+++ SOURCES/linux-2.6-suspend2.patch	Mon Sep  8 14:46:30 2008
@@ -1,9 +1,9 @@
 diff --git a/Documentation/power/tuxonice-internals.txt b/Documentation/power/tuxonice-internals.txt
 new file mode 100644
-index 0000000..afba75a
+index 0000000..68c0454
 --- /dev/null
 +++ b/Documentation/power/tuxonice-internals.txt
-@@ -0,0 +1,469 @@
+@@ -0,0 +1,474 @@
 +		   TuxOnIce 3.0 Internal Documentation.
 +			Updated to 11 March 2008
 +
@@ -137,7 +137,7 @@
 +    that changes in number or fragmentation of the pages to be saved don't
 +    feedback via changes in the amount of memory needed for metadata). The
 +    recursiveness is thus limited to any extra slab pages allocated to store the
-+    extents that record storage used, and he effects of seeking to free memory.
++    extents that record storage used, and the effects of seeking to free memory.
 +
 +    d. Write the image.
 +
@@ -404,6 +404,11 @@
 +    feeding output in a similar manner to the next module. A module may buffer
 +    its output.
 +
++    All routines are SMP safe, and the final result of the transformations is
++    written with an index (provided by the core) and size of the output by the
++    writer. As a result, we can have multithreaded I/O without needing to
++    worry about the sequence in which pages are written (or read).
++
 +    During reading, the pipeline works in the reverse direction. The core code
 +    calls the first module with the address of a buffer which should be filled.
 +    (Note that the buffer size is always PAGE_SIZE at this time). This module
@@ -475,10 +480,10 @@
 +
 diff --git a/Documentation/power/tuxonice.txt b/Documentation/power/tuxonice.txt
 new file mode 100644
-index 0000000..c6d0778
+index 0000000..d13ce85
 --- /dev/null
 +++ b/Documentation/power/tuxonice.txt
-@@ -0,0 +1,758 @@
+@@ -0,0 +1,750 @@
 +	--- TuxOnIce, version 3.0 ---
 +
 +1.  What is it?
@@ -527,7 +532,11 @@
 +   
 +   Being able to save the state of your system and quickly restore it improves
 +   your productivity - you get a useful system in far less time than through
-+   the normal boot process.
++   the normal boot process. You also get to be completely 'green', using zero
++   power, or as close to that as possible (the computer may still provide
++   minimal power to some devices, so they can initiate a power on, but that
++   will be the same amount of power as would be used if you told the computer
++   to shutdown.
 +   
 +3. What do you need to use it?
 +
@@ -729,24 +738,26 @@
 +
 +   The version in the vanilla kernel has a number of drawbacks. The most
 +   serious of these are:
-+	- it has a maximum image size of 1/2 total memory.
++	- it has a maximum image size of 1/2 total memory;
 +	- it doesn't allocate storage until after it has snapshotted memory.
 +	  This means that you can't be sure hibernating will work until you
-+	  see it start to write the image.
-+	- it performs all of it's I/O synchronously.
-+	- it does not allow you to press escape to cancel a cycle
++	  see it start to write the image;
++	- it does not allow you to press escape to cancel a cycle;
++	- it does not allow you to press escape to cancel resuming;
 +	- it does not allow you to automatically swapon a file when
-+	  starting a cycle.
-+	- it does not allow you to use multiple swap partitions.
-+	- it does not allow you to use swapfiles.
-+	- it does not allow you to use ordinary files.
++	  starting a cycle;
++	- it does not allow you to use multiple swap partitions or files;
++	- it does not allow you to use ordinary files;
 +	- it just invalidates an image and continues to boot if you
-+	  accidentally boot the wrong kernel after hibernating.
-+	- it doesn't support any sort of nice display while hibernating
++	  accidentally boot the wrong kernel after hibernating;
++	- it doesn't support any sort of nice display while hibernating;
 +	- it is moving toward requiring that you have an initrd/initramfs
 +	  to ever have a hope of resuming (uswsusp). While uswsusp will
 +	  address some of the concerns above, it won't address all of them,
-+          and will be more complicated to get set up.
++          and will be more complicated to get set up;
++        - it doesn't have support for suspend-to-both (write a hibernation
++	  image, then suspend to ram; I think this is known as ReadySafe
++	  under M$).
 +
 +5. How do you use it?
 +
@@ -888,13 +899,6 @@
 +   The maximum size of hibernation image written to disk, measured in megabytes
 +   (1024*1024).
 +
-+   - interface_version:
-+
-+   The value returned by this file can be used by scripts and configuration
-+   tools to determine what entries should be looked for. The value is
-+   incremented whenever an entry in /sys/power/tuxonice is obsoleted or 
-+   added.
-+
 +   - last_result:
 +
 +   The result of the last hibernation cycle, as defined in
@@ -993,13 +997,6 @@
 +   currently have activated. It is particularly useful when you only want to
 +   use a swap file to store your image. See above for further details.
 +
-+   - toggle_process_nofreeze
-+
-+   This entry can be used to toggle the NOFREEZE flag on a process, to allow it
-+   to run during hibernating. It should be used with extreme caution. There are
-+   strict limitations on what a process running during hibernation can do. This
-+   is really only intended for use by TuxOnice's helpers (userui in particular).
-+
 +   - userui_program
 +
 +   This entry is used to tell TuxOnice what userspace program to use for
@@ -1238,10 +1235,10 @@
 +   testing. His efforts have contributed as much to TuxOnIce as any of the
 +   names above.
 diff --git a/MAINTAINERS b/MAINTAINERS
-index e467758..1921b3a 100644
+index 56a2f67..ec6fa04 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -3935,6 +3935,13 @@ P:	Maciej W. Rozycki
+@@ -4045,6 +4045,13 @@ P:	Maciej W. Rozycki
  M:	macro at linux-mips.org
  S:	Maintained
  
@@ -1256,7 +1253,7 @@
  P:	Dario Ballabio
  M:	ballabio_dario at emc.com
 diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
-index ec08d83..c417de4 100644
+index 8bcb6f4..529200c 100644
 --- a/arch/x86/mm/fault.c
 +++ b/arch/x86/mm/fault.c
 @@ -25,6 +25,7 @@
@@ -1279,7 +1276,7 @@
  static inline int notify_page_fault(struct pt_regs *regs)
  {
  #ifdef CONFIG_KPROBES
-@@ -599,6 +605,22 @@ void __kprobes do_page_fault(struct pt_regs *regs, unsigned long error_code)
+@@ -604,6 +610,22 @@ void __kprobes do_page_fault(struct pt_regs *regs, unsigned long error_code)
  
  	si_code = SEGV_MAPERR;
  
@@ -1303,12 +1300,12 @@
  		return;
  
 diff --git a/crypto/Kconfig b/crypto/Kconfig
-index 69f1be6..21c95e0 100644
+index 864456c..ecbebab 100644
 --- a/crypto/Kconfig
 +++ b/crypto/Kconfig
-@@ -529,6 +529,14 @@ config CRYPTO_DEFLATE
- 	  
- 	  You will most probably want this if using IPSec.
+@@ -614,6 +614,14 @@ config CRYPTO_LZO
+ 	help
+ 	  This is the LZO algorithm.
  
 +config CRYPTO_LZF
 +	tristate "LZF compression algorithm"
@@ -1318,14 +1315,14 @@
 +	  This is the LZF algorithm. It is especially useful for TuxOnIce,
 +	  because it achieves good compression quickly.
 +
- config CRYPTO_MICHAEL_MIC
- 	tristate "Michael MIC keyed digest algorithm"
- 	select CRYPTO_ALGAPI
+ source "drivers/crypto/Kconfig"
+ 
+ endif	# if CRYPTO
 diff --git a/crypto/Makefile b/crypto/Makefile
-index 7cf3625..af17245 100644
+index ca02441..819b2cc 100644
 --- a/crypto/Makefile
 +++ b/crypto/Makefile
-@@ -60,6 +60,7 @@ obj-$(CONFIG_CRYPTO_SALSA20) += salsa20_generic.o
+@@ -62,6 +62,7 @@ obj-$(CONFIG_CRYPTO_SALSA20) += salsa20_generic.o
  obj-$(CONFIG_CRYPTO_DEFLATE) += deflate.o
  obj-$(CONFIG_CRYPTO_MICHAEL_MIC) += michael_mic.o
  obj-$(CONFIG_CRYPTO_CRC32C) += crc32c.o
@@ -1678,10 +1675,10 @@
  #include <linux/suspend.h>
  #include <linux/cpu.h>
 diff --git a/drivers/md/md.c b/drivers/md/md.c
-index 61ccbd2..5083aae 100644
+index 2580ac1..4c20dab 100644
 --- a/drivers/md/md.c
 +++ b/drivers/md/md.c
-@@ -5623,6 +5623,8 @@ void md_do_sync(mddev_t *mddev)
+@@ -5730,6 +5730,8 @@ void md_do_sync(mddev_t *mddev)
  			last_mark = next;
  		}
  
@@ -1691,13 +1688,19 @@
  		if (kthread_should_stop())
  			goto interrupted;
 diff --git a/fs/buffer.c b/fs/buffer.c
-index 39ff144..915fc52 100644
+index 0f51c0f..cebc137 100644
 --- a/fs/buffer.c
 +++ b/fs/buffer.c
-@@ -247,6 +247,93 @@ void thaw_bdev(struct block_device *bdev, struct super_block *sb)
+@@ -247,6 +247,91 @@ void thaw_bdev(struct block_device *bdev, struct super_block *sb)
  }
  EXPORT_SYMBOL(thaw_bdev);
  
++#if 0
++#define FS_PRINTK(fmt, args...) printk(fmt, ## args)
++#else
++#define FS_PRINTK(fmt, args...)
++#endif
++
 +/* #define DEBUG_FS_FREEZING */
 +
 +/**
@@ -1715,12 +1718,10 @@
 +	 * frozen in the right order (eg. loopback on ext3).
 +	 */
 +	list_for_each_entry_reverse(sb, &super_blocks, s_list) {
-+#ifdef DEBUG_FS_FREEZING
-+		printk(KERN_INFO "Considering %s.%s: (root %p, bdev %x)",
++		FS_PRINTK(KERN_INFO "Considering %s.%s: (root %p, bdev %x)",
 +			sb->s_type->name ? sb->s_type->name : "?",
 +			sb->s_subtype ? sb->s_subtype : "", sb->s_root,
 +			sb->s_bdev ? sb->s_bdev->bd_dev : 0);
-+#endif
 +
 +		if (sb->s_type->fs_flags & FS_IS_FUSE &&
 +		    sb->s_frozen == SB_UNFROZEN &&
@@ -1736,20 +1737,14 @@
 +		    (sb->s_flags & MS_RDONLY) ||
 +		    (sb->s_flags & MS_FROZEN) ||
 +		    !(which & FS_FREEZER_NORMAL)) {
-+#ifdef DEBUG_FS_FREEZING
-+			printk(KERN_INFO "Nope.\n");
-+#endif
++			FS_PRINTK(KERN_INFO "Nope.\n");
 +			continue;
 +		}
 +
-+#ifdef DEBUG_FS_FREEZING
-+		printk(KERN_INFO "Freezing %x... ", sb->s_bdev->bd_dev);
-+#endif
++		FS_PRINTK(KERN_INFO "Freezing %x... ", sb->s_bdev->bd_dev);
 +		freeze_bdev(sb->s_bdev);
 +		sb->s_flags |= MS_FROZEN;
-+#ifdef DEBUG_FS_FREEZING
-+		printk(KERN_INFO "Done.\n");
-+#endif
++		FS_PRINTK(KERN_INFO "Done.\n");
 +	}
 +
 +	lockdep_on();
@@ -1788,8 +1783,21 @@
  /*
   * Various filesystems appear to want __find_get_block to be non-blocking.
   * But it's the page lock which protects the buffers.  To get around this,
+diff --git a/fs/drop_caches.c b/fs/drop_caches.c
+index 3e5637f..0d4c88e 100644
+--- a/fs/drop_caches.c
++++ b/fs/drop_caches.c
+@@ -33,7 +33,7 @@ static void drop_pagecache_sb(struct super_block *sb)
+ 	iput(toput_inode);
+ }
+ 
+-static void drop_pagecache(void)
++void drop_pagecache(void)
+ {
+ 	struct super_block *sb;
+ 
 diff --git a/fs/fuse/control.c b/fs/fuse/control.c
-index 105d4a2..57eeca4 100644
+index 4f3cab3..f15b0c5 100644
 --- a/fs/fuse/control.c
 +++ b/fs/fuse/control.c
 @@ -207,6 +207,7 @@ static void fuse_ctl_kill_sb(struct super_block *sb)
@@ -1801,7 +1809,7 @@
  	.kill_sb	= fuse_ctl_kill_sb,
  };
 diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
-index af63980..d417551 100644
+index 87250b6..7246e3d 100644
 --- a/fs/fuse/dev.c
 +++ b/fs/fuse/dev.c
 @@ -7,6 +7,7 @@
@@ -1820,7 +1828,7 @@
  
  MODULE_ALIAS_MISCDEV(FUSE_MINOR);
  
-@@ -723,6 +725,8 @@ static ssize_t fuse_dev_read(struct kiocb *iocb, const struct iovec *iov,
+@@ -743,6 +745,8 @@ static ssize_t fuse_dev_read(struct kiocb *iocb, const struct iovec *iov,
  	if (!fc)
  		return -EPERM;
  
@@ -1829,7 +1837,7 @@
   restart:
  	spin_lock(&fc->lock);
  	err = -EAGAIN;
-@@ -849,6 +853,9 @@ static ssize_t fuse_dev_write(struct kiocb *iocb, const struct iovec *iov,
+@@ -869,6 +873,9 @@ static ssize_t fuse_dev_write(struct kiocb *iocb, const struct iovec *iov,
  	if (!fc)
  		return -EPERM;
  
@@ -1840,7 +1848,7 @@
  	if (nbytes < sizeof(struct fuse_out_header))
  		return -EINVAL;
 diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
-index c4807b3..d8b4526 100644
+index 2060bf0..9e23548 100644
 --- a/fs/fuse/dir.c
 +++ b/fs/fuse/dir.c
 @@ -7,12 +7,14 @@
@@ -1948,7 +1956,7 @@
  		return PTR_ERR(req);
  
 diff --git a/fs/fuse/file.c b/fs/fuse/file.c
-index 676b0bc..56bb4eb 100644
+index 8092f0d..813c656 100644
 --- a/fs/fuse/file.c
 +++ b/fs/fuse/file.c
 @@ -7,11 +7,13 @@
@@ -1974,16 +1982,16 @@
  	req = fuse_get_req(fc);
  	if (IS_ERR(req))
  		return PTR_ERR(req);
-@@ -546,6 +550,8 @@ static int fuse_buffered_write(struct file *file, struct inode *inode,
+@@ -674,6 +678,8 @@ static int fuse_buffered_write(struct file *file, struct inode *inode,
  	if (is_bad_inode(inode))
  		return -EIO;
  
 +	FUSE_MIGHT_FREEZE(inode->i_sb, "fuse_commit_write");
 +
- 	req = fuse_get_req(fc);
- 	if (IS_ERR(req))
- 		return PTR_ERR(req);
-@@ -639,6 +645,8 @@ static ssize_t fuse_direct_io(struct file *file, const char __user *buf,
+ 	/*
+ 	 * Make sure writepages on the same page are not mixed up with
+ 	 * plain writes.
+@@ -962,6 +968,8 @@ static ssize_t fuse_direct_io(struct file *file, const char __user *buf,
  	if (is_bad_inode(inode))
  		return -EIO;
  
@@ -1992,7 +2000,7 @@
  	req = fuse_get_req(fc);
  	if (IS_ERR(req))
  		return PTR_ERR(req);
-@@ -791,6 +799,8 @@ static int fuse_getlk(struct file *file, struct file_lock *fl)
+@@ -1315,6 +1323,8 @@ static int fuse_getlk(struct file *file, struct file_lock *fl)
  	struct fuse_lk_out outarg;
  	int err;
  
@@ -2001,7 +2009,7 @@
  	req = fuse_get_req(fc);
  	if (IS_ERR(req))
  		return PTR_ERR(req);
-@@ -821,6 +831,8 @@ static int fuse_setlk(struct file *file, struct file_lock *fl, int flock)
+@@ -1345,6 +1355,8 @@ static int fuse_setlk(struct file *file, struct file_lock *fl, int flock)
  	if (fl->fl_flags & FL_CLOSE)
  		return 0;
  
@@ -2010,7 +2018,7 @@
  	req = fuse_get_req(fc);
  	if (IS_ERR(req))
  		return PTR_ERR(req);
-@@ -885,6 +897,8 @@ static sector_t fuse_bmap(struct address_space *mapping, sector_t block)
+@@ -1409,6 +1421,8 @@ static sector_t fuse_bmap(struct address_space *mapping, sector_t block)
  	if (!inode->i_sb->s_bdev || fc->no_bmap)
  		return 0;
  
@@ -2039,10 +2047,10 @@
 +	} \
 +} while (0)
 diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c
-index 033f7bd..ac6805a 100644
+index 3141690..c826200 100644
 --- a/fs/fuse/inode.c
 +++ b/fs/fuse/inode.c
-@@ -702,7 +702,7 @@ static int fuse_get_sb(struct file_system_type *fs_type,
+@@ -739,7 +739,7 @@ static int fuse_get_sb(struct file_system_type *fs_type,
  static struct file_system_type fuse_fs_type = {
  	.owner		= THIS_MODULE,
  	.name		= "fuse",
@@ -2051,7 +2059,7 @@
  	.get_sb		= fuse_get_sb,
  	.kill_sb	= kill_anon_super,
  };
-@@ -721,7 +721,7 @@ static struct file_system_type fuseblk_fs_type = {
+@@ -758,7 +758,7 @@ static struct file_system_type fuseblk_fs_type = {
  	.name		= "fuseblk",
  	.get_sb		= fuse_get_sb_blk,
  	.kill_sb	= kill_block_super,
@@ -2061,7 +2069,7 @@
  
  static inline int register_fuseblk(void)
 diff --git a/fs/ioctl.c b/fs/ioctl.c
-index f32fbde..9014fe4 100644
+index 7db32b3..be49ee9 100644
 --- a/fs/ioctl.c
 +++ b/fs/ioctl.c
 @@ -211,3 +211,4 @@ asmlinkage long sys_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg)
@@ -2070,10 +2078,10 @@
  }
 +EXPORT_SYMBOL(sys_ioctl);
 diff --git a/fs/namei.c b/fs/namei.c
-index 8cf9bb9..c1abd13 100644
+index 01e67dd..aedaedf 100644
 --- a/fs/namei.c
 +++ b/fs/namei.c
-@@ -2177,6 +2177,8 @@ int vfs_unlink(struct inode *dir, struct dentry *dentry)
+@@ -2314,6 +2314,8 @@ int vfs_unlink(struct inode *dir, struct dentry *dentry)
  	if (!dir->i_op || !dir->i_op->unlink)
  		return -EPERM;
  
@@ -2106,7 +2114,7 @@
 +#define toi_faulted (0)
 +#define clear_toi_fault() do { } while (0)
 diff --git a/include/asm-x86/suspend_32.h b/include/asm-x86/suspend_32.h
-index 1bbda3a..e58d1b5 100644
+index 24e1c08..441efd6 100644
 --- a/include/asm-x86/suspend_32.h
 +++ b/include/asm-x86/suspend_32.h
 @@ -8,6 +8,9 @@
@@ -2118,12 +2126,12 @@
 +
  /* image of the saved processor state */
  struct saved_context {
-   	u16 es, fs, gs, ss;
+ 	u16 es, fs, gs, ss;
 diff --git a/include/asm-x86/suspend_64.h b/include/asm-x86/suspend_64.h
-index 2eb92cb..2d429e7 100644
+index dc3262b..5ff82a1 100644
 --- a/include/asm-x86/suspend_64.h
 +++ b/include/asm-x86/suspend_64.h
-@@ -15,6 +15,9 @@ arch_prepare_suspend(void)
+@@ -14,6 +14,9 @@ static inline int arch_prepare_suspend(void)
  	return 0;
  }
  
@@ -2134,19 +2142,19 @@
   * Image of the saved processor state, used by the low level ACPI suspend to
   * RAM code and by the low level hibernation code.
 diff --git a/include/linux/Kbuild b/include/linux/Kbuild
-index cedbbd8..7a731ba 100644
+index 71d70d1..b5de633 100644
 --- a/include/linux/Kbuild
 +++ b/include/linux/Kbuild
-@@ -202,6 +202,7 @@ unifdef-y += filter.h
+@@ -207,6 +207,7 @@ unifdef-y += filter.h
  unifdef-y += flat.h
  unifdef-y += futex.h
  unifdef-y += fs.h
 +unifdef-y += freezer.h
  unifdef-y += gameport.h
  unifdef-y += generic_serial.h
- unifdef-y += gfs2_ondisk.h
+ unifdef-y += hayesesp.h
 diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h
-index 932eb02..1436765 100644
+index 82aa36c..ee09d61 100644
 --- a/include/linux/buffer_head.h
 +++ b/include/linux/buffer_head.h
 @@ -172,6 +172,11 @@ wait_queue_head_t *bh_waitq_head(struct buffer_head *bh);
@@ -2267,7 +2275,7 @@
  static inline void freezer_do_not_count(void) {}
  static inline void freezer_count(void) {}
 diff --git a/include/linux/fs.h b/include/linux/fs.h
-index b84b848..7c14b03 100644
+index d8e2762..7db243f 100644
 --- a/include/linux/fs.h
 +++ b/include/linux/fs.h
 @@ -8,6 +8,7 @@
@@ -2278,7 +2286,7 @@
  
  /*
   * It's silly to have NR_OPEN bigger than NR_FILE, but you can change
-@@ -93,6 +94,7 @@ extern int dir_notify_enable;
+@@ -94,6 +95,7 @@ extern int dir_notify_enable;
  #define FS_REQUIRES_DEV 1 
  #define FS_BINARY_MOUNTDATA 2
  #define FS_HAS_SUBTYPE 4
@@ -2286,7 +2294,7 @@
  #define FS_REVAL_DOT	16384	/* Check the paths ".", ".." for staleness */
  #define FS_RENAME_DOES_D_MOVE	32768	/* FS will handle d_move()
  					 * during rename() internally.
-@@ -125,6 +127,7 @@ extern int dir_notify_enable;
+@@ -126,6 +128,7 @@ extern int dir_notify_enable;
  #define MS_RELATIME	(1<<21)	/* Update atime relative to mtime/ctime. */
  #define MS_KERNMOUNT	(1<<22) /* this is a kern_mount call */
  #define MS_I_VERSION	(1<<23) /* Update inode I_version field */
@@ -2294,7 +2302,7 @@
  #define MS_ACTIVE	(1<<30)
  #define MS_NOUSER	(1<<31)
  
-@@ -1057,8 +1060,11 @@ enum {
+@@ -1105,8 +1108,11 @@ enum {
  	SB_FREEZE_TRANS = 2,
  };
  
@@ -2309,10 +2317,10 @@
  #define get_fs_excl() atomic_inc(&current->fs_excl)
  #define put_fs_excl() atomic_dec(&current->fs_excl)
 diff --git a/include/linux/kernel.h b/include/linux/kernel.h
-index 2df44e7..4d22ae4 100644
+index 2e70006..a43b516 100644
 --- a/include/linux/kernel.h
 +++ b/include/linux/kernel.h
-@@ -151,6 +151,8 @@ extern int vsprintf(char *buf, const char *, va_list)
+@@ -157,6 +157,8 @@ extern int vsprintf(char *buf, const char *, va_list)
  	__attribute__ ((format (printf, 2, 0)));
  extern int snprintf(char * buf, size_t size, const char * fmt, ...)
  	__attribute__ ((format (printf, 3, 4)));
@@ -2321,8 +2329,20 @@
  extern int vsnprintf(char *buf, size_t size, const char *fmt, va_list args)
  	__attribute__ ((format (printf, 3, 0)));
  extern int scnprintf(char * buf, size_t size, const char * fmt, ...)
+diff --git a/include/linux/mm.h b/include/linux/mm.h
+index 586a943..bd34f82 100644
+--- a/include/linux/mm.h
++++ b/include/linux/mm.h
+@@ -1244,6 +1244,7 @@ int drop_caches_sysctl_handler(struct ctl_table *, int, struct file *,
+ 					void __user *, size_t *, loff_t *);
+ unsigned long shrink_slab(unsigned long scanned, gfp_t gfp_mask,
+ 			unsigned long lru_pages);
++void drop_pagecache(void);
+ 
+ #ifndef CONFIG_MMU
+ #define randomize_va_space 0
 diff --git a/include/linux/netlink.h b/include/linux/netlink.h
-index fb0713b..2e14fde 100644
+index bec1062..e7f772f 100644
 --- a/include/linux/netlink.h
 +++ b/include/linux/netlink.h
 @@ -24,6 +24,8 @@
@@ -2335,10 +2355,10 @@
  #define MAX_LINKS 32		
  
 diff --git a/include/linux/suspend.h b/include/linux/suspend.h
-index 1d7d4c5..bbbb987 100644
+index a697742..505cfa2 100644
 --- a/include/linux/suspend.h
 +++ b/include/linux/suspend.h
-@@ -255,4 +255,69 @@ static inline void register_nosave_region_late(unsigned long b, unsigned long e)
+@@ -266,4 +266,69 @@ static inline void register_nosave_region_late(unsigned long b, unsigned long e)
  }
  #endif
  
@@ -2409,7 +2429,7 @@
 +
  #endif /* _LINUX_SUSPEND_H */
 diff --git a/include/linux/swap.h b/include/linux/swap.h
-index 878459a..55315f9 100644
+index 0b33776..5d6433b 100644
 --- a/include/linux/swap.h
 +++ b/include/linux/swap.h
 @@ -164,6 +164,7 @@ extern unsigned long totalram_pages;
@@ -2441,10 +2461,10 @@
  #endif /* __KERNEL__*/
  #endif /* _LINUX_SWAP_H */
 diff --git a/init/do_mounts.c b/init/do_mounts.c
-index 3885e70..131427c 100644
+index 660c1e5..8ea449f 100644
 --- a/init/do_mounts.c
 +++ b/init/do_mounts.c
-@@ -373,6 +373,8 @@ void __init prepare_namespace(void)
+@@ -398,6 +398,8 @@ void __init prepare_namespace(void)
  	if (is_floppy && rd_doload && rd_load_disk(0))
  		ROOT_DEV = Root_RAM0;
  
@@ -2478,18 +2498,18 @@
  	sys_fchdir(old_fd);
  	sys_mount("/", ".", NULL, MS_MOVE, NULL);
 diff --git a/init/main.c b/init/main.c
-index 99ce949..f4f8330 100644
+index f7fb200..6746e95 100644
 --- a/init/main.c
 +++ b/init/main.c
-@@ -56,6 +56,7 @@
+@@ -57,6 +57,7 @@
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/linux-2.6-suspend2.patch?r1=1.1.2.2.2.7&r2=1.1.2.2.2.8&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-suspend2-headers.patch?r1=1.1.2.6&r2=1.1.2.7&f=u

More information about the pld-cvs-commit mailing list