packages: kernel/kernel-tuxonice.patch, kernel/kernel.spec - tuxonice head ...
arekm
arekm at pld-linux.org
Fri Aug 6 22:33:45 CEST 2010
Author: arekm Date: Fri Aug 6 20:33:45 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- tuxonice head patch
---- Files affected:
packages/kernel:
kernel-tuxonice.patch (1.14 -> 1.15) , kernel.spec (1.800 -> 1.801)
---- Diffs:
================================================================
Index: packages/kernel/kernel-tuxonice.patch
diff -u packages/kernel/kernel-tuxonice.patch:1.14 packages/kernel/kernel-tuxonice.patch:1.15
--- packages/kernel/kernel-tuxonice.patch:1.14 Thu Jul 1 18:04:25 2010
+++ packages/kernel/kernel-tuxonice.patch Fri Aug 6 22:33:39 2010
@@ -1,8 +1,8 @@
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
-index 839b21b..f19bc2f 100644
+index 1808f11..8e8d3b7 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
-@@ -2732,6 +2732,9 @@ and is between 256 and 4096 characters. It is defined in the file
+@@ -2773,6 +2773,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 d329b05..c2809a9 100644
+index 6d119c9..a2f6ce6 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -5558,6 +5558,13 @@ S: Maintained
+@@ -5679,6 +5679,13 @@ S: Maintained
F: drivers/tc/
F: include/linux/tc.h
@@ -1468,10 +1468,10 @@
M: Dario Ballabio <ballabio_dario at emc.com>
L: linux-scsi at vger.kernel.org
diff --git a/arch/powerpc/mm/pgtable_32.c b/arch/powerpc/mm/pgtable_32.c
-index b9243e7..12c2769 100644
+index 9fc02dc..a99d7e7 100644
--- a/arch/powerpc/mm/pgtable_32.c
+++ b/arch/powerpc/mm/pgtable_32.c
-@@ -423,6 +423,7 @@ void kernel_map_pages(struct page *page, int numpages, int enable)
+@@ -427,6 +427,7 @@ void kernel_map_pages(struct page *page, int numpages, int enable)
change_page_attr(page, numpages, enable ? PAGE_KERNEL : __pgprot(0));
}
@@ -1492,10 +1492,10 @@
void machine_halt(void)
{
diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
-index 28195c3..3bb7059 100644
+index 532e793..bad27ae 100644
--- a/arch/x86/mm/pageattr.c
+++ b/arch/x86/mm/pageattr.c
-@@ -1317,6 +1317,7 @@ void kernel_map_pages(struct page *page, int numpages, int enable)
+@@ -1354,6 +1354,7 @@ void kernel_map_pages(struct page *page, int numpages, int enable)
*/
__flush_tlb_all();
}
@@ -1503,7 +1503,7 @@
#ifdef CONFIG_HIBERNATION
-@@ -1331,7 +1332,7 @@ bool kernel_page_present(struct page *page)
+@@ -1368,7 +1369,7 @@ bool kernel_page_present(struct page *page)
pte = lookup_address((unsigned long)page_address(page), &level);
return (pte_val(*pte) & _PAGE_PRESENT);
}
@@ -1513,10 +1513,10 @@
#endif /* CONFIG_DEBUG_PAGEALLOC */
diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c
-index 0a979f3..7cdace5 100644
+index 1290ba5..2280003 100644
--- a/arch/x86/power/cpu.c
+++ b/arch/x86/power/cpu.c
-@@ -112,9 +112,7 @@ void save_processor_state(void)
+@@ -114,9 +114,7 @@ void save_processor_state(void)
{
__save_processor_state(&saved_context);
}
@@ -1572,20 +1572,21 @@
}
+EXPORT_SYMBOL_GPL(arch_hibernation_header_restore);
diff --git a/block/Makefile b/block/Makefile
-index cb2d515..f35a848 100644
+index 0bb499a..49f36d0 100644
--- a/block/Makefile
+++ b/block/Makefile
-@@ -5,7 +5,7 @@
+@@ -5,7 +5,8 @@
obj-$(CONFIG_BLOCK) := elevator.o blk-core.o blk-tag.o blk-sysfs.o \
blk-barrier.o blk-settings.o blk-ioc.o blk-map.o \
blk-exec.o blk-merge.o blk-softirq.o blk-timeout.o \
-- blk-iopoll.o ioctl.o genhd.o scsi_ioctl.o
-+ blk-iopoll.o ioctl.o genhd.o scsi_ioctl.o uuid.o
+- blk-iopoll.o blk-lib.o ioctl.o genhd.o scsi_ioctl.o
++ blk-iopoll.o blk-lib.o ioctl.o genhd.o scsi_ioctl.o \
++ uuid.o
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 9fe174d..3bccc99 100644
+index f84cce4..6c28098 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -37,6 +37,9 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(block_remap);
@@ -1598,7 +1599,7 @@
static int __make_request(struct request_queue *q, struct bio *bio);
/*
-@@ -1552,6 +1555,9 @@ void submit_bio(int rw, struct bio *bio)
+@@ -1582,6 +1585,9 @@ void submit_bio(int rw, struct bio *bio)
bio->bi_rw |= rw;
@@ -1609,7 +1610,7 @@
* If it's a regular read/write or a barrier with data attached,
* go through the normal accounting stuff before submission.
diff --git a/block/genhd.c b/block/genhd.c
-index d13ba76..efa1792 100644
+index 59a2db6..6875d7d 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -18,6 +18,8 @@
@@ -2205,7 +2206,7 @@
+
+__setup("uuid_debug", uuid_debug_setup);
diff --git a/crypto/Kconfig b/crypto/Kconfig
-index 403857a..957586f 100644
+index 9d9434f..b5911be 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -816,6 +816,13 @@ config CRYPTO_LZO
@@ -2587,7 +2588,7 @@
/**
* device_pm_add - Add a device to the PM core's list of active devices.
diff --git a/drivers/char/vt.c b/drivers/char/vt.c
-index bd1d116..d8e5448 100644
+index 7cdb6ee..f114914 100644
--- a/drivers/char/vt.c
+++ b/drivers/char/vt.c
@@ -2461,6 +2461,7 @@ int vt_kmsg_redirect(int new)
@@ -2599,24 +2600,24 @@
/*
* Console on virtual terminal
diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
-index aa89d4b..4e8b058 100644
+index 33dad3f..47fb186 100644
--- a/drivers/gpu/drm/drm_gem.c
+++ b/drivers/gpu/drm/drm_gem.c
-@@ -138,7 +138,8 @@ drm_gem_object_alloc(struct drm_device *dev, size_t size)
- goto free;
+@@ -133,7 +133,8 @@ int drm_gem_object_init(struct drm_device *dev,
+ BUG_ON((size & (PAGE_SIZE - 1)) != 0);
obj->dev = dev;
- obj->filp = shmem_file_setup("drm mm object", size, VM_NORESERVE);
+ obj->filp = shmem_file_setup("drm mm object", size,
+ VM_NORESERVE | VM_ATOMIC_COPY);
if (IS_ERR(obj->filp))
- goto free;
+ return -ENOMEM;
diff --git a/drivers/md/md.c b/drivers/md/md.c
-index cefd63d..66b2f0b 100644
+index 46b3a04..883513f 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
-@@ -6476,6 +6476,9 @@ void md_do_sync(mddev_t *mddev)
+@@ -6602,6 +6602,9 @@ void md_do_sync(mddev_t *mddev)
mddev->curr_resync = 2;
try_again:
@@ -2626,7 +2627,7 @@
if (kthread_should_stop())
set_bit(MD_RECOVERY_INTR, &mddev->recovery);
-@@ -6498,6 +6501,10 @@ void md_do_sync(mddev_t *mddev)
+@@ -6624,6 +6627,10 @@ void md_do_sync(mddev_t *mddev)
* time 'round when curr_resync == 2
*/
continue;
@@ -2637,7 +2638,7 @@
/* We need to wait 'interruptible' so as not to
* contribute to the load average, and not to
* be caught by 'softlockup'
-@@ -6510,6 +6517,7 @@ void md_do_sync(mddev_t *mddev)
+@@ -6636,6 +6643,7 @@ void md_do_sync(mddev_t *mddev)
" share one or more physical units)\n",
desc, mdname(mddev), mdname(mddev2));
mddev_put(mddev2);
@@ -2645,7 +2646,7 @@
if (signal_pending(current))
flush_signals(current);
schedule();
-@@ -6619,6 +6627,9 @@ void md_do_sync(mddev_t *mddev)
+@@ -6745,6 +6753,9 @@ void md_do_sync(mddev_t *mddev)
|| kthread_should_stop());
}
@@ -2655,7 +2656,7 @@
if (kthread_should_stop())
goto interrupted;
-@@ -6663,6 +6674,9 @@ void md_do_sync(mddev_t *mddev)
+@@ -6789,6 +6800,9 @@ void md_do_sync(mddev_t *mddev)
last_mark = next;
}
@@ -2666,10 +2667,10 @@
if (kthread_should_stop())
goto interrupted;
diff --git a/fs/block_dev.c b/fs/block_dev.c
-index 6dcee88..d87dae8 100644
+index 99d6af8..f270494 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
-@@ -335,6 +335,93 @@ out_unlock:
+@@ -295,6 +295,93 @@ out:
}
EXPORT_SYMBOL(thaw_bdev);
@@ -2764,7 +2765,7 @@
{
return block_write_full_page(page, blkdev_get_block, wbc);
diff --git a/fs/drop_caches.c b/fs/drop_caches.c
-index 31f4b0e..ff7df7a 100644
+index 83c4f60..8f7ec03 100644
--- a/fs/drop_caches.c
+++ b/fs/drop_caches.c
@@ -8,6 +8,7 @@
@@ -2775,23 +2776,20 @@
/* A global variable is a bit ugly, but it keeps the code simple */
int sysctl_drop_caches;
-@@ -33,7 +34,7 @@ static void drop_pagecache_sb(struct super_block *sb)
- iput(toput_inode);
+@@ -42,6 +43,13 @@ static void drop_slab(void)
+ } while (nr_objects > 10);
}
--static void drop_pagecache(void)
++/* For TuxOnIce */
+void drop_pagecache(void)
- {
- struct super_block *sb;
-
-@@ -61,6 +62,7 @@ static void drop_slab(void)
- nr_objects = shrink_slab(1000, GFP_KERNEL, 1000);
- } while (nr_objects > 10);
- }
++{
++ iterate_supers(drop_pagecache_sb, NULL);
++}
+EXPORT_SYMBOL_GPL(drop_pagecache);
-
++
int drop_caches_sysctl_handler(ctl_table *table, int write,
void __user *buffer, size_t *length, loff_t *ppos)
+ {
diff --git a/fs/fuse/control.c b/fs/fuse/control.c
index 3773fd6..6272b60 100644
--- a/fs/fuse/control.c
@@ -2805,7 +2803,7 @@
.kill_sb = fuse_ctl_kill_sb,
};
diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
-index eb7e942..a99d301 100644
+index 9424796..25c6277 100644
--- a/fs/fuse/dev.c
+++ b/fs/fuse/dev.c
@@ -7,6 +7,7 @@
@@ -2821,30 +2819,30 @@
#include <linux/file.h>
#include <linux/slab.h>
+#include <linux/freezer.h>
-
- MODULE_ALIAS_MISCDEV(FUSE_MINOR);
-
-@@ -758,6 +760,8 @@ static ssize_t fuse_dev_read(struct kiocb *iocb, const struct iovec *iov,
- if (!fc)
- return -EPERM;
+ #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,
+ struct fuse_in *in;
+ unsigned reqsize;
+ FUSE_MIGHT_FREEZE(file->f_mapping->host->i_sb, "fuse_dev_read");
+
restart:
spin_lock(&fc->lock);
err = -EAGAIN;
-@@ -999,6 +1003,9 @@ static ssize_t fuse_dev_write(struct kiocb *iocb, const struct iovec *iov,
+@@ -1395,6 +1399,9 @@ static ssize_t fuse_dev_write(struct kiocb *iocb, const struct iovec *iov,
if (!fc)
return -EPERM;
+ FUSE_MIGHT_FREEZE(iocb->ki_filp->f_mapping->host->i_sb,
+ "fuse_dev_write");
+
- fuse_copy_init(&cs, fc, 0, NULL, iov, nr_segs);
- if (nbytes < sizeof(struct fuse_out_header))
- return -EINVAL;
+ fuse_copy_init(&cs, fc, 0, iov, nr_segs);
+
+ 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 4787ae6..797b7dd 100644
+index 3cdc5f7..725cb5a 100644
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@ -7,12 +7,14 @@
@@ -2961,7 +2959,7 @@
return PTR_ERR(req);
diff --git a/fs/fuse/file.c b/fs/fuse/file.c
-index a9f5e13..4647e11 100644
+index ada0ade..ca89e06 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -7,11 +7,13 @@
@@ -2996,7 +2994,7 @@
req = fuse_get_req_nofail(fc, file);
memset(&inarg, 0, sizeof(inarg));
inarg.fh = ff->fh;
-@@ -367,6 +373,8 @@ int fuse_fsync_common(struct file *file, struct dentry *de, int datasync,
+@@ -366,6 +372,8 @@ int fuse_fsync_common(struct file *file, int datasync, int isdir)
if ((!isdir && fc->no_fsync) || (isdir && fc->no_fsyncdir))
return 0;
@@ -3005,7 +3003,7 @@
/*
* Start writeback against all dirty pages of the inode, then
* wait for all outstanding writes, before sending the FSYNC
-@@ -474,6 +482,8 @@ static int fuse_readpage(struct file *file, struct page *page)
+@@ -473,6 +481,8 @@ static int fuse_readpage(struct file *file, struct page *page)
if (is_bad_inode(inode))
goto out;
@@ -3014,7 +3012,7 @@
/*
* Page writeback can extend beyond the liftime of the
* page-cache page, so make sure we read a properly synced
-@@ -576,6 +586,9 @@ static int fuse_readpages_fill(void *_data, struct page *page)
+@@ -586,6 +596,9 @@ static int fuse_readpages_fill(void *_data, struct page *page)
struct inode *inode = data->inode;
struct fuse_conn *fc = get_fuse_conn(inode);
@@ -3024,7 +3022,7 @@
fuse_wait_on_page_writeback(inode, page->index);
if (req->num_pages &&
-@@ -606,6 +619,8 @@ static int fuse_readpages(struct file *file, struct address_space *mapping,
+@@ -617,6 +630,8 @@ static int fuse_readpages(struct file *file, struct address_space *mapping,
if (is_bad_inode(inode))
goto out;
@@ -3033,7 +3031,7 @@
data.file = file;
data.inode = inode;
data.req = fuse_get_req(fc);
-@@ -719,6 +734,8 @@ static int fuse_buffered_write(struct file *file, struct inode *inode,
+@@ -730,6 +745,8 @@ static int fuse_buffered_write(struct file *file, struct inode *inode,
if (is_bad_inode(inode))
return -EIO;
@@ -3042,7 +3040,7 @@
/*
* Make sure writepages on the same page are not mixed up with
* plain writes.
-@@ -878,6 +895,8 @@ static ssize_t fuse_perform_write(struct file *file,
+@@ -889,6 +906,8 @@ static ssize_t fuse_perform_write(struct file *file,
struct fuse_req *req;
ssize_t count;
@@ -3051,7 +3049,7 @@
req = fuse_get_req(fc);
if (IS_ERR(req)) {
err = PTR_ERR(req);
-@@ -1025,6 +1044,8 @@ ssize_t fuse_direct_io(struct file *file, const char __user *buf,
+@@ -1033,6 +1052,8 @@ ssize_t fuse_direct_io(struct file *file, const char __user *buf,
ssize_t res = 0;
struct fuse_req *req;
@@ -3060,7 +3058,7 @@
req = fuse_get_req(fc);
if (IS_ERR(req))
return PTR_ERR(req);
-@@ -1412,6 +1433,8 @@ static int fuse_getlk(struct file *file, struct file_lock *fl)
+@@ -1420,6 +1441,8 @@ static int fuse_getlk(struct file *file, struct file_lock *fl)
struct fuse_lk_out outarg;
int err;
@@ -3069,7 +3067,7 @@
req = fuse_get_req(fc);
if (IS_ERR(req))
return PTR_ERR(req);
-@@ -1447,6 +1470,8 @@ static int fuse_setlk(struct file *file, struct file_lock *fl, int flock)
+@@ -1455,6 +1478,8 @@ static int fuse_setlk(struct file *file, struct file_lock *fl, int flock)
if (fl->fl_flags & FL_CLOSE)
return 0;
@@ -3078,7 +3076,7 @@
req = fuse_get_req(fc);
if (IS_ERR(req))
return PTR_ERR(req);
-@@ -1513,6 +1538,8 @@ static sector_t fuse_bmap(struct address_space *mapping, sector_t block)
+@@ -1521,6 +1546,8 @@ static sector_t fuse_bmap(struct address_space *mapping, sector_t block)
if (!inode->i_sb->s_bdev || fc->no_bmap)
return 0;
@@ -3129,10 +3127,10 @@
static inline int register_fuseblk(void)
diff --git a/fs/namei.c b/fs/namei.c
-index b86b96f..4fdba44 100644
+index 868d0cb..325b6cf 100644
--- a/fs/namei.c
+++ b/fs/namei.c
-@@ -2255,6 +2255,8 @@ int vfs_unlink(struct inode *dir, struct dentry *dentry)
+@@ -2256,6 +2256,8 @@ int vfs_unlink(struct inode *dir, struct dentry *dentry)
if (!dir->i_op->unlink)
return -EPERM;
@@ -3142,10 +3140,10 @@
if (d_mountpoint(dentry))
error = -EBUSY;
diff --git a/fs/super.c b/fs/super.c
-index 1527e6a..f2ba120 100644
+index 5c35bc7..7c2e6e8 100644
--- a/fs/super.c
+++ b/fs/super.c
-@@ -43,6 +43,8 @@
+@@ -34,6 +34,8 @@
LIST_HEAD(super_blocks);
@@ -3155,10 +3153,10 @@
/**
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
-index e2ea0b2..56e0367 100644
+index 2fc8e14..709a571 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
-@@ -215,6 +215,7 @@ unifdef-y += filter.h
+@@ -216,6 +216,7 @@ unifdef-y += filter.h
unifdef-y += flat.h
unifdef-y += futex.h
unifdef-y += fs.h
@@ -3216,7 +3214,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 44f35ae..b36014f 100644
+index 471e1ff..63da27b 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -176,6 +176,7 @@ struct inodes_stat_t {
@@ -3252,7 +3250,7 @@
#include <asm/atomic.h>
#include <asm/byteorder.h>
-@@ -1396,8 +1401,11 @@ enum {
+@@ -1395,8 +1400,11 @@ enum {
SB_FREEZE_TRANS = 2,
};
@@ -3266,7 +3264,7 @@
#define get_fs_excl() atomic_inc(¤t->fs_excl)
#define put_fs_excl() atomic_dec(¤t->fs_excl)
-@@ -1953,6 +1961,13 @@ extern struct super_block *freeze_bdev(struct block_device *);
+@@ -1954,6 +1962,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 *);
@@ -3306,7 +3304,7 @@
+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 462acaf..cd1c705 100644
+index b969efb..1e63042 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -98,6 +98,7 @@ extern unsigned int kobjsize(const void *objp);
@@ -3317,7 +3315,7 @@
#define VM_INSERTPAGE 0x02000000 /* The vma has had "vm_insert_page()" done on it */
#define VM_ALWAYSDUMP 0x04000000 /* Always include in core dumps */
-@@ -1420,6 +1421,7 @@ int drop_caches_sysctl_handler(struct ctl_table *, int,
+@@ -1424,6 +1425,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);
@@ -3326,7 +3324,7 @@
#ifndef CONFIG_MMU
#define randomize_va_space 0
diff --git a/include/linux/netlink.h b/include/linux/netlink.h
-index 6eaca5e..c02a637 100644
+index 59d0669..5efa8e0 100644
--- a/include/linux/netlink.h
+++ b/include/linux/netlink.h
@@ -24,6 +24,8 @@
@@ -3414,10 +3412,10 @@
+#endif
#endif /* _LINUX_SUSPEND_H */
diff --git a/include/linux/swap.h b/include/linux/swap.h
-index 1f59d93..718bf38 100644
+index ff4acea..5aa8559 100644
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
-@@ -196,6 +196,7 @@ struct swap_list_t {
+@@ -198,6 +198,7 @@ struct swap_list_t {
extern unsigned long totalram_pages;
extern unsigned long totalreserve_pages;
extern unsigned int nr_free_buffer_pages(void);
@@ -3425,7 +3423,7 @@
extern unsigned int nr_free_pagecache_pages(void);
/* Definition of global_page_state not available yet */
-@@ -251,6 +252,8 @@ extern unsigned long mem_cgroup_shrink_node_zone(struct mem_cgroup *mem,
+@@ -248,6 +249,8 @@ extern unsigned long mem_cgroup_shrink_node_zone(struct mem_cgroup *mem,
int nid);
extern int __isolate_lru_page(struct page *page, int mode, int file);
extern unsigned long shrink_all_memory(unsigned long nr_pages);
@@ -3434,7 +3432,7 @@
extern int vm_swappiness;
extern int remove_mapping(struct address_space *mapping, struct page *page);
extern long vm_total_pages;
-@@ -325,8 +328,10 @@ extern void swapcache_free(swp_entry_t, struct page *page);
+@@ -327,8 +330,10 @@ extern void swapcache_free(swp_entry_t, struct page *page);
extern int free_swap_and_cache(swp_entry_t);
extern int swap_type_of(dev_t, sector_t, struct block_device **);
extern unsigned int count_swap_pages(int, int);
@@ -3491,10 +3489,10 @@
sys_fchdir(old_fd);
sys_mount("/", ".", NULL, MS_MOVE, NULL);
diff --git a/init/main.c b/init/main.c
-index 5c85402..a191837 100644
+index 3bdb152..f74eb5b 100644
--- a/init/main.c
+++ b/init/main.c
-@@ -116,6 +116,7 @@ extern void softirq_init(void);
+@@ -117,6 +117,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;
@@ -3503,18 +3501,18 @@
static char *static_command_line;
diff --git a/kernel/cpu.c b/kernel/cpu.c
-index 25bba73..86593b9 100644
+index 97d1b42..b6e21bb 100644
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
-@@ -403,6 +403,7 @@ int disable_nonboot_cpus(void)
- stop_machine_destroy();
+@@ -428,6 +428,7 @@ int disable_nonboot_cpus(void)
+ cpu_maps_update_done();
return error;
}
+EXPORT_SYMBOL_GPL(disable_nonboot_cpus);
void __weak arch_enable_nonboot_cpus_begin(void)
{
-@@ -441,6 +442,7 @@ void __ref enable_nonboot_cpus(void)
+@@ -466,6 +467,7 @@ void __ref enable_nonboot_cpus(void)
out:
cpu_maps_update_done();
}
@@ -3523,10 +3521,10 @@
static int alloc_frozen_cpus(void)
{
diff --git a/kernel/kmod.c b/kernel/kmod.c
-index bf0e231..de63918 100644
+index 6e9b196..19247e0 100644
--- a/kernel/kmod.c
+++ b/kernel/kmod.c
-@@ -326,6 +326,7 @@ int usermodehelper_disable(void)
+@@ -290,6 +290,7 @@ int usermodehelper_disable(void)
usermodehelper_disabled = 0;
return -EAGAIN;
}
@@ -3534,7 +3532,7 @@
/**
* usermodehelper_enable - allow new helpers to be started again
-@@ -334,6 +335,7 @@ void usermodehelper_enable(void)
+@@ -298,6 +299,7 @@ void usermodehelper_enable(void)
{
usermodehelper_disabled = 0;
}
@@ -3543,7 +3541,7 @@
static void helper_lock(void)
{
diff --git a/kernel/pid.c b/kernel/pid.c
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-tuxonice.patch?r1=1.14&r2=1.15&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.800&r2=1.801&f=u
More information about the pld-cvs-commit
mailing list