packages: kernel/kernel-tuxonice.patch - from git
arekm
arekm at pld-linux.org
Sun May 23 15:36:56 CEST 2010
Author: arekm Date: Sun May 23 13:36:56 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- from git
---- Files affected:
packages/kernel:
kernel-tuxonice.patch (1.12 -> 1.13)
---- Diffs:
================================================================
Index: packages/kernel/kernel-tuxonice.patch
diff -u packages/kernel/kernel-tuxonice.patch:1.12 packages/kernel/kernel-tuxonice.patch:1.13
--- packages/kernel/kernel-tuxonice.patch:1.12 Tue May 18 14:36:15 2010
+++ packages/kernel/kernel-tuxonice.patch Sun May 23 15:36:51 2010
@@ -1,10 +1,10 @@
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
-index e7848a0..616afc2 100644
+index 839b21b..f19bc2f 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
-@@ -2703,6 +2703,9 @@ and is between 256 and 4096 characters. It is defined in the file
- medium is write-protected).
- Example: quirks=0419:aaf5:rl,0421:0433:rc
+@@ -2732,6 +2732,9 @@ and is between 256 and 4096 characters. It is defined in the file
+ HIGHMEM regardless of setting
+ of CONFIG_HIGHPTE.
+ uuid_debug= (Boolean) whether to enable debugging of TuxOnIce's
+ uuid support.
@@ -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 2533fc4..e14223f 100644
+index d329b05..c2809a9 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -5380,6 +5380,13 @@ S: Maintained
+@@ -5558,6 +5558,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 573b3bd..073736f 100644
+index b9243e7..12c2769 100644
--- a/arch/powerpc/mm/pgtable_32.c
+++ b/arch/powerpc/mm/pgtable_32.c
-@@ -422,6 +422,7 @@ void kernel_map_pages(struct page *page, int numpages, int enable)
+@@ -423,6 +423,7 @@ void kernel_map_pages(struct page *page, int numpages, int enable)
change_page_attr(page, numpages, enable ? PAGE_KERNEL : __pgprot(0));
}
@@ -1480,10 +1480,10 @@
static int fixmaps;
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
-index 704bddc..acdf978 100644
+index 8e1aac8..84568af 100644
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
-@@ -710,6 +710,7 @@ void machine_restart(char *cmd)
+@@ -718,6 +718,7 @@ void machine_restart(char *cmd)
{
machine_ops.restart(cmd);
}
@@ -1492,10 +1492,10 @@
void machine_halt(void)
{
diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
-index 1d4eb93..035b423 100644
+index 28195c3..3bb7059 100644
--- a/arch/x86/mm/pageattr.c
+++ b/arch/x86/mm/pageattr.c
-@@ -1296,6 +1296,7 @@ void kernel_map_pages(struct page *page, int numpages, int enable)
+@@ -1317,6 +1317,7 @@ void kernel_map_pages(struct page *page, int numpages, int enable)
*/
__flush_tlb_all();
}
@@ -1503,7 +1503,7 @@
#ifdef CONFIG_HIBERNATION
-@@ -1310,7 +1311,7 @@ bool kernel_page_present(struct page *page)
+@@ -1331,7 +1332,7 @@ bool kernel_page_present(struct page *page)
pte = lookup_address((unsigned long)page_address(page), &level);
return (pte_val(*pte) & _PAGE_PRESENT);
}
@@ -1527,18 +1527,18 @@
static void do_fpu_end(void)
{
diff --git a/arch/x86/power/hibernate_32.c b/arch/x86/power/hibernate_32.c
-index 81197c6..ff7e534 100644
+index 3769079..4dabd68 100644
--- a/arch/x86/power/hibernate_32.c
+++ b/arch/x86/power/hibernate_32.c
-@@ -8,6 +8,7 @@
-
+@@ -9,6 +9,7 @@
+ #include <linux/gfp.h>
#include <linux/suspend.h>
#include <linux/bootmem.h>
+#include <linux/module.h>
#include <asm/system.h>
#include <asm/page.h>
-@@ -163,6 +164,7 @@ int swsusp_arch_resume(void)
+@@ -164,6 +165,7 @@ int swsusp_arch_resume(void)
restore_image();
return 0;
}
@@ -1547,18 +1547,18 @@
/*
* 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 65fdc86..e5c31f6 100644
+index d24f983..803b20a 100644
--- a/arch/x86/power/hibernate_64.c
+++ b/arch/x86/power/hibernate_64.c
-@@ -10,6 +10,7 @@
-
+@@ -11,6 +11,7 @@
+ #include <linux/gfp.h>
#include <linux/smp.h>
#include <linux/suspend.h>
+#include <linux/module.h>
#include <asm/proto.h>
#include <asm/page.h>
#include <asm/pgtable.h>
-@@ -118,6 +119,7 @@ int swsusp_arch_resume(void)
+@@ -119,6 +120,7 @@ int swsusp_arch_resume(void)
restore_image();
return 0;
}
@@ -1566,7 +1566,7 @@
/*
* pfn_is_nosave - check if given pfn is in the 'nosave' section
-@@ -168,3 +170,4 @@ int arch_hibernation_header_restore(void *addr)
+@@ -169,3 +171,4 @@ int arch_hibernation_header_restore(void *addr)
restore_cr3 = rdr->cr3;
return (rdr->magic == RESTORE_MAGIC) ? 0 : -EINVAL;
}
@@ -1585,7 +1585,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 d1a9a0a..d229a5b 100644
+index 9fe174d..3bccc99 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -37,6 +37,9 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(block_remap);
@@ -1598,7 +1598,7 @@
static int __make_request(struct request_queue *q, struct bio *bio);
/*
-@@ -1555,6 +1558,9 @@ void submit_bio(int rw, struct bio *bio)
+@@ -1552,6 +1555,9 @@ void submit_bio(int rw, struct bio *bio)
bio->bi_rw |= rw;
@@ -1706,13 +1706,14 @@
+EXPORT_SYMBOL_GPL(next_bdev_of_type);
diff --git a/block/uuid.c b/block/uuid.c
new file mode 100644
-index 0000000..3862685
+index 0000000..0feb956
--- /dev/null
+++ b/block/uuid.c
-@@ -0,0 +1,528 @@
+@@ -0,0 +1,527 @@
+#include <linux/blkdev.h>
+#include <linux/ctype.h>
+#include <linux/uuid.h>
++#include <linux/slab.h>
+
+static int debug_enabled;
+
@@ -2016,9 +2017,6 @@
+ goto out;
+ }
+
-+ PRINT_HEX_DUMP(KERN_EMERG, "part_matches_uuid looking for ",
-+ DUMP_PREFIX_NONE, 16, 1, uuid, 16, 0);
-+
+ for (i = 0; uuid_list[i].name; i++) {
+ struct uuid_info *dat = &uuid_list[i];
+ dev_offset = (dat->bkoff << 10) + dat->sboff;
@@ -2067,12 +2065,13 @@
+
+ last_uuid_pg_num = uuid_pg_num;
+
-+ PRINT_HEX_DUMP(KERN_EMERG, "part_matches_uuid considering ",
-+ DUMP_PREFIX_NONE, 16, 1,
++ if (!memcmp(&uuid_data[uuid_pg_off], uuid, 16)) {
++ PRINT_HEX_DUMP(KERN_EMERG, "part_matches_uuid "
++ "matched ", DUMP_PREFIX_NONE, 16, 1,
+ &uuid_data[uuid_pg_off], 16, 0);
+
-+ if (!memcmp(&uuid_data[uuid_pg_off], uuid, 16)) {
-+ PRINTK("We have a match.\n");
++ PRINTK("UUID found on device %s, type %s.\n", buf,
++ dat->name);
+ result = 1;
+ break;
+ }
@@ -2239,10 +2238,10 @@
+
+__setup("uuid_debug", uuid_debug_setup);
diff --git a/crypto/Kconfig b/crypto/Kconfig
-index 81c185a..94cb5e8 100644
+index 403857a..957586f 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
-@@ -806,6 +806,13 @@ config CRYPTO_LZO
+@@ -816,6 +816,13 @@ config CRYPTO_LZO
help
This is the LZO algorithm.
@@ -2257,10 +2256,10 @@
config CRYPTO_ANSI_CPRNG
diff --git a/crypto/Makefile b/crypto/Makefile
-index 9e8f619..a06b213 100644
+index d7e6441..76b9a9e 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
-@@ -77,6 +77,7 @@ obj-$(CONFIG_CRYPTO_DEFLATE) += deflate.o
+@@ -78,6 +78,7 @@ obj-$(CONFIG_CRYPTO_DEFLATE) += deflate.o
obj-$(CONFIG_CRYPTO_ZLIB) += zlib.o
obj-$(CONFIG_CRYPTO_MICHAEL_MIC) += michael_mic.o
obj-$(CONFIG_CRYPTO_CRC32C) += crc32c.o
@@ -2601,10 +2600,10 @@
+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 a5142bd..3fed8b2 100644
+index 941fcb8..1a2a2e7 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
-@@ -66,6 +66,7 @@ void device_pm_lock(void)
+@@ -69,6 +69,7 @@ void device_pm_lock(void)
{
mutex_lock(&dpm_list_mtx);
}
@@ -2612,7 +2611,7 @@
/**
* device_pm_unlock - Unlock the list of active devices used by the PM core.
-@@ -74,6 +75,7 @@ void device_pm_unlock(void)
+@@ -77,6 +78,7 @@ void device_pm_unlock(void)
{
mutex_unlock(&dpm_list_mtx);
}
@@ -2621,10 +2620,10 @@
/**
* 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 50faa1f..567839a 100644
+index bd1d116..d8e5448 100644
--- a/drivers/char/vt.c
+++ b/drivers/char/vt.c
-@@ -2465,6 +2465,7 @@ int vt_kmsg_redirect(int new)
+@@ -2461,6 +2461,7 @@ int vt_kmsg_redirect(int new)
else
return kmsg_con;
}
@@ -2633,7 +2632,7 @@
/*
* Console on virtual terminal
diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
-index 8bf3770..f1d1e03 100644
+index aa89d4b..4e8b058 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)
@@ -2647,10 +2646,10 @@
goto free;
diff --git a/drivers/md/md.c b/drivers/md/md.c
-index a20a71e..6f221e5 100644
+index cefd63d..66b2f0b 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
-@@ -6469,6 +6469,9 @@ void md_do_sync(mddev_t *mddev)
+@@ -6476,6 +6476,9 @@ void md_do_sync(mddev_t *mddev)
mddev->curr_resync = 2;
try_again:
@@ -2660,7 +2659,7 @@
if (kthread_should_stop())
set_bit(MD_RECOVERY_INTR, &mddev->recovery);
-@@ -6491,6 +6494,10 @@ void md_do_sync(mddev_t *mddev)
+@@ -6498,6 +6501,10 @@ void md_do_sync(mddev_t *mddev)
* time 'round when curr_resync == 2
*/
continue;
@@ -2671,7 +2670,7 @@
/* We need to wait 'interruptible' so as not to
* contribute to the load average, and not to
* be caught by 'softlockup'
-@@ -6503,6 +6510,7 @@ void md_do_sync(mddev_t *mddev)
+@@ -6510,6 +6517,7 @@ void md_do_sync(mddev_t *mddev)
" share one or more physical units)\n",
desc, mdname(mddev), mdname(mddev2));
mddev_put(mddev2);
@@ -2679,7 +2678,7 @@
if (signal_pending(current))
flush_signals(current);
schedule();
-@@ -6612,6 +6620,9 @@ void md_do_sync(mddev_t *mddev)
+@@ -6619,6 +6627,9 @@ void md_do_sync(mddev_t *mddev)
|| kthread_should_stop());
}
@@ -2689,7 +2688,7 @@
if (kthread_should_stop())
goto interrupted;
-@@ -6656,6 +6667,9 @@ void md_do_sync(mddev_t *mddev)
+@@ -6663,6 +6674,9 @@ void md_do_sync(mddev_t *mddev)
last_mark = next;
}
@@ -2700,7 +2699,7 @@
if (kthread_should_stop())
goto interrupted;
diff --git a/fs/block_dev.c b/fs/block_dev.c
-index d11d028..b2388cc 100644
+index 6dcee88..d87dae8 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -335,6 +335,93 @@ out_unlock:
@@ -2839,7 +2838,7 @@
.kill_sb = fuse_ctl_kill_sb,
};
diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
-index 51d9e33..12ad477 100644
+index eb7e942..a99d301 100644
--- a/fs/fuse/dev.c
+++ b/fs/fuse/dev.c
@@ -7,6 +7,7 @@
@@ -3141,7 +3140,7 @@
+ } \
+} while (0)
diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c
-index 1a822ce..9b69d61 100644
+index ec14d19..2a82a08 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)
@@ -3163,10 +3162,10 @@
static inline int register_fuseblk(void)
diff --git a/fs/namei.c b/fs/namei.c
-index a4855af..3d57581 100644
+index b86b96f..4fdba44 100644
--- a/fs/namei.c
+++ b/fs/namei.c
-@@ -2268,6 +2268,8 @@ int vfs_unlink(struct inode *dir, struct dentry *dentry)
+@@ -2255,6 +2255,8 @@ int vfs_unlink(struct inode *dir, struct dentry *dentry)
if (!dir->i_op->unlink)
return -EPERM;
@@ -3176,10 +3175,10 @@
if (d_mountpoint(dentry))
error = -EBUSY;
diff --git a/fs/super.c b/fs/super.c
-index aff046b..affb662 100644
+index 1527e6a..f2ba120 100644
--- a/fs/super.c
+++ b/fs/super.c
-@@ -42,6 +42,8 @@
+@@ -43,6 +43,8 @@
LIST_HEAD(super_blocks);
@@ -3189,10 +3188,10 @@
/**
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
-index 756f831..9953b39 100644
+index e2ea0b2..56e0367 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
-@@ -213,6 +213,7 @@ unifdef-y += filter.h
+@@ -215,6 +215,7 @@ unifdef-y += filter.h
unifdef-y += flat.h
unifdef-y += futex.h
unifdef-y += fs.h
@@ -3217,10 +3216,10 @@
* First four bits must match between bio->bi_rw and rq->cmd_flags, make
* that explicit here.
diff --git a/include/linux/freezer.h b/include/linux/freezer.h
-index 5a361f8..a66f2a9 100644
+index da7e52b..a45b332 100644
--- a/include/linux/freezer.h
+++ b/include/linux/freezer.h
-@@ -121,6 +121,19 @@ static inline void set_freezable(void)
+@@ -124,6 +124,19 @@ static inline void set_freezable(void)
current->flags &= ~PF_NOFREEZE;
}
@@ -3240,7 +3239,7 @@
/*
* 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.
-@@ -172,6 +185,8 @@ static inline int freeze_processes(void) { BUG(); return 0; }
+@@ -175,6 +188,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; }
@@ -3250,10 +3249,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 ebb1cd5..e30e318 100644
+index 44f35ae..b36014f 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
-@@ -173,6 +173,7 @@ struct inodes_stat_t {
+@@ -176,6 +176,7 @@ struct inodes_stat_t {
#define FS_REQUIRES_DEV 1
#define FS_BINARY_MOUNTDATA 2
#define FS_HAS_SUBTYPE 4
@@ -3261,7 +3260,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.
-@@ -206,6 +207,7 @@ struct inodes_stat_t {
+@@ -209,6 +210,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 */
@@ -3269,7 +3268,7 @@
#define MS_ACTIVE (1<<30)
#define MS_NOUSER (1<<31)
-@@ -232,6 +234,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 */
@@ -3278,7 +3277,7 @@
/*
* Note that nosuid etc flags are inode-specific: setting some file-system
-@@ -379,6 +383,7 @@ struct inodes_stat_t {
+@@ -382,6 +386,7 @@ struct inodes_stat_t {
#include <linux/capability.h>
#include <linux/semaphore.h>
#include <linux/fiemap.h>
@@ -3286,7 +3285,7 @@
#include <asm/atomic.h>
#include <asm/byteorder.h>
-@@ -1391,8 +1396,11 @@ enum {
+@@ -1396,8 +1401,11 @@ enum {
SB_FREEZE_TRANS = 2,
};
@@ -3300,7 +3299,7 @@
#define get_fs_excl() atomic_inc(¤t->fs_excl)
#define put_fs_excl() atomic_dec(¤t->fs_excl)
-@@ -1947,6 +1955,13 @@ extern struct super_block *freeze_bdev(struct block_device *);
+@@ -1953,6 +1961,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 *);
@@ -3315,10 +3314,10 @@
static inline void bd_forget(struct inode *inode) {}
static inline int sync_blockdev(struct block_device *bdev) { return 0; }
diff --git a/include/linux/mm.h b/include/linux/mm.h
-index 60c467b..1e722c2 100644
+index 462acaf..cd1c705 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
-@@ -97,6 +97,7 @@ extern unsigned int kobjsize(const void *objp);
+@@ -98,6 +98,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) */
@@ -3326,7 +3325,7 @@
#define VM_INSERTPAGE 0x02000000 /* The vma has had "vm_insert_page()" done on it */
#define VM_ALWAYSDUMP 0x04000000 /* Always include in core dumps */
-@@ -1309,6 +1310,7 @@ int drop_caches_sysctl_handler(struct ctl_table *, int,
+@@ -1420,6 +1421,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);
@@ -3335,7 +3334,7 @@
#ifndef CONFIG_MMU
#define randomize_va_space 0
diff --git a/include/linux/netlink.h b/include/linux/netlink.h
-index fde27c0..0d86cc7 100644
+index 6eaca5e..c02a637 100644
--- a/include/linux/netlink.h
+++ b/include/linux/netlink.h
@@ -24,6 +24,8 @@
@@ -3423,7 +3422,7 @@
+#endif
#endif /* _LINUX_SUSPEND_H */
diff --git a/include/linux/swap.h b/include/linux/swap.h
-index a2602a8..06c4630 100644
+index 1f59d93..718bf38 100644
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
@@ -196,6 +196,7 @@ struct swap_list_t {
@@ -3434,7 +3433,16 @@
extern unsigned int nr_free_pagecache_pages(void);
/* Definition of global_page_state not available yet */
-@@ -325,8 +326,10 @@ extern void swapcache_free(swp_entry_t, struct page *page);
+@@ -251,6 +252,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);
++extern unsigned long shrink_memory_mask(unsigned long nr_to_reclaim,
++ gfp_t mask);
+ 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);
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);
@@ -3470,10 +3478,10 @@
+struct block_device *next_bdev_of_type(struct block_device *last,
+ const char *key);
diff --git a/init/do_mounts.c b/init/do_mounts.c
-index bb008d0..5273dc9 100644
+index 02e3ca4..5af8c3e 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
-@@ -143,6 +143,7 @@ fail:
+@@ -144,6 +144,7 @@ fail:
done:
return res;
}
@@ -3481,7 +3489,7 @@
static int __init root_dev_setup(char *line)
{
-@@ -413,6 +414,8 @@ void __init prepare_namespace(void)
+@@ -414,6 +415,8 @@ void __init prepare_namespace(void)
if (is_floppy && rd_doload && rd_load_disk(0))
ROOT_DEV = Root_RAM0;
@@ -3491,7 +3499,7 @@
out:
devtmpfs_mount("dev");
diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
-index 614241b..f3ea292 100644
+index 2b10853..ec3e087 100644
--- a/init/do_mounts_initrd.c
+++ b/init/do_mounts_initrd.c
@@ -6,6 +6,7 @@
@@ -3502,7 +3510,7 @@
#include <linux/freezer.h>
#include "do_mounts.h"
-@@ -68,6 +69,11 @@ static void __init handle_initrd(void)
+@@ -64,6 +65,11 @@ static void __init handle_initrd(void)
current->flags &= ~PF_FREEZER_SKIP;
@@ -3515,7 +3523,7 @@
sys_fchdir(old_fd);
sys_mount("/", ".", NULL, MS_MOVE, NULL);
diff --git a/init/main.c b/init/main.c
-index 4cb47a1..36eac80 100644
+index 5c85402..a191837 100644
--- a/init/main.c
+++ b/init/main.c
@@ -116,6 +116,7 @@ extern void softirq_init(void);
@@ -3527,10 +3535,10 @@
static char *static_command_line;
diff --git a/kernel/cpu.c b/kernel/cpu.c
-index 677f253..aad27c8 100644
+index 25bba73..86593b9 100644
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
-@@ -402,6 +402,7 @@ int disable_nonboot_cpus(void)
+@@ -403,6 +403,7 @@ int disable_nonboot_cpus(void)
stop_machine_destroy();
return error;
}
@@ -3538,7 +3546,7 @@
void __weak arch_enable_nonboot_cpus_begin(void)
{
-@@ -440,6 +441,7 @@ void __ref enable_nonboot_cpus(void)
+@@ -441,6 +442,7 @@ void __ref enable_nonboot_cpus(void)
out:
cpu_maps_update_done();
}
@@ -3546,18 +3554,6 @@
static int alloc_frozen_cpus(void)
{
<<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.12&r2=1.13&f=u
More information about the pld-cvs-commit
mailing list