Author: arekm Date: Sun Mar 29 11:57:39 2009 GMT Module: SOURCES Tag: LINUX_2_6 ---- Log message: New from http://www.tuxonice.net/downloads/all/current-tuxonice-for-head.patch-20090313-v1.bz2
---- Files affected: SOURCES: linux-2.6-suspend2.patch (1.1.2.2.2.16 -> 1.1.2.2.2.17) ---- Diffs: ================================================================ Index: SOURCES/linux-2.6-suspend2.patch diff -u SOURCES/linux-2.6-suspend2.patch:1.1.2.2.2.16 SOURCES/linux-2.6-suspend2.patch:1.1.2.2.2.17 --- SOURCES/linux-2.6-suspend2.patch:1.1.2.2.2.16 Sat Mar 14 10:24:08 2009 +++ SOURCES/linux-2.6-suspend2.patch Sun Mar 29 13:57:33 2009 @@ -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 fbc8fa5..b2b74f8 100644 +index 61aeb5a..4132787 100644 --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -4233,6 +4233,13 @@ P: Maciej W. Rozycki +@@ -4336,6 +4336,13 @@ P: Maciej W. Rozycki M: [email protected] S: Maintained @@ -1253,10 +1253,10 @@ P: Dario Ballabio M: [email protected] diff --git a/arch/powerpc/mm/pgtable_32.c b/arch/powerpc/mm/pgtable_32.c -index 2e664f3..cab7111 100644 +index 58bcaeb..f5e16a4 100644 --- a/arch/powerpc/mm/pgtable_32.c +++ b/arch/powerpc/mm/pgtable_32.c -@@ -397,6 +397,7 @@ void kernel_map_pages(struct page *page, int numpages, int enable) +@@ -388,6 +388,7 @@ void kernel_map_pages(struct page *page, int numpages, int enable) change_page_attr(page, numpages, enable ? PAGE_KERNEL : __pgprot(0)); } @@ -1265,10 +1265,10 @@ static int fixmaps; diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c -index cc5a254..1216ab3 100644 +index 4526b3a..6851f01 100644 --- a/arch/x86/kernel/reboot.c +++ b/arch/x86/kernel/reboot.c -@@ -511,6 +511,7 @@ void machine_restart(char *cmd) +@@ -605,6 +605,7 @@ void machine_restart(char *cmd) { machine_ops.restart(cmd); } @@ -1277,10 +1277,10 @@ void machine_halt(void) { diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c -index f664bc1..359f62f 100644 +index 7233bd7..0079a2c 100644 --- a/arch/x86/mm/pageattr.c +++ b/arch/x86/mm/pageattr.c -@@ -1149,6 +1149,7 @@ void kernel_map_pages(struct page *page, int numpages, int enable) +@@ -1154,6 +1154,7 @@ void kernel_map_pages(struct page *page, int numpages, int enable) */ __flush_tlb_all(); } @@ -1288,7 +1288,7 @@ #ifdef CONFIG_HIBERNATION -@@ -1163,7 +1164,7 @@ bool kernel_page_present(struct page *page) +@@ -1168,7 +1169,7 @@ bool kernel_page_present(struct page *page) pte = lookup_address((unsigned long)page_address(page), &level); return (pte_val(*pte) & _PAGE_PRESENT); } @@ -1363,10 +1363,10 @@ } +EXPORT_SYMBOL_GPL(arch_hibernation_header_restore); diff --git a/crypto/Kconfig b/crypto/Kconfig -index dc20a34..3d00017 100644 +index 8dde4fc..1867a5e 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig -@@ -287,6 +287,14 @@ config CRYPTO_MD5 +@@ -286,6 +286,14 @@ config CRYPTO_MD5 help MD5 message digest algorithm (RFC1321). @@ -1380,12 +1380,12 @@ + config CRYPTO_MICHAEL_MIC tristate "Michael MIC keyed digest algorithm" - select CRYPTO_ALGAPI + select CRYPTO_HASH diff --git a/crypto/Makefile b/crypto/Makefile -index cd4a4ed..800eced 100644 +index 46b08bf..0cab903 100644 --- a/crypto/Makefile +++ b/crypto/Makefile -@@ -71,6 +71,7 @@ obj-$(CONFIG_CRYPTO_SALSA20) += salsa20_generic.o +@@ -72,6 +72,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 @@ -1726,7 +1726,7 @@ +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 692c20b..b7dfeea 100644 +index 2d14f4a..dc9ef3b 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -54,6 +54,7 @@ void device_pm_lock(void) @@ -1746,7 +1746,7 @@ /** * device_pm_add - add a device to the list of active devices diff --git a/drivers/char/vt.c b/drivers/char/vt.c -index 008176e..7d67569 100644 +index 7900bd6..a5a8717 100644 --- a/drivers/char/vt.c +++ b/drivers/char/vt.c @@ -187,6 +187,7 @@ int fg_console; @@ -1758,10 +1758,10 @@ /* * For each existing display, we have a pointer to console currently visible diff --git a/drivers/md/md.c b/drivers/md/md.c -index fb15676..d6142dc 100644 +index a307f87..6eb04ea 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c -@@ -5595,7 +5595,6 @@ void md_done_sync(mddev_t *mddev, int blocks, int ok) +@@ -5778,7 +5778,6 @@ void md_done_sync(mddev_t *mddev, int blocks, int ok) } } @@ -1769,7 +1769,7 @@ /* md_write_start(mddev, bi) * If we need to update some array metadata (e.g. 'active' flag * in superblock) before writing, schedule a superblock update -@@ -5740,6 +5739,9 @@ void md_do_sync(mddev_t *mddev) +@@ -5922,6 +5921,9 @@ void md_do_sync(mddev_t *mddev) mddev->curr_resync = 2; try_again: @@ -1779,7 +1779,7 @@ if (kthread_should_stop()) { set_bit(MD_RECOVERY_INTR, &mddev->recovery); goto skip; -@@ -5761,6 +5763,10 @@ void md_do_sync(mddev_t *mddev) +@@ -5943,6 +5945,10 @@ void md_do_sync(mddev_t *mddev) * time 'round when curr_resync == 2 */ continue; @@ -1790,7 +1790,7 @@ /* We need to wait 'interruptible' so as not to * contribute to the load average, and not to * be caught by 'softlockup' -@@ -5773,6 +5779,7 @@ void md_do_sync(mddev_t *mddev) +@@ -5955,6 +5961,7 @@ void md_do_sync(mddev_t *mddev) " share one or more physical units)\n", desc, mdname(mddev), mdname(mddev2)); mddev_put(mddev2); @@ -1798,7 +1798,7 @@ if (signal_pending(current)) flush_signals(current); schedule(); -@@ -5856,6 +5863,10 @@ void md_do_sync(mddev_t *mddev) +@@ -6038,6 +6045,10 @@ void md_do_sync(mddev_t *mddev) mddev->resync_max > j || kthread_should_stop()); } @@ -1809,7 +1809,7 @@ if (kthread_should_stop()) goto interrupted; sectors = mddev->pers->sync_request(mddev, j, &skipped, -@@ -5899,6 +5910,9 @@ void md_do_sync(mddev_t *mddev) +@@ -6081,6 +6092,9 @@ void md_do_sync(mddev_t *mddev) last_mark = next; } @@ -1820,10 +1820,10 @@ if (kthread_should_stop()) goto interrupted; diff --git a/fs/buffer.c b/fs/buffer.c -index 5e62011..ce937fa 100644 +index 9f69741..0c43444 100644 --- a/fs/buffer.c +++ b/fs/buffer.c -@@ -246,6 +246,93 @@ void thaw_bdev(struct block_device *bdev, struct super_block *sb) +@@ -310,6 +310,93 @@ int thaw_bdev(struct block_device *bdev, struct super_block *sb) } EXPORT_SYMBOL(thaw_bdev); @@ -1947,10 +1947,10 @@ int drop_caches_sysctl_handler(ctl_table *table, int write, struct file *file, void __user *buffer, size_t *length, loff_t *ppos) diff --git a/fs/fuse/control.c b/fs/fuse/control.c -index 4f3cab3..f15b0c5 100644 +index 99c99df..cadffd8 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) +@@ -209,6 +209,7 @@ static void fuse_ctl_kill_sb(struct super_block *sb) static struct file_system_type fuse_ctl_fs_type = { .owner = THIS_MODULE, .name = "fusectl", @@ -1959,7 +1959,7 @@ .kill_sb = fuse_ctl_kill_sb, }; diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c -index 2e37f14..e5f1188 100644 +index ba76b68..e9942d4 100644 --- a/fs/fuse/dev.c +++ b/fs/fuse/dev.c @@ -7,6 +7,7 @@ @@ -1978,7 +1978,7 @@ MODULE_ALIAS_MISCDEV(FUSE_MINOR); -@@ -744,6 +746,8 @@ static ssize_t fuse_dev_read(struct kiocb *iocb, const struct iovec *iov, +@@ -752,6 +754,8 @@ static ssize_t fuse_dev_read(struct kiocb *iocb, const struct iovec *iov, if (!fc) return -EPERM; @@ -1987,7 +1987,7 @@ restart: spin_lock(&fc->lock); err = -EAGAIN; -@@ -870,6 +874,9 @@ static ssize_t fuse_dev_write(struct kiocb *iocb, const struct iovec *iov, +@@ -912,6 +916,9 @@ static ssize_t fuse_dev_write(struct kiocb *iocb, const struct iovec *iov, if (!fc) return -EPERM; @@ -1998,7 +1998,7 @@ if (nbytes < sizeof(struct fuse_out_header)) return -EINVAL; diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c -index fd03330..85fec3a 100644 +index fdff346..1fd3cd1 100644 --- a/fs/fuse/dir.c +++ b/fs/fuse/dir.c @@ -7,12 +7,14 @@ @@ -2101,7 +2101,7 @@ if (IS_ERR(req)) return PTR_ERR(req); -@@ -653,7 +678,11 @@ static int fuse_rmdir(struct inode *dir, struct dentry *entry) +@@ -655,7 +680,11 @@ static int fuse_rmdir(struct inode *dir, struct dentry *entry) { int err; struct fuse_conn *fc = get_fuse_conn(dir); @@ -2115,7 +2115,7 @@ return PTR_ERR(req); diff --git a/fs/fuse/file.c b/fs/fuse/file.c -index d8029d8..66905e4 100644 +index d9fdb7c..57922c4 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c @@ -7,11 +7,13 @@ @@ -2141,7 +2141,7 @@ req = fuse_get_req(fc); if (IS_ERR(req)) return PTR_ERR(req); -@@ -270,6 +274,8 @@ static int fuse_flush(struct file *file, fl_owner_t id) +@@ -279,6 +283,8 @@ static int fuse_flush(struct file *file, fl_owner_t id) if (fc->no_flush) return 0; @@ -2150,7 +2150,7 @@ req = fuse_get_req_nofail(fc, file); memset(&inarg, 0, sizeof(inarg)); inarg.fh = ff->fh; -@@ -321,6 +327,8 @@ int fuse_fsync_common(struct file *file, struct dentry *de, int datasync, +@@ -330,6 +336,8 @@ int fuse_fsync_common(struct file *file, struct dentry *de, int datasync, if ((!isdir && fc->no_fsync) || (isdir && fc->no_fsyncdir)) return 0; @@ -2159,7 +2159,7 @@ /* * Start writeback against all dirty pages of the inode, then * wait for all outstanding writes, before sending the FSYNC -@@ -429,6 +437,8 @@ static int fuse_readpage(struct file *file, struct page *page) +@@ -438,6 +446,8 @@ static int fuse_readpage(struct file *file, struct page *page) if (is_bad_inode(inode)) goto out; @@ -2168,7 +2168,7 @@ /* * Page writeback can extend beyond the liftime of the * page-cache page, so make sure we read a properly synced -@@ -529,6 +539,9 @@ static int fuse_readpages_fill(void *_data, struct page *page) +@@ -538,6 +548,9 @@ static int fuse_readpages_fill(void *_data, struct page *page) struct inode *inode = data->inode; struct fuse_conn *fc = get_fuse_conn(inode); @@ -2178,7 +2178,7 @@ fuse_wait_on_page_writeback(inode, page->index); if (req->num_pages && -@@ -559,6 +572,8 @@ static int fuse_readpages(struct file *file, struct address_space *mapping, +@@ -568,6 +581,8 @@ static int fuse_readpages(struct file *file, struct address_space *mapping, if (is_bad_inode(inode)) goto out; @@ -2187,7 +2187,7 @@ data.file = file; data.inode = inode; data.req = fuse_get_req(fc); -@@ -676,6 +691,8 @@ static int fuse_buffered_write(struct file *file, struct inode *inode, +@@ -685,6 +700,8 @@ static int fuse_buffered_write(struct file *file, struct inode *inode, if (is_bad_inode(inode)) return -EIO; @@ -2196,7 +2196,7 @@ /* * Make sure writepages on the same page are not mixed up with * plain writes. -@@ -830,6 +847,8 @@ static ssize_t fuse_perform_write(struct file *file, +@@ -839,6 +856,8 @@ static ssize_t fuse_perform_write(struct file *file, struct fuse_req *req; ssize_t count; @@ -2205,7 +2205,7 @@ req = fuse_get_req(fc); if (IS_ERR(req)) { err = PTR_ERR(req); -@@ -964,6 +983,8 @@ static ssize_t fuse_direct_io(struct file *file, const char __user *buf, +@@ -973,6 +992,8 @@ static ssize_t fuse_direct_io(struct file *file, const char __user *buf, if (is_bad_inode(inode)) return -EIO; @@ -2214,7 +2214,7 @@ req = fuse_get_req(fc); if (IS_ERR(req)) return PTR_ERR(req); -@@ -1317,6 +1338,8 @@ static int fuse_getlk(struct file *file, struct file_lock *fl) +@@ -1330,6 +1351,8 @@ static int fuse_getlk(struct file *file, struct file_lock *fl) struct fuse_lk_out outarg; int err; @@ -2223,7 +2223,7 @@ req = fuse_get_req(fc); if (IS_ERR(req)) return PTR_ERR(req); -@@ -1352,6 +1375,8 @@ static int fuse_setlk(struct file *file, struct file_lock *fl, int flock) +@@ -1365,6 +1388,8 @@ static int fuse_setlk(struct file *file, struct file_lock *fl, int flock) if (fl->fl_flags & FL_CLOSE) return 0; @@ -2232,7 +2232,7 @@ req = fuse_get_req(fc); if (IS_ERR(req)) return PTR_ERR(req); -@@ -1418,6 +1443,8 @@ static sector_t fuse_bmap(struct address_space *mapping, sector_t block) +@@ -1431,6 +1456,8 @@ static sector_t fuse_bmap(struct address_space *mapping, sector_t block) if (!inode->i_sb->s_bdev || fc->no_bmap) return 0; @@ -2261,10 +2261,10 @@ + } \ +} while (0) diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c -index 755fe24..6159be4 100644 +index 459b73d..f4dfbf5 100644 --- a/fs/fuse/inode.c +++ b/fs/fuse/inode.c -@@ -912,7 +912,7 @@ static int fuse_get_sb(struct file_system_type *fs_type, +@@ -925,7 +925,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", @@ -2273,7 +2273,7 @@ .get_sb = fuse_get_sb, .kill_sb = kill_anon_super, }; -@@ -931,7 +931,7 @@ static struct file_system_type fuseblk_fs_type = { +@@ -944,7 +944,7 @@ static struct file_system_type fuseblk_fs_type = { .name = "fuseblk", .get_sb = fuse_get_sb_blk, .kill_sb = kill_block_super, @@ -2283,11 +2283,11 @@ static inline int register_fuseblk(void) diff --git a/fs/namei.c b/fs/namei.c -index 3ca2574..b781965 100644 +index bbc15c2..11271b2 100644 --- a/fs/namei.c +++ b/fs/namei.c -@@ -2205,6 +2205,8 @@ int vfs_unlink(struct inode *dir, struct dentry *dentry) - if (!dir->i_op || !dir->i_op->unlink) +@@ -2210,6 +2210,8 @@ int vfs_unlink(struct inode *dir, struct dentry *dentry) + if (!dir->i_op->unlink) return -EPERM; + vfs_check_frozen(dir->i_sb, SB_FREEZE_WRITE); @@ -2296,10 +2296,10 @@ mutex_lock(&dentry->d_inode->i_mutex); diff --git a/fs/super.c b/fs/super.c -index f7d4bd6..00d5263 100644 +index 6ce5014..5030f0f 100644 --- a/fs/super.c +++ b/fs/super.c -@@ -43,6 +43,8 @@ +@@ -44,6 +44,8 @@ LIST_HEAD(super_blocks); @@ -2309,10 +2309,10 @@ /** diff --git a/include/linux/Kbuild b/include/linux/Kbuild -index d066bbc..09dc57f 100644 +index 106c3ba..17a95d2 100644 --- a/include/linux/Kbuild +++ b/include/linux/Kbuild -@@ -212,6 +212,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 @@ -2321,13 +2321,13 @@ unifdef-y += generic_serial.h unifdef-y += hayesesp.h diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h -index 3ce64b9..2645af6 100644 +index bd7ac79..09044e6 100644 --- a/include/linux/buffer_head.h +++ b/include/linux/buffer_head.h -@@ -171,6 +171,11 @@ wait_queue_head_t *bh_waitq_head(struct buffer_head *bh); +@@ -172,6 +172,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 *); + int thaw_bdev(struct block_device *, struct super_block *); +#define FS_FREEZER_FUSE 1 +#define FS_FREEZER_NORMAL 2 +#define FS_FREEZER_ALL (FS_FREEZER_FUSE | FS_FREEZER_NORMAL) @@ -2374,7 +2374,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 4b91924..773d48c 100644 +index 92734c0..c7e066a 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -8,6 +8,7 @@ @@ -2385,7 +2385,7 @@ /* * It's silly to have NR_OPEN bigger than NR_FILE, but you can change -@@ -104,6 +105,7 @@ extern int dir_notify_enable; +@@ -109,6 +110,7 @@ struct inodes_stat_t { #define FS_REQUIRES_DEV 1 #define FS_BINARY_MOUNTDATA 2 #define FS_HAS_SUBTYPE 4 @@ -2393,7 +2393,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. -@@ -136,6 +138,7 @@ extern int dir_notify_enable; +@@ -141,6 +143,7 @@ struct inodes_stat_t { #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 */ @@ -2401,7 +2401,7 @@ #define MS_ACTIVE (1<<30) #define MS_NOUSER (1<<31) -@@ -1188,8 +1191,11 @@ enum { +@@ -1216,8 +1219,11 @@ enum { SB_FREEZE_TRANS = 2, }; @@ -2416,10 +2416,10 @@ #define get_fs_excl() atomic_inc(¤t->fs_excl) #define put_fs_excl() atomic_dec(¤t->fs_excl) diff --git a/include/linux/mm.h b/include/linux/mm.h -index 86b836d..f7a05fb 100644 +index 065cdf8..1f4e138 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h -@@ -1263,6 +1263,7 @@ int drop_caches_sysctl_handler(struct ctl_table *, int, struct file *, +@@ -1294,6 +1294,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); @@ -2428,7 +2428,7 @@ #ifndef CONFIG_MMU #define randomize_va_space 0 diff --git a/include/linux/netlink.h b/include/linux/netlink.h -index 9ff1b54..100dc2e 100644 +index 51b09a1..a35eb65 100644 --- a/include/linux/netlink.h +++ b/include/linux/netlink.h @@ -24,6 +24,8 @@ @@ -2441,7 +2441,7 @@ #define MAX_LINKS 32 diff --git a/include/linux/suspend.h b/include/linux/suspend.h -index 2ce8207..c8680be 100644 +index c7d9bb1..47441b6 100644 --- a/include/linux/suspend.h +++ b/include/linux/suspend.h @@ -13,6 +13,7 @@ @@ -2464,7 +2464,7 @@ static inline int pm_prepare_console(void) { return 0; -@@ -280,4 +286,70 @@ static inline void register_nosave_region_late(unsigned long b, unsigned long e) +@@ -295,4 +301,70 @@ static inline void register_nosave_region_late(unsigned long b, unsigned long e) extern struct mutex pm_mutex; @@ -2536,22 +2536,22 @@ +#endif #endif /* _LINUX_SUSPEND_H */ diff --git a/include/linux/swap.h b/include/linux/swap.h -index a3af95b..e168ed5 100644 +index d302155..8ef7de2 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h -@@ -165,6 +165,7 @@ extern unsigned long totalram_pages; +@@ -168,6 +168,7 @@ struct swap_list_t { + extern unsigned long totalram_pages; extern unsigned long totalreserve_pages; - extern long nr_swap_pages; extern unsigned int nr_free_buffer_pages(void); +extern unsigned int nr_unallocated_buffer_pages(void); extern unsigned int nr_free_pagecache_pages(void); /* Definition of global_page_state not available yet */ diff --git a/init/do_mounts.c b/init/do_mounts.c -index d055b19..06efbe5 100644 +index 8d4ff5a..df19830 100644 --- a/init/do_mounts.c +++ b/init/do_mounts.c -@@ -141,6 +141,7 @@ fail: +@@ -142,6 +142,7 @@ fail: done: return res; } @@ -2559,7 +2559,7 @@ static int __init root_dev_setup(char *line) { -@@ -404,6 +405,8 @@ void __init prepare_namespace(void) +@@ -411,6 +412,8 @@ void __init prepare_namespace(void) if (is_floppy && rd_doload && rd_load_disk(0)) ROOT_DEV = Root_RAM0; @@ -2593,10 +2593,10 @@ sys_fchdir(old_fd); sys_mount("/", ".", NULL, MS_MOVE, NULL); diff --git a/init/main.c b/init/main.c -index 7e117a2..63758ff 100644 +index 83697e1..3485b50 100644 --- a/init/main.c +++ b/init/main.c -@@ -123,6 +123,7 @@ extern void softirq_init(void); +@@ -115,6 +115,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; @@ -2605,42 +2605,42 @@ static char *static_command_line; diff --git a/kernel/cpu.c b/kernel/cpu.c -index 8ea32e8..bf3c78f 100644 +index 79e40f0..eb36db0 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c -@@ -428,6 +428,7 @@ int disable_nonboot_cpus(void) - cpu_maps_update_done(); +@@ -415,6 +415,7 @@ int disable_nonboot_cpus(void) + stop_machine_destroy(); return error; } +EXPORT_SYMBOL_GPL(disable_nonboot_cpus); void __ref enable_nonboot_cpus(void) { -@@ -452,6 +453,7 @@ void __ref enable_nonboot_cpus(void) +@@ -439,6 +440,7 @@ void __ref enable_nonboot_cpus(void) out: cpu_maps_update_done(); } +EXPORT_SYMBOL_GPL(enable_nonboot_cpus); - #endif /* CONFIG_PM_SLEEP_SMP */ - /** + static int alloc_frozen_cpus(void) + { diff --git a/kernel/fork.c b/kernel/fork.c -index f2c9c60..f98f44c 100644 +index 4854c2c..3bfddab 100644 --- a/kernel/fork.c +++ b/kernel/fork.c -@@ -79,6 +79,7 @@ int max_threads; /* tunable limit on nr_threads */ +@@ -80,6 +80,7 @@ int max_threads; /* tunable limit on nr_threads */ DEFINE_PER_CPU(unsigned long, process_counts) = 0; __cacheline_aligned DEFINE_RWLOCK(tasklist_lock); /* outer */ +EXPORT_SYMBOL_GPL(tasklist_lock); <<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.16&r2=1.1.2.2.2.17&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
