Author: arekm Date: Mon Oct 25 06:15:44 2010 GMT Module: packages Tag: HEAD ---- Log message: - up to 2.6.36 version
---- Files affected: packages/kernel: kernel.spec (1.851 -> 1.852) , kernel-tuxonice.patch (1.17 -> 1.18) ---- Diffs: ================================================================ Index: packages/kernel/kernel.spec diff -u packages/kernel/kernel.spec:1.851 packages/kernel/kernel.spec:1.852 --- packages/kernel/kernel.spec:1.851 Sat Oct 23 15:55:45 2010 +++ packages/kernel/kernel.spec Mon Oct 25 08:15:38 2010 @@ -228,7 +228,7 @@ Patch59: kernel-rndis_host-wm5.patch # Project suspend2 renamed to tuxonice -# http://tuxonice.net/files/tuxonice-3.2-rc2-for-2.6.35.patch.bz2 +# http://tuxonice.net/files/tuxonice-3.2-rc2-for-2.6.36.patch.bz2 Patch69: kernel-tuxonice.patch Patch70: kernel-tuxonice-headers.patch @@ -1528,6 +1528,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.852 2010/10/25 06:15:38 arekm +- up to 2.6.36 version + Revision 1.851 2010/10/23 13:55:45 arekm - update routes patch for 2.6.36 ================================================================ Index: packages/kernel/kernel-tuxonice.patch diff -u packages/kernel/kernel-tuxonice.patch:1.17 packages/kernel/kernel-tuxonice.patch:1.18 --- packages/kernel/kernel-tuxonice.patch:1.17 Sun Oct 17 12:51:02 2010 +++ packages/kernel/kernel-tuxonice.patch Mon Oct 25 08:15:38 2010 @@ -1,8 +1,8 @@ diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt -index 2b2407d..50fc7fb 100644 +index 8dd7248..a411229 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt -@@ -2775,6 +2775,9 @@ and is between 256 and 4096 characters. It is defined in the file +@@ -2530,6 +2530,9 @@ and is between 256 and 4096 characters. It is defined in the file HIGHMEM regardless of setting of CONFIG_HIGHPTE. @@ -1450,10 +1450,10 @@ + testing. His efforts have contributed as much to TuxOnIce as any of the + names above. diff --git a/MAINTAINERS b/MAINTAINERS -index 02f75fc..bd6a84f 100644 +index f2a2b8e..dc5e653 100644 --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -5700,6 +5700,13 @@ S: Maintained +@@ -5848,6 +5848,13 @@ S: Maintained F: drivers/tc/ F: include/linux/tc.h @@ -1513,12 +1513,12 @@ #endif /* CONFIG_DEBUG_PAGEALLOC */ diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c -index 1290ba5..2280003 100644 +index 87bb35e..e2e2cfb 100644 --- a/arch/x86/power/cpu.c +++ b/arch/x86/power/cpu.c -@@ -114,9 +114,7 @@ void save_processor_state(void) - { +@@ -115,9 +115,7 @@ void save_processor_state(void) __save_processor_state(&saved_context); + save_sched_clock_state(); } -#ifdef CONFIG_X86_32 EXPORT_SYMBOL(save_processor_state); @@ -1547,7 +1547,7 @@ /* * pfn_is_nosave - check if given pfn is in the 'nosave' section diff --git a/arch/x86/power/hibernate_64.c b/arch/x86/power/hibernate_64.c -index d24f983..803b20a 100644 +index 460f314..4a46f5d 100644 --- a/arch/x86/power/hibernate_64.c +++ b/arch/x86/power/hibernate_64.c @@ -11,6 +11,7 @@ @@ -1586,7 +1586,7 @@ obj-$(CONFIG_BLK_DEV_BSG) += bsg.o obj-$(CONFIG_BLK_CGROUP) += blk-cgroup.o diff --git a/block/blk-core.c b/block/blk-core.c -index f0640d7..b485de4 100644 +index 32a1c12..6ee2fd4 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -37,6 +37,9 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(block_remap); @@ -1599,12 +1599,12 @@ static int __make_request(struct request_queue *q, struct bio *bio); /* -@@ -1579,6 +1582,9 @@ void submit_bio(int rw, struct bio *bio) +@@ -1598,6 +1601,9 @@ void submit_bio(int rw, struct bio *bio) bio->bi_rw |= rw; + if (unlikely(trap_non_toi_io)) -+ BUG_ON(!bio_rw_flagged(bio, BIO_RW_TUXONICE)); ++ BUG_ON(!(bio->bi_rw & REQ_TOI)); + /* * If it's a regular read/write or a barrier with data attached, @@ -1709,10 +1709,10 @@ +EXPORT_SYMBOL_GPL(next_bdev_of_type); diff --git a/block/uuid.c b/block/uuid.c new file mode 100644 -index 0000000..d5dea70 +index 0000000..e3b17e1 --- /dev/null +++ b/block/uuid.c -@@ -0,0 +1,492 @@ +@@ -0,0 +1,496 @@ +#include <linux/blkdev.h> +#include <linux/ctype.h> +#include <linux/fs_uuid.h> @@ -1907,8 +1907,7 @@ + } + + lock_page(page); -+ submit_bio(READ | (1 << BIO_RW_SYNCIO) | -+ (1 << BIO_RW_UNPLUG), bio); ++ submit_bio(READ | REQ_SYNC | REQ_UNPLUG, bio); + + wait_on_page_locked(page); + if (PageError(page)) { @@ -2032,7 +2031,7 @@ + got = fs_info_from_block_dev(bdev); + + if (got && !memcmp(got->uuid, seek->uuid, 16)) { -+ PRINTK(" Having matching UUID.\n"); ++ PRINTK(" Have matching UUID.\n"); + PRINTK(" Got: LMS %d, LM %p.\n", got->last_mount_size, got->last_mount); + PRINTK(" Seek: LMS %d, LM %p.\n", seek->last_mount_size, seek->last_mount); + result = 1; @@ -2135,12 +2134,17 @@ + goto no_uuid; + + if (!uuid_data || uuid_pg_num != last_uuid_pg_num) { -+ if (uuid_data_page) -+ __free_page(uuid_data_page); -+ uuid_data_page = read_bdev_page(bdev, uuid_pg_num); -+ if (!uuid_data_page) -+ continue; -+ uuid_data = page_address(uuid_data_page); ++ /* No need to reread the page from above */ ++ if (uuid_pg_num == pg_num && uuid_data) ++ memcpy(uuid_data, data, PAGE_SIZE); ++ else { ++ if (uuid_data_page) ++ __free_page(uuid_data_page); ++ uuid_data_page = read_bdev_page(bdev, uuid_pg_num); ++ if (!uuid_data_page) ++ continue; ++ uuid_data = page_address(uuid_data_page); ++ } + } + + last_uuid_pg_num = uuid_pg_num; @@ -2206,10 +2210,10 @@ + +__setup("uuid_debug", uuid_debug_setup); diff --git a/crypto/Kconfig b/crypto/Kconfig -index df332c1..b0101c1 100644 +index e573077..e6637ce 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig -@@ -824,6 +824,13 @@ config CRYPTO_LZO +@@ -829,6 +829,13 @@ config CRYPTO_LZO help This is the LZO algorithm. @@ -2224,7 +2228,7 @@ config CRYPTO_ANSI_CPRNG diff --git a/crypto/Makefile b/crypto/Makefile -index d7e6441..76b9a9e 100644 +index 423b7de..3310ffa 100644 --- a/crypto/Makefile +++ b/crypto/Makefile @@ -78,6 +78,7 @@ obj-$(CONFIG_CRYPTO_DEFLATE) += deflate.o @@ -2568,10 +2572,10 @@ +MODULE_DESCRIPTION("LZF Compression Algorithm"); +MODULE_AUTHOR("Marc Alexander Lehmann & Nigel Cunningham"); diff --git a/drivers/char/vt.c b/drivers/char/vt.c -index 7cdb6ee..f114914 100644 +index 281aada..bf07b26 100644 --- a/drivers/char/vt.c +++ b/drivers/char/vt.c -@@ -2461,6 +2461,7 @@ int vt_kmsg_redirect(int new) +@@ -2473,6 +2473,7 @@ int vt_kmsg_redirect(int new) else return kmsg_con; } @@ -2580,10 +2584,10 @@ /* * Console on virtual terminal diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c -index 33dad3f..47fb186 100644 +index 5663d27..a35669d 100644 --- a/drivers/gpu/drm/drm_gem.c +++ b/drivers/gpu/drm/drm_gem.c -@@ -133,7 +133,8 @@ int drm_gem_object_init(struct drm_device *dev, +@@ -143,7 +143,8 @@ int drm_gem_object_init(struct drm_device *dev, BUG_ON((size & (PAGE_SIZE - 1)) != 0); obj->dev = dev; @@ -2594,10 +2598,10 @@ return -ENOMEM; diff --git a/drivers/md/md.c b/drivers/md/md.c -index 7476d95..7a53775 100644 +index f20d13e..c332dc4 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c -@@ -6634,6 +6634,9 @@ void md_do_sync(mddev_t *mddev) +@@ -6694,6 +6694,9 @@ void md_do_sync(mddev_t *mddev) mddev->curr_resync = 2; try_again: @@ -2607,7 +2611,7 @@ if (kthread_should_stop()) set_bit(MD_RECOVERY_INTR, &mddev->recovery); -@@ -6656,6 +6659,10 @@ void md_do_sync(mddev_t *mddev) +@@ -6716,6 +6719,10 @@ void md_do_sync(mddev_t *mddev) * time 'round when curr_resync == 2 */ continue; @@ -2618,7 +2622,7 @@ /* We need to wait 'interruptible' so as not to * contribute to the load average, and not to * be caught by 'softlockup' -@@ -6668,6 +6675,7 @@ void md_do_sync(mddev_t *mddev) +@@ -6728,6 +6735,7 @@ void md_do_sync(mddev_t *mddev) " share one or more physical units)\n", desc, mdname(mddev), mdname(mddev2)); mddev_put(mddev2); @@ -2626,7 +2630,7 @@ if (signal_pending(current)) flush_signals(current); schedule(); -@@ -6777,6 +6785,9 @@ void md_do_sync(mddev_t *mddev) +@@ -6837,6 +6845,9 @@ void md_do_sync(mddev_t *mddev) || kthread_should_stop()); } @@ -2636,7 +2640,7 @@ if (kthread_should_stop()) goto interrupted; -@@ -6821,6 +6832,9 @@ void md_do_sync(mddev_t *mddev) +@@ -6881,6 +6892,9 @@ void md_do_sync(mddev_t *mddev) last_mark = next; } @@ -2646,7 +2650,7 @@ if (kthread_should_stop()) goto interrupted; -@@ -6995,6 +7009,8 @@ void md_check_recovery(mddev_t *mddev) +@@ -7052,6 +7066,8 @@ void md_check_recovery(mddev_t *mddev) { mdk_rdev_t *rdev; @@ -2656,10 +2660,10 @@ if (mddev->bitmap) bitmap_daemon_work(mddev); diff --git a/fs/block_dev.c b/fs/block_dev.c -index 4c54c86..79a77ac 100644 +index 50e8c85..aca1764 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c -@@ -295,6 +295,93 @@ out: +@@ -294,6 +294,93 @@ out: } EXPORT_SYMBOL(thaw_bdev); @@ -2754,7 +2758,7 @@ { return block_write_full_page(page, blkdev_get_block, wbc); diff --git a/fs/drop_caches.c b/fs/drop_caches.c -index 83c4f60..8f7ec03 100644 +index 2195c21..dd1fc80 100644 --- a/fs/drop_caches.c +++ b/fs/drop_caches.c @@ -8,6 +8,7 @@ @@ -2792,7 +2796,7 @@ .kill_sb = fuse_ctl_kill_sb, }; diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c -index 9424796..25c6277 100644 +index cde755c..0998309 100644 --- a/fs/fuse/dev.c +++ b/fs/fuse/dev.c @@ -7,6 +7,7 @@ @@ -2811,7 +2815,7 @@ #include <linux/pipe_fs_i.h> #include <linux/swap.h> #include <linux/splice.h> -@@ -961,6 +963,8 @@ static ssize_t fuse_dev_do_read(struct fuse_conn *fc, struct file *file, +@@ -979,6 +981,8 @@ static ssize_t fuse_dev_do_read(struct fuse_conn *fc, struct file *file, struct fuse_in *in; unsigned reqsize; @@ -2820,7 +2824,7 @@ restart: spin_lock(&fc->lock); err = -EAGAIN; -@@ -1395,6 +1399,9 @@ static ssize_t fuse_dev_write(struct kiocb *iocb, const struct iovec *iov, +@@ -1612,6 +1616,9 @@ static ssize_t fuse_dev_write(struct kiocb *iocb, const struct iovec *iov, if (!fc) return -EPERM; @@ -2831,7 +2835,7 @@ return fuse_dev_do_write(fc, &cs, iov_length(iov, nr_segs)); diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c -index 3cdc5f7..725cb5a 100644 +index c9627c9..a554506 100644 --- a/fs/fuse/dir.c +++ b/fs/fuse/dir.c @@ -7,12 +7,14 @@ @@ -2948,7 +2952,7 @@ return PTR_ERR(req); diff --git a/fs/fuse/file.c b/fs/fuse/file.c -index ada0ade..ca89e06 100644 +index c822458..72e6ac4 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c @@ -7,11 +7,13 @@ @@ -3094,10 +3098,10 @@ + } \ +} while (0) diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c -index ec14d19..2a82a08 100644 +index da9e6e1..8ec7a9a 100644 --- a/fs/fuse/inode.c +++ b/fs/fuse/inode.c -@@ -1062,7 +1062,7 @@ static void fuse_kill_sb_anon(struct super_block *sb) +@@ -1064,7 +1064,7 @@ static void fuse_kill_sb_anon(struct super_block *sb) static struct file_system_type fuse_fs_type = { .owner = THIS_MODULE, .name = "fuse", @@ -3106,7 +3110,7 @@ .get_sb = fuse_get_sb, .kill_sb = fuse_kill_sb_anon, }; -@@ -1094,7 +1094,7 @@ static struct file_system_type fuseblk_fs_type = { +@@ -1096,7 +1096,7 @@ static struct file_system_type fuseblk_fs_type = { .name = "fuseblk", .get_sb = fuse_get_sb_blk, .kill_sb = fuse_kill_sb_blk, @@ -3116,10 +3120,10 @@ static inline int register_fuseblk(void) diff --git a/fs/namei.c b/fs/namei.c -index 868d0cb..325b6cf 100644 +index 24896e8..2aa39ee 100644 --- a/fs/namei.c +++ b/fs/namei.c -@@ -2256,6 +2256,8 @@ int vfs_unlink(struct inode *dir, struct dentry *dentry) +@@ -2236,6 +2236,8 @@ int vfs_unlink(struct inode *dir, struct dentry *dentry) if (!dir->i_op->unlink) return -EPERM; @@ -3129,7 +3133,7 @@ if (d_mountpoint(dentry)) error = -EBUSY; diff --git a/fs/super.c b/fs/super.c -index c7765bd..197a0a3 100644 +index 8819e3a..62fecfb 100644 --- a/fs/super.c +++ b/fs/super.c @@ -34,6 +34,8 @@ @@ -3141,34 +3145,38 @@ DEFINE_SPINLOCK(sb_lock); /** -diff --git a/include/linux/Kbuild b/include/linux/Kbuild -index 9aa9bca..121a9f4 100644 ---- a/include/linux/Kbuild -+++ b/include/linux/Kbuild -@@ -216,6 +216,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 += hdlcdrv.h diff --git a/include/linux/bio.h b/include/linux/bio.h -index 7fc5606..07e9b97 100644 +index 5274103..02ef0ed 100644 --- a/include/linux/bio.h +++ b/include/linux/bio.h -@@ -175,8 +175,11 @@ enum bio_rw_flags { - BIO_RW_META, - BIO_RW_DISCARD, - BIO_RW_NOIDLE, -+ BIO_RW_TUXONICE, - }; +@@ -31,6 +31,8 @@ + /* struct bio, bio_vec and BIO_* flags are defined in blk_types.h */ + #include <linux/blk_types.h> +extern int trap_non_toi_io; + - /* - * First four bits must match between bio->bi_rw and rq->cmd_flags, make - * that explicit here. + #define BIO_DEBUG + + #ifdef BIO_DEBUG +diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h +index ca83a97..36032d4 100644 +--- a/include/linux/blk_types.h ++++ b/include/linux/blk_types.h +@@ -151,6 +151,7 @@ enum rq_flag_bits { + __REQ_IO_STAT, /* account I/O stat */ + __REQ_MIXED_MERGE, /* merge of different types, fail separately */ + __REQ_SECURE, /* secure discard (used with __REQ_DISCARD) */ ++ __REQ_TOI, /* TuxOnIce I/O */ + __REQ_NR_BITS, /* stops here */ + }; + +@@ -192,5 +193,6 @@ enum rq_flag_bits { + #define REQ_IO_STAT (1 << __REQ_IO_STAT) + #define REQ_MIXED_MERGE (1 << __REQ_MIXED_MERGE) + #define REQ_SECURE (1 << __REQ_SECURE) ++#define REQ_TOI (1 << __REQ_TOI) + + #endif /* __LINUX_BLK_TYPES_H */ diff --git a/include/linux/freezer.h b/include/linux/freezer.h index da7e52b..a45b332 100644 --- a/include/linux/freezer.h @@ -3203,10 +3211,10 @@ 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 f0f447a..be4dd65 100644 +index 63d069b..0459560 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h -@@ -176,6 +176,7 @@ struct inodes_stat_t { +@@ -175,6 +175,7 @@ struct inodes_stat_t { #define FS_REQUIRES_DEV 1 #define FS_BINARY_MOUNTDATA 2 #define FS_HAS_SUBTYPE 4 @@ -3214,7 +3222,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. -@@ -209,6 +210,7 @@ struct inodes_stat_t { +@@ -208,6 +209,7 @@ struct inodes_stat_t { #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 */ @@ -3222,7 +3230,7 @@ #define MS_BORN (1<<29) #define MS_ACTIVE (1<<30) #define MS_NOUSER (1<<31) -@@ -236,6 +238,8 @@ struct inodes_stat_t { +@@ -235,6 +237,8 @@ struct inodes_stat_t { #define S_NOCMTIME 128 /* Do not update file c/mtime */ #define S_SWAPFILE 256 /* Do not truncate: swapon got its bmaps */ #define S_PRIVATE 512 /* Inode is fs-internal */ @@ -3239,7 +3247,7 @@ #include <asm/atomic.h> #include <asm/byteorder.h> -@@ -1396,8 +1401,11 @@ enum { +@@ -1398,8 +1403,11 @@ enum { SB_FREEZE_TRANS = 2, }; @@ -3253,7 +3261,7 @@ #define get_fs_excl() atomic_inc(¤t->fs_excl) #define put_fs_excl() atomic_dec(¤t->fs_excl) -@@ -1968,6 +1976,13 @@ extern struct super_block *freeze_bdev(struct block_device *); +@@ -1969,6 +1977,13 @@ extern struct super_block *freeze_bdev(struct block_device *); extern void emergency_thaw_all(void); extern int thaw_bdev(struct block_device *bdev, struct super_block *sb); extern int fsync_bdev(struct block_device *); @@ -3293,10 +3301,10 @@ +struct block_device *next_bdev_of_type(struct block_device *last, + const char *key); diff --git a/include/linux/mm.h b/include/linux/mm.h -index a2b4804..90d0dfa 100644 +index 74949fb..5dc48aa 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h -@@ -98,6 +98,7 @@ extern unsigned int kobjsize(const void *objp); +@@ -102,6 +102,7 @@ extern unsigned int kobjsize(const void *objp); #define VM_HUGETLB 0x00400000 /* Huge TLB Page VM */ #define VM_NONLINEAR 0x00800000 /* Is non-linear (remap_file_pages) */ #define VM_MAPPED_COPY 0x01000000 /* T if mapped copy of data (nommu mmap) */ @@ -3304,7 +3312,7 @@ #define VM_INSERTPAGE 0x02000000 /* The vma has had "vm_insert_page()" done on it */ #define VM_ALWAYSDUMP 0x04000000 /* Always include in core dumps */ -@@ -1424,6 +1425,7 @@ int drop_caches_sysctl_handler(struct ctl_table *, int, +@@ -1445,6 +1446,7 @@ int drop_caches_sysctl_handler(struct ctl_table *, int, void __user *, size_t *, loff_t *); unsigned long shrink_slab(unsigned long scanned, gfp_t gfp_mask, unsigned long lru_pages); @@ -3313,7 +3321,7 @@ #ifndef CONFIG_MMU #define randomize_va_space 0 diff --git a/include/linux/netlink.h b/include/linux/netlink.h -index 59d0669..5efa8e0 100644 +index 1235669..1118a80 100644 --- a/include/linux/netlink.h +++ b/include/linux/netlink.h @@ -24,6 +24,8 @@ @@ -3326,10 +3334,10 @@ #define MAX_LINKS 32 diff --git a/include/linux/suspend.h b/include/linux/suspend.h -index bc7d6bb..311897c 100644 +index 4af270e..8331c65 100644 --- a/include/linux/suspend.h +++ b/include/linux/suspend.h -@@ -329,4 +329,70 @@ static inline void unlock_system_sleep(void) +@@ -338,4 +338,70 @@ static inline void unlock_system_sleep(void) } #endif @@ -3401,10 +3409,10 @@ +#endif #endif /* _LINUX_SUSPEND_H */ diff --git a/include/linux/swap.h b/include/linux/swap.h -index ff4acea..5aa8559 100644 +index 7cdd633..30303dd 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h -@@ -198,6 +198,7 @@ struct swap_list_t { +@@ -199,6 +199,7 @@ struct swap_list_t { extern unsigned long totalram_pages; extern unsigned long totalreserve_pages; extern unsigned int nr_free_buffer_pages(void); @@ -3413,7 +3421,7 @@ /* Definition of global_page_state not available yet */ @@ -248,6 +249,8 @@ extern unsigned long mem_cgroup_shrink_node_zone(struct mem_cgroup *mem, - int nid); + struct zone *zone); extern int __isolate_lru_page(struct page *page, int mode, int file); extern unsigned long shrink_all_memory(unsigned long nr_pages); +extern unsigned long shrink_memory_mask(unsigned long nr_to_reclaim, @@ -3454,7 +3462,7 @@ out: devtmpfs_mount("dev"); diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c -index 2b10853..ec3e087 100644 +index 3098a38..349b9a3 100644 --- a/init/do_mounts_initrd.c +++ b/init/do_mounts_initrd.c @@ -6,6 +6,7 @@ @@ -3465,7 +3473,7 @@ #include <linux/freezer.h> #include "do_mounts.h" -@@ -64,6 +65,11 @@ static void __init handle_initrd(void) +@@ -65,6 +66,11 @@ static void __init handle_initrd(void) current->flags &= ~PF_FREEZER_SKIP; @@ -3478,10 +3486,10 @@ sys_fchdir(old_fd); sys_mount("/", ".", NULL, MS_MOVE, NULL); diff --git a/init/main.c b/init/main.c -index a42fdf4..5a4febe 100644 +index 94ab488..22a2b95 100644 --- a/init/main.c +++ b/init/main.c -@@ -117,6 +117,7 @@ extern void softirq_init(void); +@@ -114,6 +114,7 @@ extern void softirq_init(void); char __initdata boot_command_line[COMMAND_LINE_SIZE]; /* Untouched saved command line (eg. for /proc) */ char *saved_command_line; @@ -3490,10 +3498,10 @@ static char *static_command_line; diff --git a/kernel/cpu.c b/kernel/cpu.c -index 97d1b42..b6e21bb 100644 +index f6e726f..6711424 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c -@@ -428,6 +428,7 @@ int disable_nonboot_cpus(void) +@@ -422,6 +422,7 @@ int disable_nonboot_cpus(void) cpu_maps_update_done(); return error; } @@ -3501,7 +3509,7 @@ <<Diff was trimmed, longer than 597 lines>> ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.851&r2=1.852&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-tuxonice.patch?r1=1.17&r2=1.18&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
