Author: pluto Date: Thu Oct 23 18:02:02 2008 GMT
Module: SOURCES Tag: LINUX_2_6
---- Log message:
- 2.6.27-rc8 patch from tuxonice-users mailinglist.
---- Files affected:
SOURCES:
linux-2.6-suspend2.patch (1.1.2.2.2.9 -> 1.1.2.2.2.10)
---- Diffs:
================================================================
Index: SOURCES/linux-2.6-suspend2.patch
diff -u SOURCES/linux-2.6-suspend2.patch:1.1.2.2.2.9
SOURCES/linux-2.6-suspend2.patch:1.1.2.2.2.10
--- SOURCES/linux-2.6-suspend2.patch:1.1.2.2.2.9 Mon Sep 29 01:25:02 2008
+++ SOURCES/linux-2.6-suspend2.patch Thu Oct 23 20:01:56 2008
@@ -1235,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 56a2f67..ec6fa04 100644
+index 3596d17..3e7e5ce 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -4045,6 +4045,13 @@ P: Maciej W. Rozycki
+@@ -4100,6 +4100,13 @@ P: Maciej W. Rozycki
M: [EMAIL PROTECTED]
S: Maintained
@@ -1252,58 +1252,11 @@
U14-34F SCSI DRIVER
P: Dario Ballabio
M: [EMAIL PROTECTED]
-diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
-index 8bcb6f4..529200c 100644
---- a/arch/x86/mm/fault.c
-+++ b/arch/x86/mm/fault.c
-@@ -25,6 +25,7 @@
- #include <linux/kprobes.h>
- #include <linux/uaccess.h>
- #include <linux/kdebug.h>
-+#include <linux/suspend.h>
-
- #include <asm/system.h>
- #include <asm/desc.h>
-@@ -49,6 +50,11 @@
- #define PF_RSVD (1<<3)
- #define PF_INSTR (1<<4)
-
-+#ifdef CONFIG_X86_32
-+int toi_faulted;
-+EXPORT_SYMBOL_GPL(toi_faulted);
-+#endif
-+
- static inline int notify_page_fault(struct pt_regs *regs)
- {
- #ifdef CONFIG_KPROBES
-@@ -604,6 +610,22 @@ void __kprobes do_page_fault(struct pt_regs *regs,
unsigned long error_code)
-
- si_code = SEGV_MAPERR;
-
-+ /* During a TuxOnIce atomic copy, with DEBUG_SLAB, we will
-+ * get page faults where slab has been unmapped. Map them
-+ * temporarily and set the variable that tells TuxOnIce to
-+ * unmap afterwards.
-+ */
-+
-+#ifdef CONFIG_DEBUG_PAGEALLOC /* X86_32 only */
-+ if (unlikely(toi_running && !toi_faulted)) {
-+ struct page *page = NULL;
-+ toi_faulted = 1;
-+ page = virt_to_page(address);
-+ kernel_map_pages(page, 1, 1);
-+ return;
-+ }
-+#endif
-+
- if (notify_page_fault(regs))
- return;
-
diff --git a/crypto/Kconfig b/crypto/Kconfig
-index 864456c..ecbebab 100644
+index d831859..59dbd07 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
-@@ -614,6 +614,14 @@ config CRYPTO_LZO
+@@ -666,6 +666,14 @@ config CRYPTO_LZO
help
This is the LZO algorithm.
@@ -1319,10 +1272,10 @@
endif # if CRYPTO
diff --git a/crypto/Makefile b/crypto/Makefile
-index ca02441..819b2cc 100644
+index d4f3ed8..fe05a9e 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
-@@ -62,6 +62,7 @@ obj-$(CONFIG_CRYPTO_SALSA20) += salsa20_generic.o
+@@ -67,6 +67,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
@@ -1662,11 +1615,31 @@
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("LZF Compression Algorithm");
+MODULE_AUTHOR("Marc Alexander Lehmann & Nigel Cunningham");
+diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
+index 273a944..37c1e9f 100644
+--- a/drivers/base/power/main.c
++++ b/drivers/base/power/main.c
+@@ -54,6 +54,7 @@ void device_pm_lock(void)
+ {
+ mutex_lock(&dpm_list_mtx);
+ }
++EXPORT_SYMBOL(device_pm_lock);
+
+ /**
+ * device_pm_unlock - unlock the list of active devices used by the PM core
+@@ -62,6 +63,7 @@ void device_pm_unlock(void)
+ {
+ mutex_unlock(&dpm_list_mtx);
+ }
++EXPORT_SYMBOL(device_pm_unlock);
+
+ /**
+ * device_pm_add - add a device to the list of active devices
diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c
-index d6365a9..03e1eff 100644
+index d524dc2..681972e 100644
--- a/drivers/macintosh/via-pmu.c
+++ b/drivers/macintosh/via-pmu.c
-@@ -39,7 +39,6 @@
+@@ -40,7 +40,6 @@
#include <linux/interrupt.h>
#include <linux/device.h>
#include <linux/sysdev.h>
@@ -1675,10 +1648,10 @@
#include <linux/suspend.h>
#include <linux/cpu.h>
diff --git a/drivers/md/md.c b/drivers/md/md.c
-index 2580ac1..4c20dab 100644
+index deeac4b..cbf1e49 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
-@@ -5730,6 +5730,8 @@ void md_do_sync(mddev_t *mddev)
+@@ -5899,6 +5899,8 @@ void md_do_sync(mddev_t *mddev)
last_mark = next;
}
@@ -1688,7 +1661,7 @@
if (kthread_should_stop())
goto interrupted;
diff --git a/fs/buffer.c b/fs/buffer.c
-index 0f51c0f..cebc137 100644
+index ac78d4c..3a927e2 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -247,6 +247,91 @@ void thaw_bdev(struct block_device *bdev, struct
super_block *sb)
@@ -1848,7 +1821,7 @@
if (nbytes < sizeof(struct fuse_out_header))
return -EINVAL;
diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
-index 2060bf0..9e23548 100644
+index fd03330..347e054 100644
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@ -7,12 +7,14 @@
@@ -1866,7 +1839,7 @@
#if BITS_PER_LONG >= 64
static inline void fuse_dentry_settime(struct dentry *entry, u64 time)
-@@ -176,6 +178,9 @@ static int fuse_dentry_revalidate(struct dentry *entry,
struct nameidata *nd)
+@@ -174,6 +176,9 @@ static int fuse_dentry_revalidate(struct dentry *entry,
struct nameidata *nd)
return 0;
fc = get_fuse_conn(inode);
@@ -1876,16 +1849,16 @@
req = fuse_get_req(fc);
if (IS_ERR(req))
return 0;
-@@ -271,6 +276,8 @@ static struct dentry *fuse_lookup(struct inode *dir,
struct dentry *entry,
+@@ -273,6 +278,8 @@ int fuse_lookup_name(struct super_block *sb, u64 nodeid,
struct qstr *name,
if (IS_ERR(req))
- return ERR_CAST(req);
+ goto out;
-+ FUSE_MIGHT_FREEZE(dir->i_sb, "fuse_lookup");
++ FUSE_MIGHT_FREEZE(sb, "fuse_lookup");
+
forget_req = fuse_get_req(fc);
+ err = PTR_ERR(forget_req);
if (IS_ERR(forget_req)) {
- fuse_put_request(fc, req);
-@@ -361,6 +368,8 @@ static int fuse_create_open(struct inode *dir, struct
dentry *entry, int mode,
+@@ -402,6 +409,8 @@ static int fuse_create_open(struct inode *dir, struct
dentry *entry, int mode,
if (IS_ERR(forget_req))
return PTR_ERR(forget_req);
@@ -1894,7 +1867,7 @@
req = fuse_get_req(fc);
err = PTR_ERR(req);
if (IS_ERR(req))
-@@ -447,6 +456,8 @@ static int create_new_entry(struct fuse_conn *fc, struct
fuse_req *req,
+@@ -488,6 +497,8 @@ static int create_new_entry(struct fuse_conn *fc, struct
fuse_req *req,
int err;
struct fuse_req *forget_req;
@@ -1903,7 +1876,7 @@
forget_req = fuse_get_req(fc);
if (IS_ERR(forget_req)) {
fuse_put_request(fc, req);
-@@ -544,7 +555,11 @@ static int fuse_mkdir(struct inode *dir, struct dentry
*entry, int mode)
+@@ -585,7 +596,11 @@ static int fuse_mkdir(struct inode *dir, struct dentry
*entry, int mode)
{
struct fuse_mkdir_in inarg;
struct fuse_conn *fc = get_fuse_conn(dir);
@@ -1916,7 +1889,7 @@
if (IS_ERR(req))
return PTR_ERR(req);
-@@ -564,7 +579,11 @@ static int fuse_symlink(struct inode *dir, struct dentry
*entry,
+@@ -605,7 +620,11 @@ static int fuse_symlink(struct inode *dir, struct dentry
*entry,
{
struct fuse_conn *fc = get_fuse_conn(dir);
unsigned len = strlen(link) + 1;
@@ -1929,7 +1902,7 @@
if (IS_ERR(req))
return PTR_ERR(req);
-@@ -581,7 +600,11 @@ static int fuse_unlink(struct inode *dir, struct dentry
*entry)
+@@ -622,7 +641,11 @@ static int fuse_unlink(struct inode *dir, struct dentry
*entry)
{
int err;
struct fuse_conn *fc = get_fuse_conn(dir);
@@ -1942,7 +1915,7 @@
if (IS_ERR(req))
return PTR_ERR(req);
-@@ -612,7 +635,11 @@ static int fuse_rmdir(struct inode *dir, struct dentry
*entry)
+@@ -653,7 +676,11 @@ static int fuse_rmdir(struct inode *dir, struct dentry
*entry)
{
int err;
struct fuse_conn *fc = get_fuse_conn(dir);
@@ -1956,7 +1929,7 @@
return PTR_ERR(req);
diff --git a/fs/fuse/file.c b/fs/fuse/file.c
-index 8092f0d..813c656 100644
+index 2bada6b..2e4af49 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -7,11 +7,13 @@
@@ -2009,7 +1982,7 @@
req = fuse_get_req(fc);
if (IS_ERR(req))
return PTR_ERR(req);
-@@ -1345,6 +1355,8 @@ static int fuse_setlk(struct file *file, struct
file_lock *fl, int flock)
+@@ -1350,6 +1360,8 @@ static int fuse_setlk(struct file *file, struct
file_lock *fl, int flock)
if (fl->fl_flags & FL_CLOSE)
return 0;
@@ -2018,7 +1991,7 @@
req = fuse_get_req(fc);
if (IS_ERR(req))
return PTR_ERR(req);
-@@ -1409,6 +1421,8 @@ static sector_t fuse_bmap(struct address_space *mapping,
sector_t block)
+@@ -1416,6 +1428,8 @@ static sector_t fuse_bmap(struct address_space *mapping,
sector_t block)
if (!inode->i_sb->s_bdev || fc->no_bmap)
return 0;
@@ -2047,10 +2020,10 @@
+ } \
+} while (0)
diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c
-index 3141690..c826200 100644
+index d2249f1..04ae6cb 100644
--- a/fs/fuse/inode.c
+++ b/fs/fuse/inode.c
-@@ -739,7 +739,7 @@ static int fuse_get_sb(struct file_system_type *fs_type,
+@@ -914,7 +914,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",
@@ -2059,7 +2032,7 @@
.get_sb = fuse_get_sb,
.kill_sb = kill_anon_super,
};
-@@ -758,7 +758,7 @@ static struct file_system_type fuseblk_fs_type = {
+@@ -933,7 +933,7 @@ static struct file_system_type fuseblk_fs_type = {
.name = "fuseblk",
.get_sb = fuse_get_sb_blk,
.kill_sb = kill_block_super,
@@ -2078,10 +2051,10 @@
}
+EXPORT_SYMBOL(sys_ioctl);
diff --git a/fs/namei.c b/fs/namei.c
-index 01e67dd..aedaedf 100644
+index 4ea63ed..65be6a6 100644
--- a/fs/namei.c
+++ b/fs/namei.c
-@@ -2314,6 +2314,8 @@ int vfs_unlink(struct inode *dir, struct dentry *dentry)
+@@ -2223,6 +2223,8 @@ int vfs_unlink(struct inode *dir, struct dentry *dentry)
if (!dir->i_op || !dir->i_op->unlink)
return -EPERM;
@@ -2090,62 +2063,11 @@
DQUOT_INIT(dir);
mutex_lock(&dentry->d_inode->i_mutex);
-diff --git a/include/asm-powerpc/suspend.h b/include/asm-powerpc/suspend.h
-index cbf2c94..e0756c2 100644
---- a/include/asm-powerpc/suspend.h
-+++ b/include/asm-powerpc/suspend.h
-@@ -6,4 +6,7 @@ static inline int arch_prepare_suspend(void) { return 0; }
- void save_processor_state(void);
- void restore_processor_state(void);
-
-+#define toi_faulted (0)
-+#define clear_toi_fault() do { } while (0)
-+
- #endif /* __ASM_POWERPC_SUSPEND_H */
-diff --git a/include/asm-ppc/suspend.h b/include/asm-ppc/suspend.h
-index 3df9f32..1e2e73d 100644
---- a/include/asm-ppc/suspend.h
-+++ b/include/asm-ppc/suspend.h
-@@ -10,3 +10,6 @@ static inline void save_processor_state(void)
- static inline void restore_processor_state(void)
- {
- }
-+
-+#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 24e1c08..441efd6 100644
---- a/include/asm-x86/suspend_32.h
-+++ b/include/asm-x86/suspend_32.h
-@@ -8,6 +8,9 @@
-
- static inline int arch_prepare_suspend(void) { return 0; }
-
-+extern int toi_faulted;
-+#define clear_toi_fault() do { toi_faulted = 0; } while (0)
-+
- /* image of the saved processor state */
- struct saved_context {
- u16 es, fs, gs, ss;
-diff --git a/include/asm-x86/suspend_64.h b/include/asm-x86/suspend_64.h
-index dc3262b..5ff82a1 100644
---- a/include/asm-x86/suspend_64.h
-+++ b/include/asm-x86/suspend_64.h
-@@ -14,6 +14,9 @@ static inline int arch_prepare_suspend(void)
- return 0;
- }
-
-+#define toi_faulted (0)
-+#define clear_toi_fault() do { } while (0)
-+
- /*
- * 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 71d70d1..b5de633 100644
+index b68ec09..6eebd34 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
-@@ -207,6 +207,7 @@ unifdef-y += filter.h
+@@ -208,6 +208,7 @@ unifdef-y += filter.h
unifdef-y += flat.h
unifdef-y += futex.h
unifdef-y += fs.h
@@ -2154,10 +2076,10 @@
unifdef-y += generic_serial.h
unifdef-y += hayesesp.h
diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h
-index 82aa36c..ee09d61 100644
+index eadaab4..7eb6655 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);
+@@ -171,6 +171,11 @@ wait_queue_head_t *bh_waitq_head(struct buffer_head *bh);
int fsync_bdev(struct block_device *);
struct super_block *freeze_bdev(struct block_device *);
void thaw_bdev(struct block_device *, struct super_block *);
@@ -2242,7 +2164,7 @@
+#endif
+#endif
diff --git a/include/linux/freezer.h b/include/linux/freezer.h
-index 0893499..01e9dc6 100644
+index deddeed..4d92953 100644
--- a/include/linux/freezer.h
+++ b/include/linux/freezer.h
@@ -127,6 +127,19 @@ static inline void set_freezable(void)
@@ -2263,9 +2185,9 @@
+extern void thaw_kernel_threads(void);
+
/*
- * Freezer-friendly wrappers around wait_event_interruptible() and
- * wait_event_interruptible_timeout(), originally defined in <linux/wait.h>
-@@ -169,6 +182,8 @@ static inline int freeze_processes(void) { BUG(); return
0; }
+ * Tell the freezer that the current task should be frozen by it and that it
+ * should send a fake signal to the task to freeze it.
+@@ -178,6 +191,8 @@ static inline int freeze_processes(void) { BUG(); return
0; }
static inline void thaw_processes(void) {}
static inline int try_to_freeze(void) { return 0; }
@@ -2275,7 +2197,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 d8e2762..7db243f 100644
+index 580b513..e7a3169 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -8,6 +8,7 @@
@@ -2286,7 +2208,7 @@
/*
* It's silly to have NR_OPEN bigger than NR_FILE, but you can change
-@@ -94,6 +95,7 @@ extern int dir_notify_enable;
+@@ -96,6 +97,7 @@ extern int dir_notify_enable;
#define FS_REQUIRES_DEV 1
#define FS_BINARY_MOUNTDATA 2
#define FS_HAS_SUBTYPE 4
@@ -2294,7 +2216,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.
-@@ -126,6 +128,7 @@ extern int dir_notify_enable;
+@@ -128,6 +130,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 */
@@ -2302,7 +2224,7 @@
#define MS_ACTIVE (1<<30)
#define MS_NOUSER (1<<31)
-@@ -1105,8 +1108,11 @@ enum {
+@@ -1141,8 +1144,11 @@ enum {
SB_FREEZE_TRANS = 2,
};
@@ -2317,10 +2239,10 @@
#define get_fs_excl() atomic_inc(¤t->fs_excl)
#define put_fs_excl() atomic_dec(¤t->fs_excl)
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
-index 2e70006..a43b516 100644
+index 2651f80..c50279d 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
-@@ -157,6 +157,8 @@ extern int vsprintf(char *buf, const char *, va_list)
+@@ -165,6 +165,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)));
@@ -2330,10 +2252,10 @@
__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
+index 72a15dc..01a7657 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 *,
+@@ -1264,6 +1264,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);
@@ -2342,7 +2264,7 @@
#ifndef CONFIG_MMU
#define randomize_va_space 0
diff --git a/include/linux/netlink.h b/include/linux/netlink.h
-index bec1062..e7f772f 100644
+index 9ff1b54..100dc2e 100644
--- a/include/linux/netlink.h
+++ b/include/linux/netlink.h
@@ -24,6 +24,8 @@
@@ -2355,12 +2277,12 @@
#define MAX_LINKS 32
diff --git a/include/linux/suspend.h b/include/linux/suspend.h
-index a697742..505cfa2 100644
+index 2ce8207..374e892 100644
--- a/include/linux/suspend.h
+++ b/include/linux/suspend.h
-@@ -266,4 +266,69 @@ static inline void register_nosave_region_late(unsigned
long b, unsigned long e)
- }
- #endif
+@@ -280,4 +280,69 @@ static inline void register_nosave_region_late(unsigned
long b, unsigned long e)
+
+ extern struct mutex pm_mutex;
+enum {
+ TOI_CAN_HIBERNATE,
@@ -2429,7 +2351,7 @@
+
#endif /* _LINUX_SUSPEND_H */
diff --git a/include/linux/swap.h b/include/linux/swap.h
-index 0b33776..5d6433b 100644
+index de40f16..44050a6 100644
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
@@ -164,6 +164,7 @@ extern unsigned long totalram_pages;
@@ -2449,7 +2371,7 @@
extern int vm_swappiness;
extern int remove_mapping(struct address_space *mapping, struct page *page);
extern long vm_total_pages;
-@@ -356,5 +359,10 @@ static inline swp_entry_t get_swap_page(void)
+@@ -353,5 +356,10 @@ static inline swp_entry_t get_swap_page(void)
#define disable_swap_token() do { } while(0)
#endif /* CONFIG_SWAP */
@@ -2461,10 +2383,10 @@
#endif /* __KERNEL__*/
#endif /* _LINUX_SWAP_H */
diff --git a/init/do_mounts.c b/init/do_mounts.c
-index 660c1e5..8ea449f 100644
+index 3715feb..0463ea1 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
-@@ -398,6 +398,8 @@ void __init prepare_namespace(void)
+@@ -400,6 +400,8 @@ void __init prepare_namespace(void)
if (is_floppy && rd_doload && rd_load_disk(0))
ROOT_DEV = Root_RAM0;
@@ -2498,7 +2420,7 @@
sys_fchdir(old_fd);
sys_mount("/", ".", NULL, MS_MOVE, NULL);
diff --git a/init/main.c b/init/main.c
-index f7fb200..6746e95 100644
+index f6f7042..038a94f 100644
--- a/init/main.c
+++ b/init/main.c
@@ -57,6 +57,7 @@
@@ -2509,7 +2431,7 @@
#include <linux/sched.h>
#include <linux/signal.h>
#include <linux/idr.h>
-@@ -602,6 +603,7 @@ asmlinkage void __init start_kernel(void)
+@@ -607,6 +608,7 @@ asmlinkage void __init start_kernel(void)
softirq_init();
timekeeping_init();
time_init();
@@ -2517,7 +2439,7 @@
sched_clock_init();
profile_init();
if (!irqs_disabled())
-@@ -641,6 +643,7 @@ asmlinkage void __init start_kernel(void)
+@@ -648,6 +650,7 @@ asmlinkage void __init start_kernel(void)
enable_debug_pagealloc();
cpu_hotplug_init();
kmem_cache_init();
@@ -2526,7 +2448,7 @@
idr_init_cache();
setup_per_cpu_pageset();
diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
-index b45da40..a74041c 100644
+index dcd165f..7c80422 100644
--- a/kernel/power/Kconfig
+++ b/kernel/power/Kconfig
@@ -34,6 +34,18 @@ config PM_VERBOSE
@@ -2548,7 +2470,7 @@
config CAN_PM_TRACE
def_bool y
depends on PM_DEBUG && PM_SLEEP && EXPERIMENTAL
-@@ -168,6 +180,272 @@ config PM_STD_PARTITION
+@@ -179,6 +191,272 @@ config PM_STD_PARTITION
suspended image to. It will simply pick the first available swap
device.
@@ -2864,10 +2786,10 @@
obj-$(CONFIG_HIBERNATION) += swsusp.o disk.o snapshot.o swap.o user.o
diff --git a/kernel/power/disk.c b/kernel/power/disk.c
-index 14a656c..141606e 100644
+index bbd85c6..2e444e6 100644
--- a/kernel/power/disk.c
+++ b/kernel/power/disk.c
-@@ -24,9 +24,11 @@
+@@ -25,9 +25,11 @@
#include "power.h"
@@ -2880,7 +2802,7 @@
dev_t swsusp_resume_device;
sector_t swsusp_resume_block;
-@@ -104,7 +106,7 @@ static int hibernation_test(int level) { return 0; }
+@@ -105,7 +107,7 @@ static int hibernation_test(int level) { return 0; }
* hibernation
*/
@@ -2889,7 +2811,7 @@
{
return (platform_mode && hibernation_ops) ?
hibernation_ops->begin() : 0;
-@@ -115,7 +117,7 @@ static int platform_begin(int platform_mode)
+@@ -116,7 +118,7 @@ static int platform_begin(int platform_mode)
* working state
*/
@@ -2898,7 +2820,7 @@
{
if (platform_mode && hibernation_ops)
hibernation_ops->end();
-@@ -126,7 +128,7 @@ static void platform_end(int platform_mode)
+@@ -127,7 +129,7 @@ static void platform_end(int platform_mode)
* platform driver if so configured and return an error code if it fails
<<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.9&r2=1.1.2.2.2.10&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
