diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
-index 8dd7248..a411229 100644
+index 01ece1b..5b09304 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
-@@ -2530,6 +2530,9 @@ and is between 256 and 4096 characters. It is defined in the file
+@@ -2572,6 +2572,9 @@ and is between 256 and 4096 characters. It is defined in the file
HIGHMEM regardless of setting
of CONFIG_HIGHPTE.
+ testing. His efforts have contributed as much to TuxOnIce as any of the
+ names above.
diff --git a/MAINTAINERS b/MAINTAINERS
-index f2a2b8e..dc5e653 100644
+index 7585e9d..c8560dd 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -5848,6 +5848,13 @@ S: Maintained
+@@ -5965,6 +5965,13 @@ S: Maintained
F: drivers/tc/
F: include/linux/tc.h
static int fixmaps;
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
-index e3af342..482be9c 100644
+index c495aa8..ab32b64 100644
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
-@@ -726,6 +726,7 @@ void machine_restart(char *cmd)
+@@ -720,6 +720,7 @@ void machine_restart(char *cmd)
{
machine_ops.restart(cmd);
}
}
+EXPORT_SYMBOL_GPL(arch_hibernation_header_restore);
diff --git a/block/Makefile b/block/Makefile
-index 0bb499a..49f36d0 100644
+index 0fec4b3..54c54f1 100644
--- a/block/Makefile
+++ b/block/Makefile
@@ -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-flush.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 blk-lib.o ioctl.o genhd.o scsi_ioctl.o
+ blk-iopoll.o blk-lib.o ioctl.o genhd.o scsi_ioctl.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 32a1c12..6ee2fd4 100644
+index 4ce953f..cfedf85 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -37,6 +37,9 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(block_remap);
static int __make_request(struct request_queue *q, struct bio *bio);
/*
-@@ -1598,6 +1601,9 @@ void submit_bio(int rw, struct bio *bio)
+@@ -1614,6 +1617,9 @@ void submit_bio(int rw, struct bio *bio)
bio->bi_rw |= rw;
* 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 59a2db6..6875d7d 100644
+index 5fa2b44..8b895bb 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -18,6 +18,8 @@
#include "blk.h"
-@@ -1286,3 +1288,84 @@ int invalidate_partition(struct gendisk *disk, int partno)
+@@ -1291,3 +1293,84 @@ int invalidate_partition(struct gendisk *disk, int partno)
}
EXPORT_SYMBOL(invalidate_partition);
+
+__setup("uuid_debug", uuid_debug_setup);
diff --git a/crypto/Kconfig b/crypto/Kconfig
-index e573077..e6637ce 100644
+index e4bac29..2a9e285 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
-@@ -829,6 +829,13 @@ config CRYPTO_LZO
+@@ -828,6 +828,13 @@ config CRYPTO_LZO
help
This is the LZO algorithm.
+MODULE_LICENSE("GPL");
+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 281aada..bf07b26 100644
---- a/drivers/char/vt.c
-+++ b/drivers/char/vt.c
-@@ -2473,6 +2473,7 @@ int vt_kmsg_redirect(int new)
- else
- return kmsg_con;
+diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c
+index 71c5528..6d1da22 100644
+--- a/drivers/base/power/wakeup.c
++++ b/drivers/base/power/wakeup.c
+@@ -23,6 +23,7 @@
+ * if wakeup events are registered during or immediately before the transition.
+ */
+ bool events_check_enabled;
++EXPORT_SYMBOL_GPL(events_check_enabled);
+
+ /* The counter of registered wakeup events. */
+ static atomic_t event_count = ATOMIC_INIT(0);
+@@ -593,6 +594,7 @@ bool pm_get_wakeup_count(unsigned int *count)
+ *count = atomic_read(&event_count);
+ return ret;
}
-+EXPORT_SYMBOL_GPL(vt_kmsg_redirect);
++EXPORT_SYMBOL_GPL(pm_check_wakeup_events);
- /*
- * Console on virtual terminal
+ /**
+ * pm_save_wakeup_count - Save the current number of registered wakeup events.
diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
-index 5663d27..a35669d 100644
+index ea1c4b0..a338391 100644
--- a/drivers/gpu/drm/drm_gem.c
+++ b/drivers/gpu/drm/drm_gem.c
-@@ -143,7 +143,8 @@ int drm_gem_object_init(struct drm_device *dev,
+@@ -137,7 +137,8 @@ int drm_gem_object_init(struct drm_device *dev,
BUG_ON((size & (PAGE_SIZE - 1)) != 0);
obj->dev = dev;
return -ENOMEM;
diff --git a/drivers/md/md.c b/drivers/md/md.c
-index f20d13e..c332dc4 100644
+index 175c424..4946d6a 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
-@@ -6694,6 +6694,9 @@ void md_do_sync(mddev_t *mddev)
+@@ -6699,6 +6699,9 @@ void md_do_sync(mddev_t *mddev)
mddev->curr_resync = 2;
try_again:
if (kthread_should_stop())
set_bit(MD_RECOVERY_INTR, &mddev->recovery);
-@@ -6716,6 +6719,10 @@ void md_do_sync(mddev_t *mddev)
+@@ -6721,6 +6724,10 @@ void md_do_sync(mddev_t *mddev)
* time 'round when curr_resync == 2
*/
continue;
/* We need to wait 'interruptible' so as not to
* contribute to the load average, and not to
* be caught by 'softlockup'
-@@ -6728,6 +6735,7 @@ void md_do_sync(mddev_t *mddev)
+@@ -6733,6 +6740,7 @@ void md_do_sync(mddev_t *mddev)
" share one or more physical units)\n",
desc, mdname(mddev), mdname(mddev2));
mddev_put(mddev2);
if (signal_pending(current))
flush_signals(current);
schedule();
-@@ -6837,6 +6845,9 @@ void md_do_sync(mddev_t *mddev)
+@@ -6842,6 +6850,9 @@ void md_do_sync(mddev_t *mddev)
|| kthread_should_stop());
}
if (kthread_should_stop())
goto interrupted;
-@@ -6881,6 +6892,9 @@ void md_do_sync(mddev_t *mddev)
+@@ -6886,6 +6897,9 @@ void md_do_sync(mddev_t *mddev)
last_mark = next;
}
if (kthread_should_stop())
goto interrupted;
-@@ -7052,6 +7066,8 @@ void md_check_recovery(mddev_t *mddev)
+@@ -7057,6 +7071,8 @@ void md_check_recovery(mddev_t *mddev)
{
mdk_rdev_t *rdev;
if (mddev->bitmap)
bitmap_daemon_work(mddev);
+diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c
+index a8ec48e..c5504ab 100644
+--- a/drivers/tty/vt/vt.c
++++ b/drivers/tty/vt/vt.c
+@@ -2473,6 +2473,7 @@ int vt_kmsg_redirect(int new)
+ else
+ return kmsg_con;
+ }
++EXPORT_SYMBOL_GPL(vt_kmsg_redirect);
+
+ /*
+ * Console on virtual terminal
diff --git a/fs/block_dev.c b/fs/block_dev.c
-index 50e8c85..aca1764 100644
+index 4230252..7b04374 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
-@@ -294,6 +294,93 @@ out:
+@@ -308,6 +308,93 @@ out:
}
EXPORT_SYMBOL(thaw_bdev);
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
+index 85542a7..5ce3951 100644
--- a/fs/fuse/control.c
+++ b/fs/fuse/control.c
-@@ -341,6 +341,7 @@ static void fuse_ctl_kill_sb(struct super_block *sb)
+@@ -344,6 +344,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",
+ .fs_flags = FS_IS_FUSE,
- .get_sb = fuse_ctl_get_sb,
+ .mount = fuse_ctl_mount,
.kill_sb = fuse_ctl_kill_sb,
};
diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
-index cde755c..0998309 100644
+index 6e07696..5443293 100644
--- a/fs/fuse/dev.c
+++ b/fs/fuse/dev.c
@@ -7,6 +7,7 @@
#include <linux/pipe_fs_i.h>
#include <linux/swap.h>
#include <linux/splice.h>
-@@ -979,6 +981,8 @@ static ssize_t fuse_dev_do_read(struct fuse_conn *fc, struct file *file,
+@@ -977,6 +979,8 @@ static ssize_t fuse_dev_do_read(struct fuse_conn *fc, struct file *file,
struct fuse_in *in;
unsigned reqsize;
restart:
spin_lock(&fc->lock);
err = -EAGAIN;
-@@ -1612,6 +1616,9 @@ static ssize_t fuse_dev_write(struct kiocb *iocb, const struct iovec *iov,
+@@ -1605,6 +1609,9 @@ static ssize_t fuse_dev_write(struct kiocb *iocb, const struct iovec *iov,
if (!fc)
return -EPERM;
return PTR_ERR(req);
diff --git a/fs/fuse/file.c b/fs/fuse/file.c
-index c822458..72e6ac4 100644
+index 8b984a2..c91fd60 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -7,11 +7,13 @@
#include <linux/sched.h>
+#include <linux/freezer.h>
#include <linux/module.h>
+ #include <linux/compat.h>
- static const struct file_operations fuse_direct_io_file_operations;
-@@ -109,6 +111,8 @@ int fuse_do_open(struct fuse_conn *fc, u64 nodeid, struct file *file,
+@@ -110,6 +112,8 @@ int fuse_do_open(struct fuse_conn *fc, u64 nodeid, struct file *file,
int err;
int opcode = isdir ? FUSE_OPENDIR : FUSE_OPEN;
ff = fuse_file_alloc(fc);
if (!ff)
return -ENOMEM;
-@@ -316,6 +320,8 @@ static int fuse_flush(struct file *file, fl_owner_t id)
+@@ -327,6 +331,8 @@ static int fuse_flush(struct file *file, fl_owner_t id)
if (fc->no_flush)
return 0;
req = fuse_get_req_nofail(fc, file);
memset(&inarg, 0, sizeof(inarg));
inarg.fh = ff->fh;
-@@ -366,6 +372,8 @@ int fuse_fsync_common(struct file *file, int datasync, int isdir)
+@@ -377,6 +383,8 @@ int fuse_fsync_common(struct file *file, int datasync, int isdir)
if ((!isdir && fc->no_fsync) || (isdir && fc->no_fsyncdir))
return 0;
/*
* Start writeback against all dirty pages of the inode, then
* wait for all outstanding writes, before sending the FSYNC
-@@ -473,6 +481,8 @@ static int fuse_readpage(struct file *file, struct page *page)
+@@ -484,6 +492,8 @@ static int fuse_readpage(struct file *file, struct page *page)
if (is_bad_inode(inode))
goto out;
/*
* Page writeback can extend beyond the liftime of the
* page-cache page, so make sure we read a properly synced
-@@ -586,6 +596,9 @@ static int fuse_readpages_fill(void *_data, struct page *page)
+@@ -597,6 +607,9 @@ static int fuse_readpages_fill(void *_data, struct page *page)
struct inode *inode = data->inode;
struct fuse_conn *fc = get_fuse_conn(inode);
fuse_wait_on_page_writeback(inode, page->index);
if (req->num_pages &&
-@@ -617,6 +630,8 @@ static int fuse_readpages(struct file *file, struct address_space *mapping,
+@@ -628,6 +641,8 @@ static int fuse_readpages(struct file *file, struct address_space *mapping,
if (is_bad_inode(inode))
goto out;
data.file = file;
data.inode = inode;
data.req = fuse_get_req(fc);
-@@ -730,6 +745,8 @@ static int fuse_buffered_write(struct file *file, struct inode *inode,
+@@ -741,6 +756,8 @@ static int fuse_buffered_write(struct file *file, struct inode *inode,
if (is_bad_inode(inode))
return -EIO;
/*
* Make sure writepages on the same page are not mixed up with
* plain writes.
-@@ -889,6 +906,8 @@ static ssize_t fuse_perform_write(struct file *file,
+@@ -900,6 +917,8 @@ static ssize_t fuse_perform_write(struct file *file,
struct fuse_req *req;
ssize_t count;
req = fuse_get_req(fc);
if (IS_ERR(req)) {
err = PTR_ERR(req);
-@@ -1033,6 +1052,8 @@ ssize_t fuse_direct_io(struct file *file, const char __user *buf,
+@@ -1044,6 +1063,8 @@ ssize_t fuse_direct_io(struct file *file, const char __user *buf,
ssize_t res = 0;
struct fuse_req *req;
req = fuse_get_req(fc);
if (IS_ERR(req))
return PTR_ERR(req);
-@@ -1420,6 +1441,8 @@ static int fuse_getlk(struct file *file, struct file_lock *fl)
+@@ -1431,6 +1452,8 @@ static int fuse_getlk(struct file *file, struct file_lock *fl)
struct fuse_lk_out outarg;
int err;
req = fuse_get_req(fc);
if (IS_ERR(req))
return PTR_ERR(req);
-@@ -1455,6 +1478,8 @@ static int fuse_setlk(struct file *file, struct file_lock *fl, int flock)
+@@ -1466,6 +1489,8 @@ static int fuse_setlk(struct file *file, struct file_lock *fl, int flock)
if (fl->fl_flags & FL_CLOSE)
return 0;
req = fuse_get_req(fc);
if (IS_ERR(req))
return PTR_ERR(req);
-@@ -1521,6 +1546,8 @@ static sector_t fuse_bmap(struct address_space *mapping, sector_t block)
+@@ -1532,6 +1557,8 @@ static sector_t fuse_bmap(struct address_space *mapping, sector_t block)
if (!inode->i_sb->s_bdev || fc->no_bmap)
return 0;
+ } \
+} while (0)
diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c
-index da9e6e1..8ec7a9a 100644
+index cfce3ad..15bc01d 100644
--- a/fs/fuse/inode.c
+++ b/fs/fuse/inode.c
@@ -1064,7 +1064,7 @@ static void fuse_kill_sb_anon(struct super_block *sb)
.name = "fuse",
- .fs_flags = FS_HAS_SUBTYPE,
+ .fs_flags = FS_HAS_SUBTYPE | FS_IS_FUSE,
- .get_sb = fuse_get_sb,
+ .mount = fuse_mount,
.kill_sb = fuse_kill_sb_anon,
};
-@@ -1096,7 +1096,7 @@ static struct file_system_type fuseblk_fs_type = {
+@@ -1095,7 +1095,7 @@ static struct file_system_type fuseblk_fs_type = {
.name = "fuseblk",
- .get_sb = fuse_get_sb_blk,
+ .mount = fuse_mount_blk,
.kill_sb = fuse_kill_sb_blk,
- .fs_flags = FS_REQUIRES_DEV | FS_HAS_SUBTYPE,
+ .fs_flags = FS_REQUIRES_DEV | FS_HAS_SUBTYPE | FS_IS_FUSE,
static inline int register_fuseblk(void)
diff --git a/fs/namei.c b/fs/namei.c
-index 24896e8..2aa39ee 100644
+index 4ff7ca5..e74eb69 100644
--- a/fs/namei.c
+++ b/fs/namei.c
-@@ -2236,6 +2236,8 @@ int vfs_unlink(struct inode *dir, struct dentry *dentry)
+@@ -2235,6 +2235,8 @@ int vfs_unlink(struct inode *dir, struct dentry *dentry)
if (!dir->i_op->unlink)
return -EPERM;
if (d_mountpoint(dentry))
error = -EBUSY;
diff --git a/fs/super.c b/fs/super.c
-index 8819e3a..62fecfb 100644
+index ca69615..528feab 100644
--- a/fs/super.c
+++ b/fs/super.c
@@ -34,6 +34,8 @@
/**
diff --git a/include/linux/bio.h b/include/linux/bio.h
-index 5274103..02ef0ed 100644
+index 35dcdb3..1c6425b 100644
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -31,6 +31,8 @@
#ifdef BIO_DEBUG
diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h
-index ca83a97..36032d4 100644
+index 46ad519..92c89c9 100644
--- a/include/linux/blk_types.h
+++ b/include/linux/blk_types.h
@@ -151,6 +151,7 @@ enum rq_flag_bits {
__REQ_NR_BITS, /* stops here */
};
-@@ -192,5 +193,6 @@ enum rq_flag_bits {
+@@ -191,5 +192,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)
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 63d069b..0459560 100644
+index 090f0ea..8bcef8b 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
-@@ -175,6 +175,7 @@ struct inodes_stat_t {
+@@ -181,6 +181,7 @@ struct inodes_stat_t {
#define FS_REQUIRES_DEV 1
#define FS_BINARY_MOUNTDATA 2
#define FS_HAS_SUBTYPE 4
#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.
-@@ -208,6 +209,7 @@ struct inodes_stat_t {
+@@ -214,6 +215,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 */
#define MS_BORN (1<<29)
#define MS_ACTIVE (1<<30)
#define MS_NOUSER (1<<31)
-@@ -235,6 +237,8 @@ struct inodes_stat_t {
- #define S_NOCMTIME 128 /* Do not update file c/mtime */
+@@ -242,6 +244,8 @@ struct inodes_stat_t {
#define S_SWAPFILE 256 /* Do not truncate: swapon got its bmaps */
#define S_PRIVATE 512 /* Inode is fs-internal */
-+#define S_ATOMIC_COPY 1024 /* Pages mapped with this inode need to be
+ #define S_IMA 1024 /* Inode has an associated IMA struct */
++#define S_ATOMIC_COPY 2048 /* Pages mapped with this inode need to be
+ atomically copied (gem) */
/*
* Note that nosuid etc flags are inode-specific: setting some file-system
-@@ -383,6 +387,7 @@ struct inodes_stat_t {
+@@ -392,6 +396,7 @@ struct inodes_stat_t {
#include <linux/capability.h>
#include <linux/semaphore.h>
#include <linux/fiemap.h>
#include <asm/atomic.h>
#include <asm/byteorder.h>
-@@ -1398,8 +1403,11 @@ enum {
+@@ -1430,8 +1435,11 @@ enum {
SB_FREEZE_TRANS = 2,
};
#define get_fs_excl() atomic_inc(¤t->fs_excl)
#define put_fs_excl() atomic_dec(¤t->fs_excl)
-@@ -1969,6 +1977,13 @@ extern struct super_block *freeze_bdev(struct block_device *);
+@@ -2013,6 +2021,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 *);
+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 74949fb..5dc48aa 100644
+index 721f451..4cb07f0 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -102,6 +102,7 @@ extern unsigned int kobjsize(const void *objp);
#define VM_INSERTPAGE 0x02000000 /* The vma has had "vm_insert_page()" done on it */
#define VM_ALWAYSDUMP 0x04000000 /* Always include in core dumps */
-@@ -1445,6 +1446,7 @@ int drop_caches_sysctl_handler(struct ctl_table *, int,
+@@ -1466,6 +1467,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);
#ifndef CONFIG_MMU
#define randomize_va_space 0
diff --git a/include/linux/netlink.h b/include/linux/netlink.h
-index 1235669..1118a80 100644
+index e2b9e63..3c5c8dd 100644
--- a/include/linux/netlink.h
+++ b/include/linux/netlink.h
@@ -24,6 +24,8 @@
#define MAX_LINKS 32
diff --git a/include/linux/suspend.h b/include/linux/suspend.h
-index 4af270e..8331c65 100644
+index 2669751..fe9644d 100644
--- a/include/linux/suspend.h
+++ b/include/linux/suspend.h
-@@ -338,4 +338,70 @@ static inline void unlock_system_sleep(void)
+@@ -340,4 +340,70 @@ static inline void unlock_system_sleep(void)
}
#endif
+#endif
#endif /* _LINUX_SUSPEND_H */
diff --git a/include/linux/swap.h b/include/linux/swap.h
-index 7cdd633..30303dd 100644
+index eba53e7..31bdf80 100644
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
@@ -199,6 +199,7 @@ struct swap_list_t {
extern int vm_swappiness;
extern int remove_mapping(struct address_space *mapping, struct page *page);
extern long vm_total_pages;
-@@ -327,8 +330,10 @@ extern void swapcache_free(swp_entry_t, struct page *page);
+@@ -337,11 +340,15 @@ 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);
extern int reuse_swap_page(struct page *);
extern int try_to_free_swap(struct page *);
struct backing_dev_info;
++extern void get_swap_range_of_type(int type, swp_entry_t *start,
++ swp_entry_t *end, unsigned int limit);
+
+ /* linux/mm/thrash.c */
+ extern struct mm_struct *swap_token_mm;
diff --git a/init/do_mounts.c b/init/do_mounts.c
-index 02e3ca4..5af8c3e 100644
+index 2b54bef..aa4b723 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
-@@ -144,6 +144,7 @@ fail:
+@@ -214,6 +214,7 @@ fail:
done:
return res;
}
static int __init root_dev_setup(char *line)
{
-@@ -414,6 +415,8 @@ void __init prepare_namespace(void)
+@@ -484,6 +485,8 @@ void __init prepare_namespace(void)
if (is_floppy && rd_doload && rd_load_disk(0))
ROOT_DEV = Root_RAM0;
sys_fchdir(old_fd);
sys_mount("/", ".", NULL, MS_MOVE, NULL);
diff --git a/init/main.c b/init/main.c
-index 94ab488..22a2b95 100644
+index 8646401..c16c37f 100644
--- a/init/main.c
+++ b/init/main.c
-@@ -114,6 +114,7 @@ extern void softirq_init(void);
+@@ -113,6 +113,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;
static void helper_lock(void)
{
diff --git a/kernel/pid.c b/kernel/pid.c
-index d55c6fb..0a58064 100644
+index 39b65b6..38e2c1a 100644
--- a/kernel/pid.c
+++ b/kernel/pid.c
-@@ -418,6 +418,7 @@ struct task_struct *find_task_by_pid_ns(pid_t nr, struct pid_namespace *ns)
- {
+@@ -419,6 +419,7 @@ struct task_struct *find_task_by_pid_ns(pid_t nr, struct pid_namespace *ns)
+ rcu_lockdep_assert(rcu_read_lock_held());
return pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
}
+EXPORT_SYMBOL_GPL(find_task_by_pid_ns);
struct task_struct *find_task_by_vpid(pid_t vnr)
{
diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
-index ca6066a..27524f6 100644
+index a5aff3e..997fd1e 100644
--- a/kernel/power/Kconfig
+++ b/kernel/power/Kconfig
@@ -47,6 +47,13 @@ config CAN_PM_TRACE
config PM_TRACE
bool
help
-@@ -198,6 +205,238 @@ config PM_STD_PARTITION
+@@ -201,6 +208,238 @@ config PM_STD_PARTITION
suspended image to. It will simply pick the first available swap
device.
+EXPORT_SYMBOL_GPL(pm_restore_console);
#endif
diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
-index 8dc31e0..2cb245d 100644
+index 048d0b5..5b85d39 100644
--- a/kernel/power/hibernate.c
+++ b/kernel/power/hibernate.c
-@@ -26,11 +26,12 @@
+@@ -26,12 +26,13 @@
#include <scsi/scsi_scan.h>
#include <asm/suspend.h>
+#include "tuxonice.h"
+ static int nocompress = 0;
static int noresume = 0;
-static char resume_file[256] = CONFIG_PM_STD_PARTITION;
+char resume_file[256] = CONFIG_PM_STD_PARTITION;
dev_t swsusp_resume_device;
sector_t swsusp_resume_block;
int in_suspend __nosavedata = 0;
-@@ -117,55 +118,60 @@ static int hibernation_test(int level) { return 0; }
+@@ -118,55 +119,60 @@ static int hibernation_test(int level) { return 0; }
* hibernation
*/
/**
* platform_pre_restore - prepare the platform for the restoration from a
-@@ -173,11 +179,12 @@ static void platform_finish(int platform_mode)
+@@ -174,11 +180,12 @@ static void platform_finish(int platform_mode)
* called, platform_restore_cleanup() must be called.
*/
/**
* platform_restore_cleanup - switch the platform to the normal mode of
-@@ -186,22 +193,24 @@ static int platform_pre_restore(int platform_mode)
+@@ -187,22 +194,24 @@ static int platform_pre_restore(int platform_mode)
* regardless of the result of platform_pre_restore().
*/
/**
* swsusp_show_speed - print the time elapsed between two events.
-@@ -543,6 +552,7 @@ int hibernation_platform_enter(void)
+@@ -545,6 +554,7 @@ int hibernation_platform_enter(void)
return error;
}
/**
* power_down - Shut the machine down for hibernation.
-@@ -594,6 +604,9 @@ int hibernate(void)
+@@ -596,6 +606,9 @@ int hibernate(void)
{
int error;
mutex_lock(&pm_mutex);
/* The snapshot device should not be opened while we're running */
if (!atomic_add_unless(&snapshot_device_available, -1, 0)) {
-@@ -674,11 +687,19 @@ int hibernate(void)
+@@ -679,11 +692,19 @@ int hibernate(void)
*
*/
/*
* If the user said "noresume".. bail out early.
*/
-@@ -1007,6 +1028,7 @@ static int __init resume_offset_setup(char *str)
+@@ -1021,6 +1042,7 @@ static int __init hibernate_setup(char *str)
static int __init noresume_setup(char *str)
{
noresume = 1;
}
diff --git a/kernel/power/main.c b/kernel/power/main.c
-index 62b0bc6..498f233 100644
+index 7b5db6a..8f9a8a5 100644
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -16,6 +16,7 @@
/**
* state - control system power state.
diff --git a/kernel/power/power.h b/kernel/power/power.h
-index 006270f..28010f4 100644
+index 03634be..3c1ecaf 100644
--- a/kernel/power/power.h
+++ b/kernel/power/power.h
-@@ -31,8 +31,12 @@ static inline char *check_image_kernel(struct swsusp_info *info)
+@@ -34,8 +34,12 @@ static inline char *check_image_kernel(struct swsusp_info *info)
return arch_hibernation_header_restore(info) ?
"architecture specific data" : NULL;
}
/*
* Keep some memory free so that I/O operations can succeed without paging
* [Might this be more than 4 MB?]
-@@ -49,6 +53,7 @@ static inline char *check_image_kernel(struct swsusp_info *info)
+@@ -52,6 +56,7 @@ static inline char *check_image_kernel(struct swsusp_info *info)
extern int hibernation_snapshot(int platform_mode);
extern int hibernation_restore(int platform_mode);
extern int hibernation_platform_enter(void);
+extern void platform_recover(int platform_mode);
- #endif
- extern int pfn_is_nosave(unsigned long);
-@@ -63,6 +68,8 @@ static struct kobj_attribute _name##_attr = { \
+ #else /* !CONFIG_HIBERNATION */
+
+@@ -70,6 +75,8 @@ static struct kobj_attribute _name##_attr = { \
.store = _name##_store, \
}
/* Preferred image size in bytes (default 500 MB) */
extern unsigned long image_size;
extern int in_suspend;
-@@ -233,3 +240,93 @@ static inline void suspend_thaw_processes(void)
+@@ -241,3 +248,93 @@ static inline void suspend_thaw_processes(void)
{
}
#endif
+ (int rw, struct toi_module_ops *owner, char *buffer, int buffer_size));
+#endif
diff --git a/kernel/power/process.c b/kernel/power/process.c
-index 028a995..ade4c14 100644
+index e50b4c1..48bd28e 100644
--- a/kernel/power/process.c
+++ b/kernel/power/process.c
@@ -15,8 +15,15 @@
/*
* Timeout for stopping processes
*/
-@@ -128,17 +135,26 @@ int freeze_processes(void)
+@@ -135,17 +142,26 @@ int freeze_processes(void)
{
int error;
oom_killer_disable();
Exit:
-@@ -147,6 +163,7 @@ int freeze_processes(void)
+@@ -154,6 +170,7 @@ int freeze_processes(void)
return error;
}
static void thaw_tasks(bool nosig_only)
{
-@@ -170,13 +187,41 @@ static void thaw_tasks(bool nosig_only)
+@@ -177,13 +194,41 @@ static void thaw_tasks(bool nosig_only)
void thaw_processes(void)
{
+ */
+EXPORT_SYMBOL_GPL(thaw_kernel_threads);
diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c
-index d3f795f..7c0f541 100644
+index 0dac75e..0e4bab1 100644
--- a/kernel/power/snapshot.c
+++ b/kernel/power/snapshot.c
@@ -35,6 +35,8 @@
static int swsusp_page_is_free(struct page *);
static void swsusp_set_page_forbidden(struct page *);
-@@ -54,6 +56,10 @@ unsigned long image_size = 500 * 1024 * 1024;
+@@ -59,6 +61,10 @@ void __init hibernate_image_size_init(void)
* directly to their "original" page frames.
*/
struct pbe *restore_pblist;
/* Pointer to an auxiliary buffer (1 page) */
static void *buffer;
-@@ -96,6 +102,9 @@ static void *get_image_page(gfp_t gfp_mask, int safe_needed)
+@@ -101,6 +107,9 @@ static void *get_image_page(gfp_t gfp_mask, int safe_needed)
unsigned long get_safe_page(gfp_t gfp_mask)
{
return (unsigned long)get_image_page(gfp_mask, PG_SAFE);
}
-@@ -232,47 +241,53 @@ static void *chain_alloc(struct chain_allocator *ca, unsigned int size)
+@@ -237,47 +246,53 @@ static void *chain_alloc(struct chain_allocator *ca, unsigned int size)
* the represented memory area.
*/
/**
* create_bm_block_list - create a list of block bitmap objects
-@@ -380,8 +395,8 @@ static int create_mem_extents(struct list_head *list, gfp_t gfp_mask)
+@@ -385,8 +400,8 @@ static int create_mem_extents(struct list_head *list, gfp_t gfp_mask)
/**
* memory_bm_create - allocate memory for a memory bitmap
*/
{
struct chain_allocator ca;
struct list_head mem_extents;
-@@ -425,6 +440,9 @@ memory_bm_create(struct memory_bitmap *bm, gfp_t gfp_mask, int safe_needed)
+@@ -430,6 +445,9 @@ memory_bm_create(struct memory_bitmap *bm, gfp_t gfp_mask, int safe_needed)
}
}
bm->p_list = ca.chain;
memory_bm_position_reset(bm);
Exit:
-@@ -436,11 +454,18 @@ memory_bm_create(struct memory_bitmap *bm, gfp_t gfp_mask, int safe_needed)
+@@ -441,11 +459,18 @@ memory_bm_create(struct memory_bitmap *bm, gfp_t gfp_mask, int safe_needed)
memory_bm_free(bm, PG_UNSAFE_CLEAR);
goto Exit;
}
{
struct bm_block *bb;
-@@ -451,15 +476,22 @@ static void memory_bm_free(struct memory_bitmap *bm, int clear_nosave_free)
+@@ -456,15 +481,22 @@ static void memory_bm_free(struct memory_bitmap *bm, int clear_nosave_free)
free_list_of_pages(bm->p_list, clear_nosave_free);
INIT_LIST_HEAD(&bm->blocks);
{
struct bm_block *bb;
-@@ -467,7 +499,7 @@ static int memory_bm_find_bit(struct memory_bitmap *bm, unsigned long pfn,
+@@ -472,7 +504,7 @@ static int memory_bm_find_bit(struct memory_bitmap *bm, unsigned long pfn,
* Check if the pfn corresponds to the current bitmap block and find
* the block where it fits if this is not the case.
*/
if (pfn < bb->start_pfn)
list_for_each_entry_continue_reverse(bb, &bm->blocks, hook)
if (pfn >= bb->start_pfn)
-@@ -482,15 +514,21 @@ static int memory_bm_find_bit(struct memory_bitmap *bm, unsigned long pfn,
+@@ -487,15 +519,21 @@ static int memory_bm_find_bit(struct memory_bitmap *bm, unsigned long pfn,
return -EFAULT;
/* The block has been found */
{
void *addr;
unsigned int bit;
-@@ -500,6 +538,7 @@ static void memory_bm_set_bit(struct memory_bitmap *bm, unsigned long pfn)
+@@ -505,6 +543,7 @@ static void memory_bm_set_bit(struct memory_bitmap *bm, unsigned long pfn)
BUG_ON(error);
set_bit(bit, addr);
}
static int mem_bm_set_bit_check(struct memory_bitmap *bm, unsigned long pfn)
{
-@@ -513,27 +552,43 @@ static int mem_bm_set_bit_check(struct memory_bitmap *bm, unsigned long pfn)
+@@ -518,27 +557,43 @@ static int mem_bm_set_bit_check(struct memory_bitmap *bm, unsigned long pfn)
return error;
}
static bool memory_bm_pfn_present(struct memory_bitmap *bm, unsigned long pfn)
{
-@@ -552,43 +607,184 @@ static bool memory_bm_pfn_present(struct memory_bitmap *bm, unsigned long pfn)
+@@ -557,43 +612,184 @@ static bool memory_bm_pfn_present(struct memory_bitmap *bm, unsigned long pfn)
* this function.
*/
/**
* register_nosave_region - register a range of page frames the contents
-@@ -824,7 +1020,7 @@ static unsigned int count_free_highmem_pages(void)
+@@ -829,7 +1025,7 @@ static unsigned int count_free_highmem_pages(void)
* We should save the page if it isn't Nosave or NosaveFree, or Reserved,
* and it isn't a part of a free chunk of pages.
*/
{
struct page *page;
-@@ -843,6 +1039,7 @@ static struct page *saveable_highmem_page(struct zone *zone, unsigned long pfn)
+@@ -848,6 +1044,7 @@ static struct page *saveable_highmem_page(struct zone *zone, unsigned long pfn)
return page;
}
/**
* count_highmem_pages - compute the total number of saveable highmem
-@@ -868,11 +1065,6 @@ static unsigned int count_highmem_pages(void)
+@@ -873,11 +1070,6 @@ static unsigned int count_highmem_pages(void)
}
return n;
}
#endif /* CONFIG_HIGHMEM */
/**
-@@ -883,7 +1075,7 @@ static inline void *saveable_highmem_page(struct zone *z, unsigned long p)
+@@ -888,7 +1080,7 @@ static inline void *saveable_highmem_page(struct zone *z, unsigned long p)
* of pages statically defined as 'unsaveable', and it isn't a part of
* a free chunk of pages.
*/
{
struct page *page;
-@@ -905,6 +1097,7 @@ static struct page *saveable_page(struct zone *zone, unsigned long pfn)
+@@ -910,6 +1102,7 @@ static struct page *saveable_page(struct zone *zone, unsigned long pfn)
return page;
}
/**
* count_data_pages - compute the total number of saveable non-highmem
-@@ -1546,6 +1739,9 @@ asmlinkage int swsusp_save(void)
+@@ -1553,6 +1746,9 @@ asmlinkage int swsusp_save(void)
{
unsigned int nr_pages, nr_highmem;
printk(KERN_INFO "PM: Creating hibernation image:\n");
drain_local_pages(NULL);
-@@ -1586,14 +1782,14 @@ asmlinkage int swsusp_save(void)
+@@ -1593,14 +1789,14 @@ asmlinkage int swsusp_save(void)
}
#ifndef CONFIG_ARCH_HIBERNATION_HEADER
{
if (info->version_code != LINUX_VERSION_CODE)
return "kernel version";
-@@ -1607,6 +1803,7 @@ static char *check_image_kernel(struct swsusp_info *info)
+@@ -1614,6 +1810,7 @@ static char *check_image_kernel(struct swsusp_info *info)
return "machine";
return NULL;
}
#endif /* CONFIG_ARCH_HIBERNATION_HEADER */
unsigned long snapshot_get_image_size(void)
-@@ -1614,7 +1811,7 @@ unsigned long snapshot_get_image_size(void)
+@@ -1621,7 +1818,7 @@ unsigned long snapshot_get_image_size(void)
return nr_copy_pages + nr_meta_pages + 1;
}
{
memset(info, 0, sizeof(struct swsusp_info));
info->num_physpages = num_physpages;
-@@ -1624,6 +1821,7 @@ static int init_header(struct swsusp_info *info)
+@@ -1631,6 +1828,7 @@ static int init_header(struct swsusp_info *info)
info->size <<= PAGE_SHIFT;
return init_header_complete(info);
}
/**
* pack_pfns - pfns corresponding to the set bits found in the bitmap @bm
diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c
-index 7335952..69155c4 100644
+index ecf7705..2c23bb1 100644
--- a/kernel/power/suspend.c
+++ b/kernel/power/suspend.c
-@@ -237,6 +237,7 @@ int suspend_devices_and_enter(suspend_state_t state)
+@@ -236,6 +236,7 @@ int suspend_devices_and_enter(suspend_state_t state)
suspend_ops->recover();
goto Resume_devices;
}
* suspend_finish - Do final work before exiting suspend sequence.
diff --git a/kernel/power/tuxonice.h b/kernel/power/tuxonice.h
new file mode 100644
-index 0000000..8a08cec
+index 0000000..f6ffff3
--- /dev/null
+++ b/kernel/power/tuxonice.h
-@@ -0,0 +1,215 @@
+@@ -0,0 +1,219 @@
+/*
+ * kernel/power/tuxonice.h
+ *
+ TOI_LATE_CPU_HOTPLUG,
+ TOI_GET_MAX_MEM_ALLOCD,
+ TOI_NO_FLUSHER_THREAD,
-+ TOI_NO_PS2_IF_UNNEEDED
++ TOI_NO_PS2_IF_UNNEEDED,
++ TOI_POST_RESUME_BREAKPOINT,
++ TOI_NO_READAHEAD,
+};
+
++extern unsigned long toi_bootflags_mask;
++
+#define clear_action_state(bit) (test_and_clear_bit(bit, &toi_bkd.toi_action))
+
+/* == Result states == */
+#endif
diff --git a/kernel/power/tuxonice_alloc.c b/kernel/power/tuxonice_alloc.c
new file mode 100644
-index 0000000..891c5b2
+index 0000000..7a0adfb
--- /dev/null
+++ b/kernel/power/tuxonice_alloc.c
-@@ -0,0 +1,313 @@
+@@ -0,0 +1,314 @@
+/*
+ * kernel/power/tuxonice_alloc.c
+ *
+static struct toi_module_ops toi_alloc_ops;
+
+static int toi_fail_num;
-+static int trace_allocs;
++
+static atomic_t toi_alloc_count[TOI_ALLOC_PATHS],
+ toi_free_count[TOI_ALLOC_PATHS],
+ toi_test_count[TOI_ALLOC_PATHS],
+ result = kzalloc(size, flags);
+ if (toi_alloc_ops.enabled)
+ alloc_update_stats(fail_num, result, size);
-+ if (fail_num == trace_allocs)
++ if (fail_num == toi_trace_allocs)
+ dump_stack();
+ return result;
+}
+ if (toi_alloc_ops.enabled)
+ alloc_update_stats(fail_num, (void *) result,
+ PAGE_SIZE << order);
-+ if (fail_num == trace_allocs)
++ if (fail_num == toi_trace_allocs)
+ dump_stack();
+ return result;
+}
+ result = alloc_page(mask);
+ if (toi_alloc_ops.enabled)
+ alloc_update_stats(fail_num, (void *) result, PAGE_SIZE);
-+ if (fail_num == trace_allocs)
++ if (fail_num == toi_trace_allocs)
+ dump_stack();
+ return result;
+}
+{
+ unsigned long result;
+
-+ if (fail_num == trace_allocs)
-+ dump_stack();
+ if (toi_alloc_ops.enabled)
+ MIGHT_FAIL(fail_num, 0);
+ result = get_zeroed_page(mask);
+ if (toi_alloc_ops.enabled)
+ alloc_update_stats(fail_num, (void *) result, PAGE_SIZE);
-+ if (fail_num == trace_allocs)
++ if (fail_num == toi_trace_allocs)
+ dump_stack();
+ return result;
+}
+ if (arg && toi_alloc_ops.enabled)
+ free_update_stats(fail_num, size);
+
-+ if (fail_num == trace_allocs)
++ if (fail_num == toi_trace_allocs)
+ dump_stack();
+ kfree(arg);
+}
+ if (virt && toi_alloc_ops.enabled)
+ free_update_stats(fail_num, PAGE_SIZE);
+
-+ if (fail_num == trace_allocs)
++ if (fail_num == toi_trace_allocs)
+ dump_stack();
+ free_page(virt);
+}
+ if (page && toi_alloc_ops.enabled)
+ free_update_stats(fail_num, PAGE_SIZE);
+
-+ if (fail_num == trace_allocs)
++ if (fail_num == toi_trace_allocs)
+ dump_stack();
+ __free_page(page);
+}
+ if (page && toi_alloc_ops.enabled)
+ free_update_stats(fail_num, PAGE_SIZE << order);
+
-+ if (fail_num == trace_allocs)
++ if (fail_num == toi_trace_allocs)
+ dump_stack();
+ __free_pages(page, order);
+}
+ if (!starting_cycle)
+ return 0;
+
++ if (toi_trace_allocs)
++ dump_stack();
++
+ for (i = 0; i < TOI_ALLOC_PATHS; i++) {
+ atomic_set(&toi_alloc_count[i], 0);
+ atomic_set(&toi_free_count[i], 0);
+
+static struct toi_sysfs_data sysfs_params[] = {
+ SYSFS_INT("failure_test", SYSFS_RW, &toi_fail_num, 0, 99, 0, NULL),
-+ SYSFS_INT("trace", SYSFS_RW, &trace_allocs, 0, TOI_ALLOC_PATHS, 0,
++ SYSFS_INT("trace", SYSFS_RW, &toi_trace_allocs, 0, TOI_ALLOC_PATHS, 0,
+ NULL),
+ SYSFS_BIT("find_max_mem_allocated", SYSFS_RW, &toi_bkd.toi_action,
+ TOI_GET_MAX_MEM_ALLOCD, 0),
+#endif
diff --git a/kernel/power/tuxonice_alloc.h b/kernel/power/tuxonice_alloc.h
new file mode 100644
-index 0000000..77e0f0d
+index 0000000..099ee51
--- /dev/null
+++ b/kernel/power/tuxonice_alloc.h
-@@ -0,0 +1,52 @@
+@@ -0,0 +1,54 @@
+/*
+ * kernel/power/tuxonice_alloc.h
+ *
+static inline void toi_alloc_print_debug_stats(void) { }
+
+#endif
++
++extern int toi_trace_allocs;
diff --git a/kernel/power/tuxonice_atomic_copy.c b/kernel/power/tuxonice_atomic_copy.c
new file mode 100644
-index 0000000..a84f44d
+index 0000000..237fc6f
--- /dev/null
+++ b/kernel/power/tuxonice_atomic_copy.c
-@@ -0,0 +1,439 @@
+@@ -0,0 +1,450 @@
+/*
+ * kernel/power/tuxonice_atomic_copy.c
+ *
+ struct toi_boot_kernel_data *bkd =
+ (struct toi_boot_kernel_data *) boot_kernel_data_buffer;
+
-+ /*
-+ * The boot kernel's data may be larger (newer version) or
-+ * smaller (older version) than ours. Copy the minimum
-+ * of the two sizes, so that we don't overwrite valid values
-+ * from pre-atomic copy.
-+ */
-+
-+ memcpy(&toi_bkd, (char *) boot_kernel_data_buffer,
-+ min_t(int, sizeof(struct toi_boot_kernel_data),
-+ bkd->size));
-+
+ if (toi_activate_storage(1))
+ panic("Failed to reactivate our storage.");
+
+ printk(KERN_INFO "However it looks like there's enough"
+ " free ram and storage to handle this, so "
+ " continuing anyway.");
++ /*
++ * What if try_allocate_extra_memory above calls
++ * toi_allocate_extra_pagedir_memory and it allocs a new
++ * slab page via toi_kzalloc which should be in ps1? So...
++ */
++ toi_recalculate_image_contents(1);
+ }
+
+ if (!test_action_state(TOI_TEST_FILTER_SPEED) &&
+
+ error = toi_lowlevel_builtin();
+
++ if (!error) {
++ struct toi_boot_kernel_data *bkd =
++ (struct toi_boot_kernel_data *) boot_kernel_data_buffer;
++
++ /*
++ * The boot kernel's data may be larger (newer version) or
++ * smaller (older version) than ours. Copy the minimum
++ * of the two sizes, so that we don't overwrite valid values
++ * from pre-atomic copy.
++ */
++
++ memcpy(&toi_bkd, (char *) boot_kernel_data_buffer,
++ min_t(int, sizeof(struct toi_boot_kernel_data),
++ bkd->size));
++ }
++
+ toi_running = 0;
+ return error;
+}
+}
diff --git a/kernel/power/tuxonice_bio_core.c b/kernel/power/tuxonice_bio_core.c
new file mode 100644
-index 0000000..ff69af4
+index 0000000..a5d6d33
--- /dev/null
+++ b/kernel/power/tuxonice_bio_core.c
-@@ -0,0 +1,1840 @@
+@@ -0,0 +1,1841 @@
+/*
+ * kernel/power/tuxonice_bio.c
+ *
+ * Only call start_new_readahead if we don't have a dedicated thread
+ * and we're the queue flusher.
+ */
-+ if (current == toi_queue_flusher && more_readahead) {
++ if (current == toi_queue_flusher && more_readahead &&
++ !test_action_state(TOI_NO_READAHEAD)) {
+ int result2 = toi_start_new_readahead(0);
+ if (result2) {
+ printk(KERN_DEBUG "Queue flusher and "
+}
diff --git a/kernel/power/tuxonice_builtin.c b/kernel/power/tuxonice_builtin.c
new file mode 100644
-index 0000000..a3081b7
+index 0000000..5b0ec75
--- /dev/null
+++ b/kernel/power/tuxonice_builtin.c
-@@ -0,0 +1,380 @@
+@@ -0,0 +1,432 @@
+/*
+ * Copyright (C) 2004-2010 Nigel Cunningham (nigel at tuxonice net)
+ *
+#include "tuxonice_modules.h"
+#include "tuxonice_builtin.h"
+#include "tuxonice_power_off.h"
++#include "tuxonice_alloc.h"
++
++unsigned long toi_bootflags_mask;
++EXPORT_SYMBOL_GPL(toi_bootflags_mask);
+
+/*
+ * Highmem related functions (x86 only).
+__nosavedata struct pbe *restore_highmem_pblist;
+EXPORT_SYMBOL_GPL(restore_highmem_pblist);
+
++int toi_trace_allocs;
++EXPORT_SYMBOL_GPL(toi_trace_allocs);
++
+void toi_read_lock_tasklist(void)
+{
+ read_lock(&tasklist_lock);
+static int __init toi_debug_setup(char *str)
+{
+ toi_bkd.toi_action |= (1 << TOI_LOGALL);
++ toi_bootflags_mask |= (1 << TOI_LOGALL);
+ toi_bkd.toi_debug_state = 255;
+ toi_bkd.toi_default_console_level = 7;
+ return 1;
+static int __init toi_pause_setup(char *str)
+{
+ toi_bkd.toi_action |= (1 << TOI_PAUSE);
++ toi_bootflags_mask |= (1 << TOI_PAUSE);
+ return 1;
+}
+
+__setup("toi_pause", toi_pause_setup);
+
++#ifdef CONFIG_PM_DEBUG
++static int __init toi_trace_allocs_setup(char *str)
++{
++ int value;
++
++ if (sscanf(str, "=%d", &value))
++ toi_trace_allocs = value;
++
++ return 1;
++}
++__setup("toi_trace_allocs", toi_trace_allocs_setup);
++#endif
++
+static int __init toi_ignore_late_initcall_setup(char *str)
+{
+ int value;
+
+__setup("toi_initramfs_resume_only", toi_ignore_late_initcall_setup);
+
-+int toi_force_no_multithreaded;
-+EXPORT_SYMBOL_GPL(toi_force_no_multithreaded);
-+
+static int __init toi_force_no_multithreaded_setup(char *str)
+{
+ int value;
+
-+ if (sscanf(str, "=%d", &value))
-+ toi_force_no_multithreaded = value;
++ toi_bkd.toi_action &= ~(1 << TOI_NO_MULTITHREADED_IO);
++ toi_bootflags_mask |= (1 << TOI_NO_MULTITHREADED_IO);
++
++ if (sscanf(str, "=%d", &value) && value)
++ toi_bkd.toi_action |= (1 << TOI_NO_MULTITHREADED_IO);
+
+ return 1;
+}
+
+__setup("toi_no_multithreaded", toi_force_no_multithreaded_setup);
++
++#ifdef CONFIG_KGDB
++static int __init toi_post_resume_breakpoint_setup(char *str)
++{
++ int value;
++
++ toi_bkd.toi_action &= ~(1 << TOI_POST_RESUME_BREAKPOINT);
++ toi_bootflags_mask |= (1 << TOI_POST_RESUME_BREAKPOINT);
++ if (sscanf(str, "=%d", &value) && value)
++ toi_bkd.toi_action |= (1 << TOI_POST_RESUME_BREAKPOINT);
++
++ return 1;
++}
++
++__setup("toi_post_resume_break", toi_post_resume_breakpoint_setup);
++#endif
++
++static int __init toi_disable_readahead_setup(char *str)
++{
++ int value;
++
++ toi_bkd.toi_action &= ~(1 << TOI_NO_READAHEAD);
++ toi_bootflags_mask |= (1 << TOI_NO_READAHEAD);
++ if (sscanf(str, "=%d", &value) && value)
++ toi_bkd.toi_action |= (1 << TOI_NO_READAHEAD);
++
++ return 1;
++}
++
++__setup("toi_no_readahead", toi_disable_readahead_setup);
diff --git a/kernel/power/tuxonice_builtin.h b/kernel/power/tuxonice_builtin.h
new file mode 100644
index 0000000..ab67d31
+#endif
diff --git a/kernel/power/tuxonice_highlevel.c b/kernel/power/tuxonice_highlevel.c
new file mode 100644
-index 0000000..d2a53b2
+index 0000000..7d609ca
--- /dev/null
+++ b/kernel/power/tuxonice_highlevel.c
-@@ -0,0 +1,1311 @@
+@@ -0,0 +1,1329 @@
+/*
+ * kernel/power/tuxonice_highlevel.c
+ */
+#include <linux/writeback.h>
+#include <linux/uaccess.h> /* for get/set_fs & KERNEL_DS on i386 */
+#include <linux/bio.h>
++#include <linux/kgdb.h>
+
+#include "tuxonice.h"
+#include "tuxonice_modules.h"
+ toi_put_modules();
+ if (hibernate_or_resume) {
+ block_dump = block_dump_save;
++ pm_restore_gfp_mask();
+ set_cpus_allowed_ptr(current, cpu_all_mask);
+ toi_alloc_print_debug_stats();
+ atomic_inc(&snapshot_device_available);
+
+ if (!atomic_add_unless(&snapshot_device_available, -1, 0))
+ goto snapshotdevice_unavailable;
++
++ pm_restrict_gfp_mask();
+ }
+
+ if (hibernate_or_resume == SYSFS_HIBERNATE)
+ }
+ toi_put_modules();
+prehibernate_err:
-+ if (hibernate_or_resume)
++ if (hibernate_or_resume) {
++ pm_restore_gfp_mask();
+ atomic_inc(&snapshot_device_available);
++ }
+snapshotdevice_unavailable:
+ if (hibernate_or_resume)
+ mutex_unlock(&pm_mutex);
+ goto Failed;
+
+ temp_result = toi_hibernate();
++
++#ifdef CONFIG_KGDB
++ if (test_action_state(TOI_POST_RESUME_BREAKPOINT))
++ kgdb_breakpoint();
++#endif
++
+ if (!temp_result)
+ did_copy = 1;
+
+ tuxonice_signature, 9, 0, NULL),
+ SYSFS_INT("max_workers", SYSFS_RW, &toi_max_workers, 0, NR_CPUS, 0,
+ NULL),
++#ifdef CONFIG_KGDB
++ SYSFS_BIT("post_resume_breakpoint", SYSFS_RW, &toi_bkd.toi_action,
++ TOI_POST_RESUME_BREAKPOINT, 0),
++#endif
++ SYSFS_BIT("no_readahead", SYSFS_RW, &toi_bkd.toi_action,
++ TOI_NO_READAHEAD, 0),
+#ifdef CONFIG_TOI_KEEP_IMAGE
+ SYSFS_BIT("keep_image", SYSFS_RW , &toi_bkd.toi_action, TOI_KEEP_IMAGE,
+ 0),
+#endif
diff --git a/kernel/power/tuxonice_io.c b/kernel/power/tuxonice_io.c
new file mode 100644
-index 0000000..650dbfc
+index 0000000..ca22f59
--- /dev/null
+++ b/kernel/power/tuxonice_io.c
-@@ -0,0 +1,1873 @@
+@@ -0,0 +1,1874 @@
+/*
+ * kernel/power/tuxonice_io.c
+ *
+
+ clear_toi_state(TOI_IO_STOPPED);
+
-+ if (!test_action_state(TOI_NO_MULTITHREADED_IO) &&
-+ (write || !toi_force_no_multithreaded))
++ if (!test_action_state(TOI_NO_MULTITHREADED_IO))
+ num_other_threads = start_other_threads();
+
+ if (!num_other_threads || !toiActiveAllocator->io_flusher ||
+ (char *) &toi_header->pagedir, sizeof(pagedir1));
+ toi_result = toi_header->param0;
+ if (!toi_bkd.toi_debug_state) {
-+ toi_bkd.toi_action = toi_header->param1;
++ toi_bkd.toi_action =
++ (toi_header->param1 & ~toi_bootflags_mask) |
++ (toi_bkd.toi_action & toi_bootflags_mask);
+ toi_bkd.toi_debug_state = toi_header->param2;
+ toi_bkd.toi_default_console_level = toi_header->param3;
+ }
+extern void platform_restore_cleanup(int platform_mode);
diff --git a/kernel/power/tuxonice_prepare_image.c b/kernel/power/tuxonice_prepare_image.c
new file mode 100644
-index 0000000..1d176a5
+index 0000000..4f4b70d
--- /dev/null
+++ b/kernel/power/tuxonice_prepare_image.c
-@@ -0,0 +1,1114 @@
+@@ -0,0 +1,1111 @@
+/*
+ * kernel/power/tuxonice_prepare_image.c
+ *
+
+ extras_entry->page = newpage;
+ extras_entry->order = order;
-+ extras_entry->next = NULL;
-+
-+ if (extras_list)
-+ extras_entry->next = extras_list;
++ extras_entry->next = extras_list;
+
+ extras_list = extras_entry;
+
+};
diff --git a/kernel/power/tuxonice_swap.c b/kernel/power/tuxonice_swap.c
new file mode 100644
-index 0000000..caf29ff
+index 0000000..27f8a94
--- /dev/null
+++ b/kernel/power/tuxonice_swap.c
-@@ -0,0 +1,489 @@
+@@ -0,0 +1,456 @@
+/*
+ * kernel/power/tuxonice_swap.c
+ *
+static int toi_swap_allocate_storage(struct toi_bdev_info *chain,
+ unsigned long request)
+{
-+ int to_add = 0;
+ unsigned long gotten = 0;
-+ unsigned long extent_min = 0, extent_max = 0;
+
+ toi_message(TOI_IO, TOI_VERBOSE, 0, " Swap allocate storage: Asked to"
+ " allocate %lu pages from device %d.", request,
+ chain->allocator_index);
+
+ while (gotten < request) {
-+ swp_entry_t entry;
-+ unsigned long new_value;
-+
-+ entry = get_swap_page_of_type(chain->allocator_index);
-+ if (!entry.val)
-+ break;
-+
-+ swap_allocated++;
-+ new_value = entry.val;
-+ gotten++;
-+
-+ if (!to_add) {
-+ to_add = 1;
-+ extent_min = new_value;
-+ extent_max = new_value;
-+ continue;
-+ }
-+
-+ if (new_value == extent_max + 1) {
-+ extent_max++;
-+ continue;
-+ }
-+
-+ if (toi_add_to_extent_chain(&chain->allocations, extent_min,
-+ extent_max)) {
-+ printk(KERN_INFO "Failed to allocate extent for "
-+ "%lu-%lu.\n", extent_min, extent_max);
-+ free_swap_range(extent_min, extent_max);
-+ swap_free(entry);
-+ gotten -= (extent_max - extent_min);
-+ /* Don't try to add again below */
-+ to_add = 0;
++ swp_entry_t start, end;
++ get_swap_range_of_type(chain->allocator_index, &start, &end,
++ request - gotten + 1);
++ if (start.val) {
++ int added = end.val - start.val + 1;
++ if (toi_add_to_extent_chain(&chain->allocations,
++ start.val, end.val)) {
++ printk(KERN_INFO "Failed to allocate extent for "
++ "%lu-%lu.\n", start.val, end.val);
++ free_swap_range(start.val, end.val);
++ break;
++ }
++ gotten += added;
++ swap_allocated += added;
++ } else
+ break;
-+ }
-+
-+ extent_min = new_value;
-+ extent_max = new_value;
-+ }
-+
-+ if (to_add) {
-+ int this_result = toi_add_to_extent_chain(&chain->allocations,
-+ extent_min, extent_max);
-+
-+ if (this_result) {
-+ free_swap_range(extent_min, extent_max);
-+ gotten -= (extent_max - extent_min + 1);
-+ }
+ }
+
+ toi_message(TOI_IO, TOI_VERBOSE, 0, " Allocated %lu pages.", gotten);
+late_initcall(toi_user_ui_init);
+#endif
diff --git a/kernel/power/user.c b/kernel/power/user.c
-index e819e17..193abc1 100644
+index c36c3b9..4f642ed 100644
--- a/kernel/power/user.c
+++ b/kernel/power/user.c
@@ -64,6 +64,7 @@ static struct snapshot_data {
static int snapshot_open(struct inode *inode, struct file *filp)
{
diff --git a/kernel/printk.c b/kernel/printk.c
-index 8fe465a..69e7f58 100644
+index a23315d..d5d1353 100644
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -32,6 +32,7 @@
/*
* Low level drivers may need that to know if they can schedule in
-@@ -976,6 +978,7 @@ void suspend_console(void)
+@@ -996,6 +998,7 @@ void suspend_console(void)
console_suspended = 1;
up(&console_sem);
}
void resume_console(void)
{
-@@ -985,6 +988,7 @@ void resume_console(void)
+@@ -1005,6 +1008,7 @@ void resume_console(void)
console_suspended = 0;
release_console_sem();
}
/**
* console_cpu_notify - print deferred console messages after CPU hotplug
diff --git a/mm/bootmem.c b/mm/bootmem.c
-index 142c84a..f91f5aa 100644
+index 13b0caa..caf30f0 100644
--- a/mm/bootmem.c
+++ b/mm/bootmem.c
-@@ -25,6 +25,7 @@
+@@ -26,6 +26,7 @@
unsigned long max_low_pfn;
unsigned long min_low_pfn;
unsigned long max_pfn;
#ifdef CONFIG_CRASH_DUMP
/*
diff --git a/mm/highmem.c b/mm/highmem.c
-index 7a0aa1b..6d0490f 100644
+index 693394d..f357566 100644
--- a/mm/highmem.c
+++ b/mm/highmem.c
-@@ -58,6 +58,7 @@ unsigned int nr_free_highpages (void)
+@@ -66,6 +66,7 @@ unsigned int nr_free_highpages (void)
return pages;
}
static int pkmap_count[LAST_PKMAP];
static unsigned int last_pkmap_nr;
diff --git a/mm/memory.c b/mm/memory.c
-index 0e18b4d..7f3c145 100644
+index 02e48aa..6d6a0b4 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -1338,6 +1338,7 @@ no_page_table:
static inline int zref_in_nodemask(struct zoneref *zref, nodemask_t *nodes)
{
diff --git a/mm/page-writeback.c b/mm/page-writeback.c
-index e3bccac..024d42f 100644
+index b4edfe7..2f7f254 100644
--- a/mm/page-writeback.c
+++ b/mm/page-writeback.c
@@ -100,6 +100,7 @@ unsigned int dirty_expire_interval = 30 * 100; /* centiseconds */
/*
* Flag that puts the machine in "laptop mode". Doubles as a timeout in jiffies:
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
-index f12ad18..c05586c 100644
+index ff7e158..7e98e49 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
-@@ -2297,6 +2297,26 @@ static unsigned int nr_free_zone_pages(int offset)
+@@ -115,6 +115,7 @@ void pm_restore_gfp_mask(void)
+ saved_gfp_mask = 0;
+ }
+ }
++EXPORT_SYMBOL_GPL(pm_restore_gfp_mask);
+
+ void pm_restrict_gfp_mask(void)
+ {
+@@ -123,6 +124,7 @@ void pm_restrict_gfp_mask(void)
+ saved_gfp_mask = gfp_allowed_mask;
+ gfp_allowed_mask &= ~GFP_IOFS;
+ }
++EXPORT_SYMBOL_GPL(pm_restrict_gfp_mask);
+ #endif /* CONFIG_PM_SLEEP */
+
+ #ifdef CONFIG_HUGETLB_PAGE_SIZE_VARIABLE
+@@ -2303,6 +2305,26 @@ static unsigned int nr_free_zone_pages(int offset)
return sum;
}
/*
* Amount of free RAM allocatable within ZONE_DMA and ZONE_NORMAL
*/
-@@ -2307,6 +2327,15 @@ unsigned int nr_free_buffer_pages(void)
+@@ -2313,6 +2335,15 @@ unsigned int nr_free_buffer_pages(void)
EXPORT_SYMBOL_GPL(nr_free_buffer_pages);
/*
*/
unsigned int nr_free_pagecache_pages(void)
diff --git a/mm/shmem.c b/mm/shmem.c
-index 080b09a..afe9294 100644
+index 47fdeeb..8fb2cc6 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
-@@ -1595,6 +1595,8 @@ static struct inode *shmem_get_inode(struct super_block *sb, const struct inode
+@@ -1596,6 +1596,8 @@ static struct inode *shmem_get_inode(struct super_block *sb, const struct inode
memset(info, 0, (char *)inode - (char *)info);
spin_lock_init(&info->lock);
info->flags = flags & VM_NORESERVE;
#define INC_CACHE_INFO(x) do { swap_cache_info.x++; } while (0)
diff --git a/mm/swapfile.c b/mm/swapfile.c
-index 7c703ff..b8c1834 100644
+index 67ddaaf..ad771a3 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
-@@ -39,7 +39,6 @@
+@@ -40,7 +40,6 @@
static bool swap_count_continued(struct swap_info_struct *, pgoff_t,
unsigned char);
static void free_swap_count_continuations(struct swap_info_struct *);
static DEFINE_SPINLOCK(swap_lock);
static unsigned int nr_swapfiles;
-@@ -477,6 +476,7 @@ noswap:
+@@ -482,6 +481,7 @@ noswap:
spin_unlock(&swap_lock);
return (swp_entry_t) {0};
}
/* The only caller of this function is now susupend routine */
swp_entry_t get_swap_page_of_type(int type)
-@@ -623,6 +623,7 @@ void swapcache_free(swp_entry_t entry, struct page *page)
+@@ -504,6 +504,56 @@ swp_entry_t get_swap_page_of_type(int type)
+ spin_unlock(&swap_lock);
+ return (swp_entry_t) {0};
+ }
++EXPORT_SYMBOL_GPL(get_swap_page_of_type);
++
++static unsigned int find_next_to_unuse(struct swap_info_struct *si,
++ unsigned int prev);
++
++void get_swap_range_of_type(int type, swp_entry_t *start, swp_entry_t *end,
++ unsigned int limit)
++{
++ struct swap_info_struct *si;
++ pgoff_t start_at;
++ unsigned int i;
++
++ *start = swp_entry(0, 0);
++ *end = swp_entry(0, 0);
++ spin_lock(&swap_lock);
++ si = swap_info[type];
++ if (si && (si->flags & SWP_WRITEOK)) {
++ /* This is called for allocating swap entry, not cache */
++ start_at = scan_swap_map(si, 1);
++ if (start_at) {
++ unsigned int stop_at = find_next_to_unuse(si, start_at);
++ if (stop_at > start_at)
++ stop_at--;
++ else
++ stop_at = si->max - 1;
++ if (stop_at - start_at + 1 > limit)
++ stop_at = min_t(unsigned int,
++ start_at + limit - 1,
++ si->max - 1);
++ /* Mark them used */
++ for (i = start_at; i <= stop_at; i++)
++ si->swap_map[i] = 1;
++ /* first page already done above */
++ si->inuse_pages += stop_at - start_at;
++
++ nr_swap_pages -= stop_at - start_at + 1;
++ if (start_at + 1 == si->lowest_bit)
++ si->lowest_bit = stop_at + 1;
++ if (si->inuse_pages == si->pages) {
++ si->lowest_bit = si->max;
++ si->highest_bit = 0;
++ }
++ si->cluster_next = stop_at + 1;
++ *start = swp_entry(type, start_at);
++ *end = swp_entry(type, stop_at);
++ }
++ }
++ spin_unlock(&swap_lock);
++}
++EXPORT_SYMBOL_GPL(get_swap_range_of_type);
+
+ static struct swap_info_struct *swap_info_get(swp_entry_t entry)
+ {
+@@ -628,6 +678,7 @@ void swapcache_free(swp_entry_t entry, struct page *page)
spin_unlock(&swap_lock);
}
}
/*
* How many references to page are currently swapped out?
-@@ -1317,7 +1318,7 @@ static void drain_mmlist(void)
+@@ -1322,7 +1373,7 @@ static void drain_mmlist(void)
* Note that the type of this function is sector_t, but it returns page offset
* into the bdev, not sector offset.
*/
{
struct swap_info_struct *sis;
struct swap_extent *start_se;
-@@ -1344,6 +1345,7 @@ static sector_t map_swap_entry(swp_entry_t entry, struct block_device **bdev)
+@@ -1349,6 +1400,7 @@ static sector_t map_swap_entry(swp_entry_t entry, struct block_device **bdev)
BUG_ON(se == start_se); /* It *must* be present */
}
}
/*
* Returns the page offset into bdev for the specified page's swap entry.
-@@ -1686,6 +1688,7 @@ out_dput:
+@@ -1693,6 +1745,7 @@ out_dput:
out:
return err;
}
+EXPORT_SYMBOL_GPL(sys_swapoff);
#ifdef CONFIG_PROC_FS
- /* iterator */
-@@ -2115,6 +2118,7 @@ out:
+ struct proc_swaps {
+@@ -2162,6 +2215,7 @@ out:
}
return error;
}
void si_swapinfo(struct sysinfo *val)
{
-@@ -2132,6 +2136,7 @@ void si_swapinfo(struct sysinfo *val)
+@@ -2179,6 +2233,7 @@ void si_swapinfo(struct sysinfo *val)
val->totalswap = total_swap_pages + nr_to_be_unused;
spin_unlock(&swap_lock);
}
/*
* Verify that a swap entry is valid and increment its swap map count.
-@@ -2243,6 +2248,13 @@ int swapcache_prepare(swp_entry_t entry)
+@@ -2290,6 +2345,13 @@ int swapcache_prepare(swp_entry_t entry)
return __swap_duplicate(entry, SWAP_HAS_CACHE);
}
* swap_lock prevents swap_map being freed. Don't grab an extra
* reference on the swaphandle, it doesn't matter if it becomes unused.
diff --git a/mm/vmscan.c b/mm/vmscan.c
-index c5dfabf..95d5f29 100644
+index 9ca587c..c1d95dd 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
-@@ -2417,6 +2417,9 @@ void wakeup_kswapd(struct zone *zone, int order)
+@@ -2487,6 +2487,9 @@ void wakeup_kswapd(struct zone *zone, int order)
if (!populated_zone(zone))
return;
pgdat = zone->zone_pgdat;
if (zone_watermark_ok(zone, order, low_wmark_pages(zone), 0, 0))
return;
-@@ -2474,11 +2477,11 @@ unsigned long zone_reclaimable_pages(struct zone *zone)
+@@ -2544,11 +2547,11 @@ unsigned long zone_reclaimable_pages(struct zone *zone)
* LRU order by reclaiming preferentially
* inactive > active > active referenced > active mapped
*/
.may_swap = 1,
.may_unmap = 1,
.may_writepage = 1,
-@@ -2504,6 +2507,13 @@ unsigned long shrink_all_memory(unsigned long nr_to_reclaim)
+@@ -2574,6 +2577,13 @@ unsigned long shrink_all_memory(unsigned long nr_to_reclaim)
return nr_reclaimed;
}
#endif /* CONFIG_HIBERNATION */
/* It's optimal to keep kswapds on the same CPUs as their memory, but
---- linux-2.6.36/drivers/base/power/wakeup.c.org 2010-11-07 11:24:43.491504467 +0100
-+++ linux-2.6.36/drivers/base/power/wakeup.c 2010-11-07 11:25:06.822297721 +0100
-@@ -18,6 +18,7 @@
- * if wakeup events are registered during or immediately before the transition.
- */
- bool events_check_enabled;
-+EXPORT_SYMBOL_GPL(events_check_enabled);
-
- /* The counter of registered wakeup events. */
- static unsigned long event_count;
---- linux-2.6.36/mm/swapfile.c~ 2010-11-07 11:02:59.394785135 +0100
-+++ linux-2.6.36/mm/swapfile.c 2010-11-07 11:23:57.196648869 +0100
-@@ -501,6 +501,7 @@
- spin_unlock(&swap_lock);
- return (swp_entry_t) {0};
- }
-+EXPORT_SYMBOL_GPL(get_swap_page_of_type);
-
- static struct swap_info_struct *swap_info_get(swp_entry_t entry)
- {
---- linux-2.6.36/drivers/base/power/wakeup.c~ 2010-11-07 11:26:33.254250094 +0100
-+++ linux-2.6.36/drivers/base/power/wakeup.c 2010-11-07 11:43:14.537819706 +0100
-@@ -191,6 +191,7 @@
- spin_unlock_irqrestore(&events_lock, flags);
- return ret;
- }
-+EXPORT_SYMBOL_GPL(pm_check_wakeup_events);
-
- /**
- * pm_get_wakeup_count - Read the number of registered wakeup events.
-diff -NurpP --minimal linux-2.6.37/arch/alpha/Kconfig linux-2.6.37-vs2.3.0.37-rc1/arch/alpha/Kconfig
+diff -NurpP --minimal linux-2.6.37/arch/alpha/Kconfig linux-2.6.37-vs2.3.0.37-rc2/arch/alpha/Kconfig
--- linux-2.6.37/arch/alpha/Kconfig 2011-01-05 21:48:40.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/arch/alpha/Kconfig 2010-11-23 02:09:40.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/arch/alpha/Kconfig 2010-11-23 02:09:40.000000000 +0100
@@ -677,6 +677,8 @@ config DUMMY_CONSOLE
depends on VGA_HOSE
default y
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.37/arch/alpha/kernel/entry.S linux-2.6.37-vs2.3.0.37-rc1/arch/alpha/kernel/entry.S
+diff -NurpP --minimal linux-2.6.37/arch/alpha/kernel/entry.S linux-2.6.37-vs2.3.0.37-rc2/arch/alpha/kernel/entry.S
--- linux-2.6.37/arch/alpha/kernel/entry.S 2010-10-21 13:06:45.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/arch/alpha/kernel/entry.S 2010-11-23 02:09:40.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/arch/alpha/kernel/entry.S 2010-11-23 02:09:40.000000000 +0100
@@ -860,24 +860,15 @@ sys_getxgid:
.globl sys_getxpid
.ent sys_getxpid
ret
.end sys_getxpid
-diff -NurpP --minimal linux-2.6.37/arch/alpha/kernel/ptrace.c linux-2.6.37-vs2.3.0.37-rc1/arch/alpha/kernel/ptrace.c
+diff -NurpP --minimal linux-2.6.37/arch/alpha/kernel/ptrace.c linux-2.6.37-vs2.3.0.37-rc2/arch/alpha/kernel/ptrace.c
--- linux-2.6.37/arch/alpha/kernel/ptrace.c 2011-01-05 21:48:40.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/arch/alpha/kernel/ptrace.c 2010-11-23 02:09:40.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/arch/alpha/kernel/ptrace.c 2010-11-23 02:09:40.000000000 +0100
@@ -13,6 +13,7 @@
#include <linux/user.h>
#include <linux/security.h>
#include <asm/uaccess.h>
#include <asm/pgtable.h>
-diff -NurpP --minimal linux-2.6.37/arch/alpha/kernel/systbls.S linux-2.6.37-vs2.3.0.37-rc1/arch/alpha/kernel/systbls.S
+diff -NurpP --minimal linux-2.6.37/arch/alpha/kernel/systbls.S linux-2.6.37-vs2.3.0.37-rc2/arch/alpha/kernel/systbls.S
--- linux-2.6.37/arch/alpha/kernel/systbls.S 2010-10-21 13:06:46.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/arch/alpha/kernel/systbls.S 2010-11-23 02:09:40.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/arch/alpha/kernel/systbls.S 2010-11-23 02:09:40.000000000 +0100
@@ -446,7 +446,7 @@ sys_call_table:
.quad sys_stat64 /* 425 */
.quad sys_lstat64
.quad sys_ni_syscall /* sys_mbind */
.quad sys_ni_syscall /* sys_get_mempolicy */
.quad sys_ni_syscall /* sys_set_mempolicy */
-diff -NurpP --minimal linux-2.6.37/arch/alpha/kernel/traps.c linux-2.6.37-vs2.3.0.37-rc1/arch/alpha/kernel/traps.c
+diff -NurpP --minimal linux-2.6.37/arch/alpha/kernel/traps.c linux-2.6.37-vs2.3.0.37-rc2/arch/alpha/kernel/traps.c
--- linux-2.6.37/arch/alpha/kernel/traps.c 2010-10-21 13:06:46.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/arch/alpha/kernel/traps.c 2010-11-23 02:09:40.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/arch/alpha/kernel/traps.c 2010-11-23 02:09:40.000000000 +0100
@@ -183,7 +183,8 @@ die_if_kernel(char * str, struct pt_regs
#ifdef CONFIG_SMP
printk("CPU %d ", hard_smp_processor_id());
dik_show_regs(regs, r9_15);
add_taint(TAINT_DIE);
dik_show_trace((unsigned long *)(regs+1));
-diff -NurpP --minimal linux-2.6.37/arch/arm/include/asm/tlb.h linux-2.6.37-vs2.3.0.37-rc1/arch/arm/include/asm/tlb.h
+diff -NurpP --minimal linux-2.6.37/arch/arm/include/asm/tlb.h linux-2.6.37-vs2.3.0.37-rc2/arch/arm/include/asm/tlb.h
--- linux-2.6.37/arch/arm/include/asm/tlb.h 2009-09-10 15:25:15.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/arch/arm/include/asm/tlb.h 2010-11-23 02:09:40.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/arch/arm/include/asm/tlb.h 2010-11-23 02:09:40.000000000 +0100
@@ -27,6 +27,7 @@
#else /* !CONFIG_MMU */
#include <asm/pgalloc.h>
/*
-diff -NurpP --minimal linux-2.6.37/arch/arm/Kconfig linux-2.6.37-vs2.3.0.37-rc1/arch/arm/Kconfig
+diff -NurpP --minimal linux-2.6.37/arch/arm/Kconfig linux-2.6.37-vs2.3.0.37-rc2/arch/arm/Kconfig
--- linux-2.6.37/arch/arm/Kconfig 2011-01-05 21:48:40.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/arch/arm/Kconfig 2011-01-05 22:30:25.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/arch/arm/Kconfig 2011-01-05 22:30:25.000000000 +0100
@@ -1854,6 +1854,8 @@ source "fs/Kconfig"
source "arch/arm/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.37/arch/arm/kernel/calls.S linux-2.6.37-vs2.3.0.37-rc1/arch/arm/kernel/calls.S
+diff -NurpP --minimal linux-2.6.37/arch/arm/kernel/calls.S linux-2.6.37-vs2.3.0.37-rc2/arch/arm/kernel/calls.S
--- linux-2.6.37/arch/arm/kernel/calls.S 2010-10-21 13:06:46.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/arch/arm/kernel/calls.S 2010-11-23 02:09:40.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/arch/arm/kernel/calls.S 2010-11-23 02:09:40.000000000 +0100
@@ -322,7 +322,7 @@
/* 310 */ CALL(sys_request_key)
CALL(sys_keyctl)
CALL(sys_ioprio_set)
/* 315 */ CALL(sys_ioprio_get)
CALL(sys_inotify_init)
-diff -NurpP --minimal linux-2.6.37/arch/arm/kernel/process.c linux-2.6.37-vs2.3.0.37-rc1/arch/arm/kernel/process.c
+diff -NurpP --minimal linux-2.6.37/arch/arm/kernel/process.c linux-2.6.37-vs2.3.0.37-rc2/arch/arm/kernel/process.c
--- linux-2.6.37/arch/arm/kernel/process.c 2011-01-05 21:48:42.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/arch/arm/kernel/process.c 2010-11-23 02:09:40.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/arch/arm/kernel/process.c 2010-11-23 02:09:40.000000000 +0100
@@ -315,7 +315,8 @@ void __show_regs(struct pt_regs *regs)
void show_regs(struct pt_regs * regs)
{
__show_regs(regs);
__backtrace();
}
-diff -NurpP --minimal linux-2.6.37/arch/arm/kernel/traps.c linux-2.6.37-vs2.3.0.37-rc1/arch/arm/kernel/traps.c
+diff -NurpP --minimal linux-2.6.37/arch/arm/kernel/traps.c linux-2.6.37-vs2.3.0.37-rc2/arch/arm/kernel/traps.c
--- linux-2.6.37/arch/arm/kernel/traps.c 2011-01-05 21:48:42.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/arch/arm/kernel/traps.c 2010-11-23 02:09:40.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/arch/arm/kernel/traps.c 2010-11-23 02:09:40.000000000 +0100
@@ -241,8 +241,8 @@ static int __die(const char *str, int er
print_modules();
if (!user_mode(regs) || in_interrupt()) {
dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp,
-diff -NurpP --minimal linux-2.6.37/arch/cris/Kconfig linux-2.6.37-vs2.3.0.37-rc1/arch/cris/Kconfig
+diff -NurpP --minimal linux-2.6.37/arch/cris/Kconfig linux-2.6.37-vs2.3.0.37-rc2/arch/cris/Kconfig
--- linux-2.6.37/arch/cris/Kconfig 2011-01-05 21:48:58.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/arch/cris/Kconfig 2010-11-23 02:09:40.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/arch/cris/Kconfig 2010-11-23 02:09:40.000000000 +0100
@@ -687,6 +687,8 @@ source "drivers/staging/Kconfig"
source "arch/cris/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.37/arch/frv/kernel/kernel_thread.S linux-2.6.37-vs2.3.0.37-rc1/arch/frv/kernel/kernel_thread.S
+diff -NurpP --minimal linux-2.6.37/arch/frv/kernel/kernel_thread.S linux-2.6.37-vs2.3.0.37-rc2/arch/frv/kernel/kernel_thread.S
--- linux-2.6.37/arch/frv/kernel/kernel_thread.S 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/arch/frv/kernel/kernel_thread.S 2010-11-23 02:09:40.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/arch/frv/kernel/kernel_thread.S 2010-11-23 02:09:40.000000000 +0100
@@ -37,7 +37,7 @@ kernel_thread:
# start by forking the current process, but with shared VM
sethi.p #0xe4e4,gr9 ; second syscall arg [newsp]
setlo #0xe4e4,gr9
setlos.p #0,gr10 ; third syscall arg [parent_tidptr]
-diff -NurpP --minimal linux-2.6.37/arch/h8300/Kconfig linux-2.6.37-vs2.3.0.37-rc1/arch/h8300/Kconfig
+diff -NurpP --minimal linux-2.6.37/arch/h8300/Kconfig linux-2.6.37-vs2.3.0.37-rc2/arch/h8300/Kconfig
--- linux-2.6.37/arch/h8300/Kconfig 2011-01-05 21:48:59.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/arch/h8300/Kconfig 2010-11-23 02:09:40.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/arch/h8300/Kconfig 2010-11-23 02:09:40.000000000 +0100
@@ -219,6 +219,8 @@ source "fs/Kconfig"
source "arch/h8300/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.37/arch/ia64/include/asm/tlb.h linux-2.6.37-vs2.3.0.37-rc1/arch/ia64/include/asm/tlb.h
+diff -NurpP --minimal linux-2.6.37/arch/ia64/include/asm/tlb.h linux-2.6.37-vs2.3.0.37-rc2/arch/ia64/include/asm/tlb.h
--- linux-2.6.37/arch/ia64/include/asm/tlb.h 2010-02-25 11:51:26.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/arch/ia64/include/asm/tlb.h 2010-11-23 02:09:40.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/arch/ia64/include/asm/tlb.h 2010-11-23 02:09:40.000000000 +0100
@@ -40,6 +40,7 @@
#include <linux/mm.h>
#include <linux/pagemap.h>
#include <asm/pgalloc.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-2.6.37/arch/ia64/Kconfig linux-2.6.37-vs2.3.0.37-rc1/arch/ia64/Kconfig
+diff -NurpP --minimal linux-2.6.37/arch/ia64/Kconfig linux-2.6.37-vs2.3.0.37-rc2/arch/ia64/Kconfig
--- linux-2.6.37/arch/ia64/Kconfig 2011-01-05 21:48:59.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/arch/ia64/Kconfig 2010-11-23 02:09:40.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/arch/ia64/Kconfig 2010-11-23 02:09:40.000000000 +0100
@@ -670,6 +670,8 @@ source "fs/Kconfig"
source "arch/ia64/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.37/arch/ia64/kernel/entry.S linux-2.6.37-vs2.3.0.37-rc1/arch/ia64/kernel/entry.S
+diff -NurpP --minimal linux-2.6.37/arch/ia64/kernel/entry.S linux-2.6.37-vs2.3.0.37-rc2/arch/ia64/kernel/entry.S
--- linux-2.6.37/arch/ia64/kernel/entry.S 2010-10-21 13:06:52.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/arch/ia64/kernel/entry.S 2010-11-23 02:09:40.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/arch/ia64/kernel/entry.S 2010-11-23 02:09:40.000000000 +0100
@@ -1714,7 +1714,7 @@ sys_call_table:
data8 sys_mq_notify
data8 sys_mq_getsetattr
data8 sys_waitid // 1270
data8 sys_add_key
data8 sys_request_key
-diff -NurpP --minimal linux-2.6.37/arch/ia64/kernel/perfmon.c linux-2.6.37-vs2.3.0.37-rc1/arch/ia64/kernel/perfmon.c
+diff -NurpP --minimal linux-2.6.37/arch/ia64/kernel/perfmon.c linux-2.6.37-vs2.3.0.37-rc2/arch/ia64/kernel/perfmon.c
--- linux-2.6.37/arch/ia64/kernel/perfmon.c 2011-01-05 21:48:59.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/arch/ia64/kernel/perfmon.c 2010-11-23 02:09:40.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/arch/ia64/kernel/perfmon.c 2010-11-23 02:09:40.000000000 +0100
@@ -42,6 +42,7 @@
#include <linux/completion.h>
#include <linux/tracehook.h>
#include <asm/errno.h>
#include <asm/intrinsics.h>
-diff -NurpP --minimal linux-2.6.37/arch/ia64/kernel/process.c linux-2.6.37-vs2.3.0.37-rc1/arch/ia64/kernel/process.c
+diff -NurpP --minimal linux-2.6.37/arch/ia64/kernel/process.c linux-2.6.37-vs2.3.0.37-rc2/arch/ia64/kernel/process.c
--- linux-2.6.37/arch/ia64/kernel/process.c 2010-10-21 13:06:52.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/arch/ia64/kernel/process.c 2010-11-23 02:09:40.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/arch/ia64/kernel/process.c 2010-11-23 02:09:40.000000000 +0100
@@ -113,8 +113,8 @@ show_regs (struct pt_regs *regs)
unsigned long ip = regs->cr_iip + ia64_psr(regs)->ri;
printk("psr : %016lx ifs : %016lx ip : [<%016lx>] %s (%s)\n",
regs->cr_ipsr, regs->cr_ifs, ip, print_tainted(),
init_utsname()->release);
-diff -NurpP --minimal linux-2.6.37/arch/ia64/kernel/ptrace.c linux-2.6.37-vs2.3.0.37-rc1/arch/ia64/kernel/ptrace.c
+diff -NurpP --minimal linux-2.6.37/arch/ia64/kernel/ptrace.c linux-2.6.37-vs2.3.0.37-rc2/arch/ia64/kernel/ptrace.c
--- linux-2.6.37/arch/ia64/kernel/ptrace.c 2011-01-05 21:48:59.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/arch/ia64/kernel/ptrace.c 2010-11-23 02:09:40.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/arch/ia64/kernel/ptrace.c 2010-11-23 02:09:40.000000000 +0100
@@ -21,6 +21,7 @@
#include <linux/regset.h>
#include <linux/elf.h>
#include <asm/pgtable.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-2.6.37/arch/ia64/kernel/traps.c linux-2.6.37-vs2.3.0.37-rc1/arch/ia64/kernel/traps.c
+diff -NurpP --minimal linux-2.6.37/arch/ia64/kernel/traps.c linux-2.6.37-vs2.3.0.37-rc2/arch/ia64/kernel/traps.c
--- linux-2.6.37/arch/ia64/kernel/traps.c 2010-07-07 18:31:01.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/arch/ia64/kernel/traps.c 2010-11-23 02:09:40.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/arch/ia64/kernel/traps.c 2010-11-23 02:09:40.000000000 +0100
@@ -59,8 +59,9 @@ die (const char *str, struct pt_regs *re
put_cpu();
}
}
}
-diff -NurpP --minimal linux-2.6.37/arch/ia64/mm/fault.c linux-2.6.37-vs2.3.0.37-rc1/arch/ia64/mm/fault.c
+diff -NurpP --minimal linux-2.6.37/arch/ia64/mm/fault.c linux-2.6.37-vs2.3.0.37-rc2/arch/ia64/mm/fault.c
--- linux-2.6.37/arch/ia64/mm/fault.c 2010-08-02 16:52:04.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/arch/ia64/mm/fault.c 2010-11-23 02:09:40.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/arch/ia64/mm/fault.c 2010-11-23 02:09:40.000000000 +0100
@@ -10,6 +10,7 @@
#include <linux/interrupt.h>
#include <linux/kprobes.h>
#include <asm/pgtable.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-2.6.37/arch/m32r/kernel/traps.c linux-2.6.37-vs2.3.0.37-rc1/arch/m32r/kernel/traps.c
+diff -NurpP --minimal linux-2.6.37/arch/m32r/kernel/traps.c linux-2.6.37-vs2.3.0.37-rc2/arch/m32r/kernel/traps.c
--- linux-2.6.37/arch/m32r/kernel/traps.c 2009-12-03 20:01:57.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/arch/m32r/kernel/traps.c 2010-11-23 02:09:40.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/arch/m32r/kernel/traps.c 2010-11-23 02:09:40.000000000 +0100
@@ -196,8 +196,9 @@ static void show_registers(struct pt_reg
} else {
printk("SPI: %08lx\n", sp);
/*
* When in-kernel, we also print out the stack and code at the
-diff -NurpP --minimal linux-2.6.37/arch/m68k/Kconfig linux-2.6.37-vs2.3.0.37-rc1/arch/m68k/Kconfig
+diff -NurpP --minimal linux-2.6.37/arch/m68k/Kconfig linux-2.6.37-vs2.3.0.37-rc2/arch/m68k/Kconfig
--- linux-2.6.37/arch/m68k/Kconfig 2011-01-05 21:49:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/arch/m68k/Kconfig 2010-11-23 02:09:40.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/arch/m68k/Kconfig 2010-11-23 02:09:40.000000000 +0100
@@ -610,6 +610,8 @@ source "fs/Kconfig"
source "arch/m68k/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.37/arch/m68k/kernel/ptrace.c linux-2.6.37-vs2.3.0.37-rc1/arch/m68k/kernel/ptrace.c
+diff -NurpP --minimal linux-2.6.37/arch/m68k/kernel/ptrace.c linux-2.6.37-vs2.3.0.37-rc2/arch/m68k/kernel/ptrace.c
--- linux-2.6.37/arch/m68k/kernel/ptrace.c 2011-01-05 21:49:01.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/arch/m68k/kernel/ptrace.c 2010-11-23 02:09:40.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/arch/m68k/kernel/ptrace.c 2010-11-23 02:09:40.000000000 +0100
@@ -18,6 +18,7 @@
#include <linux/ptrace.h>
#include <linux/user.h>
return ret;
out_eio:
-diff -NurpP --minimal linux-2.6.37/arch/m68k/kernel/traps.c linux-2.6.37-vs2.3.0.37-rc1/arch/m68k/kernel/traps.c
+diff -NurpP --minimal linux-2.6.37/arch/m68k/kernel/traps.c linux-2.6.37-vs2.3.0.37-rc2/arch/m68k/kernel/traps.c
--- linux-2.6.37/arch/m68k/kernel/traps.c 2010-08-02 16:52:04.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/arch/m68k/kernel/traps.c 2010-11-23 02:09:40.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/arch/m68k/kernel/traps.c 2010-11-23 02:09:40.000000000 +0100
@@ -906,8 +906,8 @@ void show_registers(struct pt_regs *regs
printk("d4: %08lx d5: %08lx a0: %08lx a1: %08lx\n",
regs->d4, regs->d5, regs->a0, regs->a1);
addr = (unsigned long)&fp->un;
printk("Frame format=%X ", regs->format);
switch (regs->format) {
-diff -NurpP --minimal linux-2.6.37/arch/m68knommu/Kconfig linux-2.6.37-vs2.3.0.37-rc1/arch/m68knommu/Kconfig
+diff -NurpP --minimal linux-2.6.37/arch/m68knommu/Kconfig linux-2.6.37-vs2.3.0.37-rc2/arch/m68knommu/Kconfig
--- linux-2.6.37/arch/m68knommu/Kconfig 2011-01-05 21:49:01.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/arch/m68knommu/Kconfig 2010-11-23 02:09:40.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/arch/m68knommu/Kconfig 2010-11-23 02:09:40.000000000 +0100
@@ -732,6 +732,8 @@ source "fs/Kconfig"
source "arch/m68knommu/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.37/arch/m68knommu/kernel/traps.c linux-2.6.37-vs2.3.0.37-rc1/arch/m68knommu/kernel/traps.c
+diff -NurpP --minimal linux-2.6.37/arch/m68knommu/kernel/traps.c linux-2.6.37-vs2.3.0.37-rc2/arch/m68knommu/kernel/traps.c
--- linux-2.6.37/arch/m68knommu/kernel/traps.c 2011-01-05 21:49:01.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/arch/m68knommu/kernel/traps.c 2010-11-23 02:09:40.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/arch/m68knommu/kernel/traps.c 2010-11-23 02:09:40.000000000 +0100
@@ -78,8 +78,9 @@ void die_if_kernel(char *str, struct pt_
printk(KERN_EMERG "d4: %08lx d5: %08lx a0: %08lx a1: %08lx\n",
fp->d4, fp->d5, fp->a0, fp->a1);
show_stack(NULL, (unsigned long *)(fp + 1));
add_taint(TAINT_DIE);
do_exit(SIGSEGV);
-diff -NurpP --minimal linux-2.6.37/arch/mips/Kconfig linux-2.6.37-vs2.3.0.37-rc1/arch/mips/Kconfig
+diff -NurpP --minimal linux-2.6.37/arch/mips/Kconfig linux-2.6.37-vs2.3.0.37-rc2/arch/mips/Kconfig
--- linux-2.6.37/arch/mips/Kconfig 2011-01-05 21:49:03.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/arch/mips/Kconfig 2011-01-05 22:30:26.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/arch/mips/Kconfig 2011-01-05 22:30:26.000000000 +0100
@@ -2396,6 +2396,8 @@ source "fs/Kconfig"
source "arch/mips/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.37/arch/mips/kernel/ptrace.c linux-2.6.37-vs2.3.0.37-rc1/arch/mips/kernel/ptrace.c
+diff -NurpP --minimal linux-2.6.37/arch/mips/kernel/ptrace.c linux-2.6.37-vs2.3.0.37-rc2/arch/mips/kernel/ptrace.c
--- linux-2.6.37/arch/mips/kernel/ptrace.c 2011-01-05 21:49:06.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/arch/mips/kernel/ptrace.c 2010-11-23 02:09:40.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/arch/mips/kernel/ptrace.c 2010-11-23 02:09:40.000000000 +0100
@@ -25,6 +25,7 @@
#include <linux/security.h>
#include <linux/audit.h>
switch (request) {
/* when I and D space are separate, these will need to be fixed. */
case PTRACE_PEEKTEXT: /* read word at location addr. */
-diff -NurpP --minimal linux-2.6.37/arch/mips/kernel/scall32-o32.S linux-2.6.37-vs2.3.0.37-rc1/arch/mips/kernel/scall32-o32.S
+diff -NurpP --minimal linux-2.6.37/arch/mips/kernel/scall32-o32.S linux-2.6.37-vs2.3.0.37-rc2/arch/mips/kernel/scall32-o32.S
--- linux-2.6.37/arch/mips/kernel/scall32-o32.S 2010-10-21 13:06:54.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/arch/mips/kernel/scall32-o32.S 2010-11-23 02:09:40.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/arch/mips/kernel/scall32-o32.S 2010-11-23 02:09:40.000000000 +0100
@@ -524,7 +524,7 @@ einval: li v0, -ENOSYS
sys sys_mq_timedreceive 5
sys sys_mq_notify 2 /* 4275 */
sys sys_waitid 5
sys sys_ni_syscall 0 /* available, was setaltroot */
sys sys_add_key 5 /* 4280 */
-diff -NurpP --minimal linux-2.6.37/arch/mips/kernel/scall64-64.S linux-2.6.37-vs2.3.0.37-rc1/arch/mips/kernel/scall64-64.S
+diff -NurpP --minimal linux-2.6.37/arch/mips/kernel/scall64-64.S linux-2.6.37-vs2.3.0.37-rc2/arch/mips/kernel/scall64-64.S
--- linux-2.6.37/arch/mips/kernel/scall64-64.S 2010-10-21 13:06:54.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/arch/mips/kernel/scall64-64.S 2010-11-23 02:09:40.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/arch/mips/kernel/scall64-64.S 2010-11-23 02:09:40.000000000 +0100
@@ -363,7 +363,7 @@ sys_call_table:
PTR sys_mq_timedreceive
PTR sys_mq_notify
PTR sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-2.6.37/arch/mips/kernel/scall64-n32.S linux-2.6.37-vs2.3.0.37-rc1/arch/mips/kernel/scall64-n32.S
+diff -NurpP --minimal linux-2.6.37/arch/mips/kernel/scall64-n32.S linux-2.6.37-vs2.3.0.37-rc2/arch/mips/kernel/scall64-n32.S
--- linux-2.6.37/arch/mips/kernel/scall64-n32.S 2010-10-21 13:06:54.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/arch/mips/kernel/scall64-n32.S 2010-11-23 02:09:40.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/arch/mips/kernel/scall64-n32.S 2010-11-23 02:09:40.000000000 +0100
@@ -362,7 +362,7 @@ EXPORT(sysn32_call_table)
PTR compat_sys_mq_timedreceive
PTR compat_sys_mq_notify
PTR compat_sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-2.6.37/arch/mips/kernel/scall64-o32.S linux-2.6.37-vs2.3.0.37-rc1/arch/mips/kernel/scall64-o32.S
+diff -NurpP --minimal linux-2.6.37/arch/mips/kernel/scall64-o32.S linux-2.6.37-vs2.3.0.37-rc2/arch/mips/kernel/scall64-o32.S
--- linux-2.6.37/arch/mips/kernel/scall64-o32.S 2010-10-21 13:06:54.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/arch/mips/kernel/scall64-o32.S 2010-11-23 02:09:40.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/arch/mips/kernel/scall64-o32.S 2010-11-23 02:09:40.000000000 +0100
@@ -481,7 +481,7 @@ sys_call_table:
PTR compat_sys_mq_timedreceive
PTR compat_sys_mq_notify /* 4275 */
PTR sys_32_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key /* 4280 */
-diff -NurpP --minimal linux-2.6.37/arch/mips/kernel/traps.c linux-2.6.37-vs2.3.0.37-rc1/arch/mips/kernel/traps.c
+diff -NurpP --minimal linux-2.6.37/arch/mips/kernel/traps.c linux-2.6.37-vs2.3.0.37-rc2/arch/mips/kernel/traps.c
--- linux-2.6.37/arch/mips/kernel/traps.c 2011-01-05 21:49:06.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/arch/mips/kernel/traps.c 2011-01-05 22:30:26.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/arch/mips/kernel/traps.c 2011-01-05 22:30:26.000000000 +0100
@@ -343,9 +343,10 @@ void show_registers(struct pt_regs *regs
__show_regs(regs);
if (cpu_has_userlocal) {
unsigned long tls;
-diff -NurpP --minimal linux-2.6.37/arch/parisc/Kconfig linux-2.6.37-vs2.3.0.37-rc1/arch/parisc/Kconfig
+diff -NurpP --minimal linux-2.6.37/arch/parisc/Kconfig linux-2.6.37-vs2.3.0.37-rc2/arch/parisc/Kconfig
--- linux-2.6.37/arch/parisc/Kconfig 2011-01-05 21:49:08.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/arch/parisc/Kconfig 2010-11-23 02:09:40.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/arch/parisc/Kconfig 2010-11-23 02:09:40.000000000 +0100
@@ -293,6 +293,8 @@ source "fs/Kconfig"
source "arch/parisc/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.37/arch/parisc/kernel/syscall_table.S linux-2.6.37-vs2.3.0.37-rc1/arch/parisc/kernel/syscall_table.S
+diff -NurpP --minimal linux-2.6.37/arch/parisc/kernel/syscall_table.S linux-2.6.37-vs2.3.0.37-rc2/arch/parisc/kernel/syscall_table.S
--- linux-2.6.37/arch/parisc/kernel/syscall_table.S 2011-01-05 21:49:09.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/arch/parisc/kernel/syscall_table.S 2010-11-23 02:09:40.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/arch/parisc/kernel/syscall_table.S 2010-11-23 02:09:40.000000000 +0100
@@ -361,7 +361,7 @@
ENTRY_COMP(mbind) /* 260 */
ENTRY_COMP(get_mempolicy)
ENTRY_SAME(add_key)
ENTRY_SAME(request_key) /* 265 */
ENTRY_SAME(keyctl)
-diff -NurpP --minimal linux-2.6.37/arch/parisc/kernel/traps.c linux-2.6.37-vs2.3.0.37-rc1/arch/parisc/kernel/traps.c
+diff -NurpP --minimal linux-2.6.37/arch/parisc/kernel/traps.c linux-2.6.37-vs2.3.0.37-rc2/arch/parisc/kernel/traps.c
--- linux-2.6.37/arch/parisc/kernel/traps.c 2009-09-10 15:25:40.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/arch/parisc/kernel/traps.c 2010-11-23 02:09:40.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/arch/parisc/kernel/traps.c 2010-11-23 02:09:40.000000000 +0100
@@ -236,8 +236,9 @@ void die_if_kernel(char *str, struct pt_
if (err == 0)
return; /* STFU */
/* Wot's wrong wif bein' racy? */
if (current->thread.flags & PARISC_KERNEL_DEATH) {
-diff -NurpP --minimal linux-2.6.37/arch/parisc/mm/fault.c linux-2.6.37-vs2.3.0.37-rc1/arch/parisc/mm/fault.c
+diff -NurpP --minimal linux-2.6.37/arch/parisc/mm/fault.c linux-2.6.37-vs2.3.0.37-rc2/arch/parisc/mm/fault.c
--- linux-2.6.37/arch/parisc/mm/fault.c 2010-08-02 16:52:06.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/arch/parisc/mm/fault.c 2010-11-23 02:09:40.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/arch/parisc/mm/fault.c 2010-11-23 02:09:40.000000000 +0100
@@ -237,8 +237,9 @@ bad_area:
#ifdef PRINT_USER_FAULTS
if (vma) {
printk(KERN_DEBUG "vm_start = 0x%08lx, vm_end = 0x%08lx\n",
vma->vm_start, vma->vm_end);
-diff -NurpP --minimal linux-2.6.37/arch/powerpc/include/asm/unistd.h linux-2.6.37-vs2.3.0.37-rc1/arch/powerpc/include/asm/unistd.h
+diff -NurpP --minimal linux-2.6.37/arch/powerpc/include/asm/unistd.h linux-2.6.37-vs2.3.0.37-rc2/arch/powerpc/include/asm/unistd.h
--- linux-2.6.37/arch/powerpc/include/asm/unistd.h 2011-01-05 21:49:10.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/arch/powerpc/include/asm/unistd.h 2010-11-23 02:09:40.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/arch/powerpc/include/asm/unistd.h 2010-11-23 02:09:40.000000000 +0100
@@ -275,7 +275,7 @@
#endif
#define __NR_rtas 255
#define __NR_migrate_pages 258
#define __NR_mbind 259
#define __NR_get_mempolicy 260
-diff -NurpP --minimal linux-2.6.37/arch/powerpc/Kconfig linux-2.6.37-vs2.3.0.37-rc1/arch/powerpc/Kconfig
+diff -NurpP --minimal linux-2.6.37/arch/powerpc/Kconfig linux-2.6.37-vs2.3.0.37-rc2/arch/powerpc/Kconfig
--- linux-2.6.37/arch/powerpc/Kconfig 2011-01-05 21:49:09.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/arch/powerpc/Kconfig 2010-11-23 02:09:40.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/arch/powerpc/Kconfig 2010-11-23 02:09:40.000000000 +0100
@@ -976,6 +976,8 @@ source "lib/Kconfig"
source "arch/powerpc/Kconfig.debug"
source "security/Kconfig"
config KEYS_COMPAT
-diff -NurpP --minimal linux-2.6.37/arch/powerpc/kernel/process.c linux-2.6.37-vs2.3.0.37-rc1/arch/powerpc/kernel/process.c
+diff -NurpP --minimal linux-2.6.37/arch/powerpc/kernel/process.c linux-2.6.37-vs2.3.0.37-rc2/arch/powerpc/kernel/process.c
--- linux-2.6.37/arch/powerpc/kernel/process.c 2011-01-05 21:49:11.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/arch/powerpc/kernel/process.c 2010-11-23 02:09:40.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/arch/powerpc/kernel/process.c 2010-11-23 02:09:40.000000000 +0100
@@ -633,8 +633,9 @@ void show_regs(struct pt_regs * regs)
#else
printk("DAR: "REG", DSISR: "REG"\n", regs->dar, regs->dsisr);
#ifdef CONFIG_SMP
printk(" CPU: %d", raw_smp_processor_id());
-diff -NurpP --minimal linux-2.6.37/arch/powerpc/kernel/traps.c linux-2.6.37-vs2.3.0.37-rc1/arch/powerpc/kernel/traps.c
+diff -NurpP --minimal linux-2.6.37/arch/powerpc/kernel/traps.c linux-2.6.37-vs2.3.0.37-rc2/arch/powerpc/kernel/traps.c
--- linux-2.6.37/arch/powerpc/kernel/traps.c 2011-01-05 21:49:11.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/arch/powerpc/kernel/traps.c 2010-11-23 02:09:40.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/arch/powerpc/kernel/traps.c 2010-11-23 02:09:40.000000000 +0100
@@ -1053,8 +1053,9 @@ void nonrecoverable_exception(struct pt_
void trace_syscall(struct pt_regs *regs)
regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted());
}
-diff -NurpP --minimal linux-2.6.37/arch/powerpc/kernel/vdso.c linux-2.6.37-vs2.3.0.37-rc1/arch/powerpc/kernel/vdso.c
+diff -NurpP --minimal linux-2.6.37/arch/powerpc/kernel/vdso.c linux-2.6.37-vs2.3.0.37-rc2/arch/powerpc/kernel/vdso.c
--- linux-2.6.37/arch/powerpc/kernel/vdso.c 2011-01-05 21:49:11.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/arch/powerpc/kernel/vdso.c 2010-11-23 02:09:40.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/arch/powerpc/kernel/vdso.c 2010-11-23 02:09:40.000000000 +0100
@@ -23,6 +23,7 @@
#include <linux/security.h>
#include <linux/bootmem.h>
#include <asm/pgtable.h>
#include <asm/system.h>
-diff -NurpP --minimal linux-2.6.37/arch/s390/include/asm/tlb.h linux-2.6.37-vs2.3.0.37-rc1/arch/s390/include/asm/tlb.h
+diff -NurpP --minimal linux-2.6.37/arch/s390/include/asm/tlb.h linux-2.6.37-vs2.3.0.37-rc2/arch/s390/include/asm/tlb.h
--- linux-2.6.37/arch/s390/include/asm/tlb.h 2011-01-05 21:49:13.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/arch/s390/include/asm/tlb.h 2010-11-23 02:09:40.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/arch/s390/include/asm/tlb.h 2010-11-23 02:09:40.000000000 +0100
@@ -23,6 +23,8 @@
#include <linux/mm.h>
#include <asm/processor.h>
#include <asm/pgalloc.h>
#include <asm/smp.h>
-diff -NurpP --minimal linux-2.6.37/arch/s390/include/asm/unistd.h linux-2.6.37-vs2.3.0.37-rc1/arch/s390/include/asm/unistd.h
+diff -NurpP --minimal linux-2.6.37/arch/s390/include/asm/unistd.h linux-2.6.37-vs2.3.0.37-rc2/arch/s390/include/asm/unistd.h
--- linux-2.6.37/arch/s390/include/asm/unistd.h 2010-10-21 13:06:58.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/arch/s390/include/asm/unistd.h 2010-11-23 02:09:40.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/arch/s390/include/asm/unistd.h 2010-11-23 02:09:40.000000000 +0100
@@ -202,7 +202,7 @@
#define __NR_clock_gettime (__NR_timer_create+6)
#define __NR_clock_getres (__NR_timer_create+7)
#define __NR_statfs64 265
#define __NR_fstatfs64 266
#define __NR_remap_file_pages 267
-diff -NurpP --minimal linux-2.6.37/arch/s390/Kconfig linux-2.6.37-vs2.3.0.37-rc1/arch/s390/Kconfig
+diff -NurpP --minimal linux-2.6.37/arch/s390/Kconfig linux-2.6.37-vs2.3.0.37-rc2/arch/s390/Kconfig
--- linux-2.6.37/arch/s390/Kconfig 2011-01-05 21:49:12.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/arch/s390/Kconfig 2010-11-23 02:09:40.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/arch/s390/Kconfig 2010-11-23 02:09:40.000000000 +0100
@@ -640,6 +640,8 @@ source "fs/Kconfig"
source "arch/s390/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.37/arch/s390/kernel/ptrace.c linux-2.6.37-vs2.3.0.37-rc1/arch/s390/kernel/ptrace.c
+diff -NurpP --minimal linux-2.6.37/arch/s390/kernel/ptrace.c linux-2.6.37-vs2.3.0.37-rc2/arch/s390/kernel/ptrace.c
--- linux-2.6.37/arch/s390/kernel/ptrace.c 2011-01-05 21:49:13.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/arch/s390/kernel/ptrace.c 2010-11-23 02:09:40.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/arch/s390/kernel/ptrace.c 2010-11-23 02:09:40.000000000 +0100
@@ -36,6 +36,7 @@
#include <linux/regset.h>
#include <linux/tracehook.h>
#include <trace/syscall.h>
#include <asm/compat.h>
#include <asm/segment.h>
-diff -NurpP --minimal linux-2.6.37/arch/s390/kernel/syscalls.S linux-2.6.37-vs2.3.0.37-rc1/arch/s390/kernel/syscalls.S
+diff -NurpP --minimal linux-2.6.37/arch/s390/kernel/syscalls.S linux-2.6.37-vs2.3.0.37-rc2/arch/s390/kernel/syscalls.S
--- linux-2.6.37/arch/s390/kernel/syscalls.S 2010-10-21 13:06:58.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/arch/s390/kernel/syscalls.S 2010-11-23 02:09:40.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/arch/s390/kernel/syscalls.S 2010-11-23 02:09:40.000000000 +0100
@@ -271,7 +271,7 @@ SYSCALL(sys_clock_settime,sys_clock_sett
SYSCALL(sys_clock_gettime,sys_clock_gettime,sys32_clock_gettime_wrapper) /* 260 */
SYSCALL(sys_clock_getres,sys_clock_getres,sys32_clock_getres_wrapper)
SYSCALL(sys_s390_fadvise64_64,sys_ni_syscall,sys32_fadvise64_64_wrapper)
SYSCALL(sys_statfs64,sys_statfs64,compat_sys_statfs64_wrapper)
SYSCALL(sys_fstatfs64,sys_fstatfs64,compat_sys_fstatfs64_wrapper)
-diff -NurpP --minimal linux-2.6.37/arch/sh/Kconfig linux-2.6.37-vs2.3.0.37-rc1/arch/sh/Kconfig
+diff -NurpP --minimal linux-2.6.37/arch/sh/Kconfig linux-2.6.37-vs2.3.0.37-rc2/arch/sh/Kconfig
--- linux-2.6.37/arch/sh/Kconfig 2011-01-05 21:49:13.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/arch/sh/Kconfig 2011-01-05 22:30:27.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/arch/sh/Kconfig 2011-01-05 22:30:27.000000000 +0100
@@ -883,6 +883,8 @@ source "fs/Kconfig"
source "arch/sh/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.37/arch/sh/kernel/irq.c linux-2.6.37-vs2.3.0.37-rc1/arch/sh/kernel/irq.c
+diff -NurpP --minimal linux-2.6.37/arch/sh/kernel/irq.c linux-2.6.37-vs2.3.0.37-rc2/arch/sh/kernel/irq.c
--- linux-2.6.37/arch/sh/kernel/irq.c 2011-01-05 21:49:16.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/arch/sh/kernel/irq.c 2010-11-23 02:09:40.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/arch/sh/kernel/irq.c 2010-11-23 02:09:40.000000000 +0100
@@ -13,6 +13,7 @@
#include <linux/seq_file.h>
#include <linux/ftrace.h>
#include <asm/processor.h>
#include <asm/machvec.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-2.6.37/arch/sh/kernel/vsyscall/vsyscall.c linux-2.6.37-vs2.3.0.37-rc1/arch/sh/kernel/vsyscall/vsyscall.c
+diff -NurpP --minimal linux-2.6.37/arch/sh/kernel/vsyscall/vsyscall.c linux-2.6.37-vs2.3.0.37-rc2/arch/sh/kernel/vsyscall/vsyscall.c
--- linux-2.6.37/arch/sh/kernel/vsyscall/vsyscall.c 2010-07-07 18:31:10.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/arch/sh/kernel/vsyscall/vsyscall.c 2010-11-23 02:09:40.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/arch/sh/kernel/vsyscall/vsyscall.c 2010-11-23 02:09:40.000000000 +0100
@@ -18,6 +18,7 @@
#include <linux/elf.h>
#include <linux/sched.h>
/*
* Should the kernel map a VDSO page into processes and pass its
-diff -NurpP --minimal linux-2.6.37/arch/sparc/include/asm/tlb_64.h linux-2.6.37-vs2.3.0.37-rc1/arch/sparc/include/asm/tlb_64.h
+diff -NurpP --minimal linux-2.6.37/arch/sparc/include/asm/tlb_64.h linux-2.6.37-vs2.3.0.37-rc2/arch/sparc/include/asm/tlb_64.h
--- linux-2.6.37/arch/sparc/include/asm/tlb_64.h 2009-09-10 15:25:45.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/arch/sparc/include/asm/tlb_64.h 2010-11-23 02:09:40.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/arch/sparc/include/asm/tlb_64.h 2010-11-23 02:09:40.000000000 +0100
@@ -3,6 +3,7 @@
#include <linux/swap.h>
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
#include <asm/mmu_context.h>
-diff -NurpP --minimal linux-2.6.37/arch/sparc/include/asm/unistd.h linux-2.6.37-vs2.3.0.37-rc1/arch/sparc/include/asm/unistd.h
+diff -NurpP --minimal linux-2.6.37/arch/sparc/include/asm/unistd.h linux-2.6.37-vs2.3.0.37-rc2/arch/sparc/include/asm/unistd.h
--- linux-2.6.37/arch/sparc/include/asm/unistd.h 2010-10-21 13:06:58.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/arch/sparc/include/asm/unistd.h 2010-11-23 02:09:40.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/arch/sparc/include/asm/unistd.h 2010-11-23 02:09:40.000000000 +0100
@@ -335,7 +335,7 @@
#define __NR_timer_getoverrun 264
#define __NR_timer_delete 265
#define __NR_io_setup 268
#define __NR_io_destroy 269
#define __NR_io_submit 270
-diff -NurpP --minimal linux-2.6.37/arch/sparc/Kconfig linux-2.6.37-vs2.3.0.37-rc1/arch/sparc/Kconfig
+diff -NurpP --minimal linux-2.6.37/arch/sparc/Kconfig linux-2.6.37-vs2.3.0.37-rc2/arch/sparc/Kconfig
--- linux-2.6.37/arch/sparc/Kconfig 2011-01-05 21:49:17.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/arch/sparc/Kconfig 2010-11-23 02:09:40.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/arch/sparc/Kconfig 2010-11-23 02:09:40.000000000 +0100
@@ -560,6 +560,8 @@ source "fs/Kconfig"
source "arch/sparc/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.37/arch/sparc/kernel/systbls_32.S linux-2.6.37-vs2.3.0.37-rc1/arch/sparc/kernel/systbls_32.S
+diff -NurpP --minimal linux-2.6.37/arch/sparc/kernel/systbls_32.S linux-2.6.37-vs2.3.0.37-rc2/arch/sparc/kernel/systbls_32.S
--- linux-2.6.37/arch/sparc/kernel/systbls_32.S 2010-10-21 13:06:59.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/arch/sparc/kernel/systbls_32.S 2010-11-23 02:09:40.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/arch/sparc/kernel/systbls_32.S 2010-11-23 02:09:40.000000000 +0100
@@ -70,7 +70,7 @@ sys_call_table:
/*250*/ .long sys_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_nfsservctl
/*255*/ .long sys_sync_file_range, sys_clock_settime, sys_clock_gettime, sys_clock_getres, sys_clock_nanosleep
/*270*/ .long sys_io_submit, sys_io_cancel, sys_io_getevents, sys_mq_open, sys_mq_unlink
/*275*/ .long sys_mq_timedsend, sys_mq_timedreceive, sys_mq_notify, sys_mq_getsetattr, sys_waitid
/*280*/ .long sys_tee, sys_add_key, sys_request_key, sys_keyctl, sys_openat
-diff -NurpP --minimal linux-2.6.37/arch/sparc/kernel/systbls_64.S linux-2.6.37-vs2.3.0.37-rc1/arch/sparc/kernel/systbls_64.S
+diff -NurpP --minimal linux-2.6.37/arch/sparc/kernel/systbls_64.S linux-2.6.37-vs2.3.0.37-rc2/arch/sparc/kernel/systbls_64.S
--- linux-2.6.37/arch/sparc/kernel/systbls_64.S 2010-10-21 13:06:59.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/arch/sparc/kernel/systbls_64.S 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/arch/sparc/kernel/systbls_64.S 2010-11-23 02:09:41.000000000 +0100
@@ -71,7 +71,7 @@ sys_call_table32:
/*250*/ .word sys_mremap, compat_sys_sysctl, sys32_getsid, sys_fdatasync, sys32_nfsservctl
.word sys32_sync_file_range, compat_sys_clock_settime, compat_sys_clock_gettime, compat_sys_clock_getres, sys32_clock_nanosleep
/*270*/ .word sys_io_submit, sys_io_cancel, sys_io_getevents, sys_mq_open, sys_mq_unlink
.word sys_mq_timedsend, sys_mq_timedreceive, sys_mq_notify, sys_mq_getsetattr, sys_waitid
/*280*/ .word sys_tee, sys_add_key, sys_request_key, sys_keyctl, sys_openat
-diff -NurpP --minimal linux-2.6.37/arch/um/include/asm/tlb.h linux-2.6.37-vs2.3.0.37-rc1/arch/um/include/asm/tlb.h
+diff -NurpP --minimal linux-2.6.37/arch/um/include/asm/tlb.h linux-2.6.37-vs2.3.0.37-rc2/arch/um/include/asm/tlb.h
--- linux-2.6.37/arch/um/include/asm/tlb.h 2009-09-10 15:25:46.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/arch/um/include/asm/tlb.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/arch/um/include/asm/tlb.h 2010-11-23 02:09:41.000000000 +0100
@@ -3,6 +3,7 @@
#include <linux/pagemap.h>
#include <asm/percpu.h>
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
-diff -NurpP --minimal linux-2.6.37/arch/um/include/shared/kern_constants.h linux-2.6.37-vs2.3.0.37-rc1/arch/um/include/shared/kern_constants.h
+diff -NurpP --minimal linux-2.6.37/arch/um/include/shared/kern_constants.h linux-2.6.37-vs2.3.0.37-rc2/arch/um/include/shared/kern_constants.h
--- linux-2.6.37/arch/um/include/shared/kern_constants.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/arch/um/include/shared/kern_constants.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/arch/um/include/shared/kern_constants.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../include/generated/asm-offsets.h"
-diff -NurpP --minimal linux-2.6.37/arch/um/include/shared/user_constants.h linux-2.6.37-vs2.3.0.37-rc1/arch/um/include/shared/user_constants.h
+diff -NurpP --minimal linux-2.6.37/arch/um/include/shared/user_constants.h linux-2.6.37-vs2.3.0.37-rc2/arch/um/include/shared/user_constants.h
--- linux-2.6.37/arch/um/include/shared/user_constants.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/arch/um/include/shared/user_constants.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/arch/um/include/shared/user_constants.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,40 @@
+/*
+ * DO NOT MODIFY.
+#define UM_PROT_WRITE 2 /* PROT_WRITE # */
+#define UM_PROT_EXEC 4 /* PROT_EXEC # */
+
-diff -NurpP --minimal linux-2.6.37/arch/um/Kconfig.rest linux-2.6.37-vs2.3.0.37-rc1/arch/um/Kconfig.rest
+diff -NurpP --minimal linux-2.6.37/arch/um/Kconfig.rest linux-2.6.37-vs2.3.0.37-rc2/arch/um/Kconfig.rest
--- linux-2.6.37/arch/um/Kconfig.rest 2009-06-11 17:12:19.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/arch/um/Kconfig.rest 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/arch/um/Kconfig.rest 2010-11-23 02:09:41.000000000 +0100
@@ -18,6 +18,8 @@ source "drivers/connector/Kconfig"
source "fs/Kconfig"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.37/arch/x86/ia32/ia32entry.S linux-2.6.37-vs2.3.0.37-rc1/arch/x86/ia32/ia32entry.S
+diff -NurpP --minimal linux-2.6.37/arch/x86/ia32/ia32entry.S linux-2.6.37-vs2.3.0.37-rc2/arch/x86/ia32/ia32entry.S
--- linux-2.6.37/arch/x86/ia32/ia32entry.S 2010-10-21 13:06:59.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/arch/x86/ia32/ia32entry.S 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/arch/x86/ia32/ia32entry.S 2010-11-23 02:09:41.000000000 +0100
@@ -783,7 +783,7 @@ ia32_sys_call_table:
.quad sys_tgkill /* 270 */
.quad compat_sys_utimes
.quad sys_mbind
.quad compat_sys_get_mempolicy /* 275 */
.quad sys_set_mempolicy
-diff -NurpP --minimal linux-2.6.37/arch/x86/include/asm/unistd_64.h linux-2.6.37-vs2.3.0.37-rc1/arch/x86/include/asm/unistd_64.h
+diff -NurpP --minimal linux-2.6.37/arch/x86/include/asm/unistd_64.h linux-2.6.37-vs2.3.0.37-rc2/arch/x86/include/asm/unistd_64.h
--- linux-2.6.37/arch/x86/include/asm/unistd_64.h 2010-10-21 13:06:59.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/arch/x86/include/asm/unistd_64.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/arch/x86/include/asm/unistd_64.h 2010-11-23 02:09:41.000000000 +0100
@@ -535,7 +535,7 @@ __SYSCALL(__NR_tgkill, sys_tgkill)
#define __NR_utimes 235
__SYSCALL(__NR_utimes, sys_utimes)
#define __NR_mbind 237
__SYSCALL(__NR_mbind, sys_mbind)
#define __NR_set_mempolicy 238
-diff -NurpP --minimal linux-2.6.37/arch/x86/Kconfig linux-2.6.37-vs2.3.0.37-rc1/arch/x86/Kconfig
+diff -NurpP --minimal linux-2.6.37/arch/x86/Kconfig linux-2.6.37-vs2.3.0.37-rc2/arch/x86/Kconfig
--- linux-2.6.37/arch/x86/Kconfig 2011-01-05 21:49:19.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/arch/x86/Kconfig 2011-01-05 22:30:27.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/arch/x86/Kconfig 2011-01-05 22:30:27.000000000 +0100
@@ -2119,6 +2119,8 @@ source "fs/Kconfig"
source "arch/x86/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.37/arch/x86/kernel/syscall_table_32.S linux-2.6.37-vs2.3.0.37-rc1/arch/x86/kernel/syscall_table_32.S
+diff -NurpP --minimal linux-2.6.37/arch/x86/kernel/syscall_table_32.S linux-2.6.37-vs2.3.0.37-rc2/arch/x86/kernel/syscall_table_32.S
--- linux-2.6.37/arch/x86/kernel/syscall_table_32.S 2010-10-21 13:07:00.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/arch/x86/kernel/syscall_table_32.S 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/arch/x86/kernel/syscall_table_32.S 2010-11-23 02:09:41.000000000 +0100
@@ -272,7 +272,7 @@ ENTRY(sys_call_table)
.long sys_tgkill /* 270 */
.long sys_utimes
.long sys_mbind
.long sys_get_mempolicy
.long sys_set_mempolicy
-diff -NurpP --minimal linux-2.6.37/Documentation/vserver/debug.txt linux-2.6.37-vs2.3.0.37-rc1/Documentation/vserver/debug.txt
+diff -NurpP --minimal linux-2.6.37/Documentation/vserver/debug.txt linux-2.6.37-vs2.3.0.37-rc2/Documentation/vserver/debug.txt
--- linux-2.6.37/Documentation/vserver/debug.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/Documentation/vserver/debug.txt 2010-11-23 02:09:40.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/Documentation/vserver/debug.txt 2010-11-23 02:09:40.000000000 +0100
@@ -0,0 +1,154 @@
+
+debug_cvirt:
+ m 2^m "vx_acc_page[%5d,%s,%2d]: %5d%s"
+ "vx_acc_pages[%5d,%s,%2d]: %5d += %5d"
+ "vx_pages_avail[%5d,%s,%2d]: %5ld > %5d + %5d"
-diff -NurpP --minimal linux-2.6.37/drivers/block/Kconfig linux-2.6.37-vs2.3.0.37-rc1/drivers/block/Kconfig
+diff -NurpP --minimal linux-2.6.37/drivers/block/Kconfig linux-2.6.37-vs2.3.0.37-rc2/drivers/block/Kconfig
--- linux-2.6.37/drivers/block/Kconfig 2011-01-05 21:49:25.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/drivers/block/Kconfig 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/drivers/block/Kconfig 2010-11-23 02:09:41.000000000 +0100
@@ -273,6 +273,13 @@ config BLK_DEV_CRYPTOLOOP
source "drivers/block/drbd/Kconfig"
config BLK_DEV_NBD
tristate "Network block device support"
depends on NET
-diff -NurpP --minimal linux-2.6.37/drivers/block/loop.c linux-2.6.37-vs2.3.0.37-rc1/drivers/block/loop.c
+diff -NurpP --minimal linux-2.6.37/drivers/block/loop.c linux-2.6.37-vs2.3.0.37-rc2/drivers/block/loop.c
--- linux-2.6.37/drivers/block/loop.c 2011-01-05 21:49:25.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/drivers/block/loop.c 2010-11-23 02:15:37.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/drivers/block/loop.c 2010-11-23 02:15:37.000000000 +0100
@@ -75,6 +75,7 @@
#include <linux/kthread.h>
#include <linux/splice.h>
mutex_lock(&loop_mutex);
mutex_lock(&lo->lo_ctl_mutex);
lo->lo_refcnt++;
-diff -NurpP --minimal linux-2.6.37/drivers/block/Makefile linux-2.6.37-vs2.3.0.37-rc1/drivers/block/Makefile
+diff -NurpP --minimal linux-2.6.37/drivers/block/Makefile linux-2.6.37-vs2.3.0.37-rc2/drivers/block/Makefile
--- linux-2.6.37/drivers/block/Makefile 2011-01-05 21:49:25.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/drivers/block/Makefile 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/drivers/block/Makefile 2010-11-23 02:09:41.000000000 +0100
@@ -34,6 +34,7 @@ obj-$(CONFIG_VIODASD) += viodasd.o
obj-$(CONFIG_BLK_DEV_SX8) += sx8.o
obj-$(CONFIG_BLK_DEV_UB) += ub.o
obj-$(CONFIG_XEN_BLKDEV_FRONTEND) += xen-blkfront.o
obj-$(CONFIG_BLK_DEV_DRBD) += drbd/
-diff -NurpP --minimal linux-2.6.37/drivers/block/vroot.c linux-2.6.37-vs2.3.0.37-rc1/drivers/block/vroot.c
+diff -NurpP --minimal linux-2.6.37/drivers/block/vroot.c linux-2.6.37-vs2.3.0.37-rc2/drivers/block/vroot.c
--- linux-2.6.37/drivers/block/vroot.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/drivers/block/vroot.c 2011-01-06 00:21:01.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/drivers/block/vroot.c 2011-01-08 04:12:17.000000000 +0100
@@ -0,0 +1,282 @@
+/*
+ * linux/drivers/block/vroot.c
+ struct gendisk *disk = disks[i];
+
+ memset(vr, 0, sizeof(*vr));
-+ mutex_init(&vr->vr_ctl_mutex);
++ sema_init(&vr->vr_ctl_mutex, 1);
+ vr->vr_number = i;
+ disk->major = VROOT_MAJOR;
+ disk->first_minor = i;
+
+#endif
+
-diff -NurpP --minimal linux-2.6.37/drivers/gpu/drm/radeon/r100_reg_safe.h linux-2.6.37-vs2.3.0.37-rc1/drivers/gpu/drm/radeon/r100_reg_safe.h
+diff -NurpP --minimal linux-2.6.37/drivers/gpu/drm/radeon/r100_reg_safe.h linux-2.6.37-vs2.3.0.37-rc2/drivers/gpu/drm/radeon/r100_reg_safe.h
--- linux-2.6.37/drivers/gpu/drm/radeon/r100_reg_safe.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/drivers/gpu/drm/radeon/r100_reg_safe.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/drivers/gpu/drm/radeon/r100_reg_safe.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,28 @@
+static const unsigned r100_reg_safe_bm[102] = {
+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
+ 0xFFFFFFFF, 0xFFFFFFEF,
+};
-diff -NurpP --minimal linux-2.6.37/drivers/gpu/drm/radeon/r200_reg_safe.h linux-2.6.37-vs2.3.0.37-rc1/drivers/gpu/drm/radeon/r200_reg_safe.h
+diff -NurpP --minimal linux-2.6.37/drivers/gpu/drm/radeon/r200_reg_safe.h linux-2.6.37-vs2.3.0.37-rc2/drivers/gpu/drm/radeon/r200_reg_safe.h
--- linux-2.6.37/drivers/gpu/drm/radeon/r200_reg_safe.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/drivers/gpu/drm/radeon/r200_reg_safe.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/drivers/gpu/drm/radeon/r200_reg_safe.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,28 @@
+static const unsigned r200_reg_safe_bm[102] = {
+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
+ 0xFFFFFE3F, 0xFFFFFFEF,
+};
-diff -NurpP --minimal linux-2.6.37/drivers/gpu/drm/radeon/r300_reg_safe.h linux-2.6.37-vs2.3.0.37-rc1/drivers/gpu/drm/radeon/r300_reg_safe.h
+diff -NurpP --minimal linux-2.6.37/drivers/gpu/drm/radeon/r300_reg_safe.h linux-2.6.37-vs2.3.0.37-rc2/drivers/gpu/drm/radeon/r300_reg_safe.h
--- linux-2.6.37/drivers/gpu/drm/radeon/r300_reg_safe.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/drivers/gpu/drm/radeon/r300_reg_safe.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/drivers/gpu/drm/radeon/r300_reg_safe.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,42 @@
+static const unsigned r300_reg_safe_bm[159] = {
+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
+ 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+ 0x0003FC01, 0xFFFFFCF8, 0xFF800B19,
+};
-diff -NurpP --minimal linux-2.6.37/drivers/gpu/drm/radeon/r420_reg_safe.h linux-2.6.37-vs2.3.0.37-rc1/drivers/gpu/drm/radeon/r420_reg_safe.h
+diff -NurpP --minimal linux-2.6.37/drivers/gpu/drm/radeon/r420_reg_safe.h linux-2.6.37-vs2.3.0.37-rc2/drivers/gpu/drm/radeon/r420_reg_safe.h
--- linux-2.6.37/drivers/gpu/drm/radeon/r420_reg_safe.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/drivers/gpu/drm/radeon/r420_reg_safe.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/drivers/gpu/drm/radeon/r420_reg_safe.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,42 @@
+static const unsigned r420_reg_safe_bm[159] = {
+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
+ 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+ 0x0003FC01, 0xFFFFFCF8, 0xFF800B19,
+};
-diff -NurpP --minimal linux-2.6.37/drivers/gpu/drm/radeon/rn50_reg_safe.h linux-2.6.37-vs2.3.0.37-rc1/drivers/gpu/drm/radeon/rn50_reg_safe.h
+diff -NurpP --minimal linux-2.6.37/drivers/gpu/drm/radeon/rn50_reg_safe.h linux-2.6.37-vs2.3.0.37-rc2/drivers/gpu/drm/radeon/rn50_reg_safe.h
--- linux-2.6.37/drivers/gpu/drm/radeon/rn50_reg_safe.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/drivers/gpu/drm/radeon/rn50_reg_safe.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/drivers/gpu/drm/radeon/rn50_reg_safe.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,28 @@
+static const unsigned rn50_reg_safe_bm[102] = {
+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
+ 0xFFFFFFFF, 0xFFFFFFFF,
+};
-diff -NurpP --minimal linux-2.6.37/drivers/gpu/drm/radeon/rs600_reg_safe.h linux-2.6.37-vs2.3.0.37-rc1/drivers/gpu/drm/radeon/rs600_reg_safe.h
+diff -NurpP --minimal linux-2.6.37/drivers/gpu/drm/radeon/rs600_reg_safe.h linux-2.6.37-vs2.3.0.37-rc2/drivers/gpu/drm/radeon/rs600_reg_safe.h
--- linux-2.6.37/drivers/gpu/drm/radeon/rs600_reg_safe.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/drivers/gpu/drm/radeon/rs600_reg_safe.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/drivers/gpu/drm/radeon/rs600_reg_safe.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,57 @@
+static const unsigned rs600_reg_safe_bm[219] = {
+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
+};
-diff -NurpP --minimal linux-2.6.37/drivers/gpu/drm/radeon/rv515_reg_safe.h linux-2.6.37-vs2.3.0.37-rc1/drivers/gpu/drm/radeon/rv515_reg_safe.h
+diff -NurpP --minimal linux-2.6.37/drivers/gpu/drm/radeon/rv515_reg_safe.h linux-2.6.37-vs2.3.0.37-rc2/drivers/gpu/drm/radeon/rv515_reg_safe.h
--- linux-2.6.37/drivers/gpu/drm/radeon/rv515_reg_safe.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/drivers/gpu/drm/radeon/rv515_reg_safe.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/drivers/gpu/drm/radeon/rv515_reg_safe.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,57 @@
+static const unsigned rv515_reg_safe_bm[219] = {
+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
+ 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
+};
-diff -NurpP --minimal linux-2.6.37/drivers/infiniband/core/addr.c linux-2.6.37-vs2.3.0.37-rc1/drivers/infiniband/core/addr.c
+diff -NurpP --minimal linux-2.6.37/drivers/infiniband/core/addr.c linux-2.6.37-vs2.3.0.37-rc2/drivers/infiniband/core/addr.c
--- linux-2.6.37/drivers/infiniband/core/addr.c 2010-10-21 13:07:05.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/drivers/infiniband/core/addr.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/drivers/infiniband/core/addr.c 2010-11-23 02:09:41.000000000 +0100
@@ -252,7 +252,7 @@ static int addr6_resolve(struct sockaddr
if (ipv6_addr_any(&fl.fl6_src)) {
if (ret)
goto put;
-diff -NurpP --minimal linux-2.6.37/drivers/infiniband/hw/ipath/ipath_user_pages.c linux-2.6.37-vs2.3.0.37-rc1/drivers/infiniband/hw/ipath/ipath_user_pages.c
+diff -NurpP --minimal linux-2.6.37/drivers/infiniband/hw/ipath/ipath_user_pages.c linux-2.6.37-vs2.3.0.37-rc2/drivers/infiniband/hw/ipath/ipath_user_pages.c
--- linux-2.6.37/drivers/infiniband/hw/ipath/ipath_user_pages.c 2010-07-07 18:31:19.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/drivers/infiniband/hw/ipath/ipath_user_pages.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/drivers/infiniband/hw/ipath/ipath_user_pages.c 2010-11-23 02:09:41.000000000 +0100
@@ -35,6 +35,7 @@
#include <linux/device.h>
#include <linux/slab.h>
#include "ipath_kernel.h"
-diff -NurpP --minimal linux-2.6.37/drivers/md/dm.c linux-2.6.37-vs2.3.0.37-rc1/drivers/md/dm.c
+diff -NurpP --minimal linux-2.6.37/drivers/md/dm.c linux-2.6.37-vs2.3.0.37-rc2/drivers/md/dm.c
--- linux-2.6.37/drivers/md/dm.c 2011-01-05 21:49:35.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/drivers/md/dm.c 2010-11-23 02:18:36.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/drivers/md/dm.c 2010-11-23 02:18:36.000000000 +0100
@@ -20,6 +20,7 @@
#include <linux/idr.h>
#include <linux/hdreg.h>
md->queue = blk_alloc_queue(GFP_KERNEL);
if (!md->queue)
goto bad_queue;
-diff -NurpP --minimal linux-2.6.37/drivers/md/dm.h linux-2.6.37-vs2.3.0.37-rc1/drivers/md/dm.h
+diff -NurpP --minimal linux-2.6.37/drivers/md/dm.h linux-2.6.37-vs2.3.0.37-rc2/drivers/md/dm.h
--- linux-2.6.37/drivers/md/dm.h 2010-10-21 13:07:07.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/drivers/md/dm.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/drivers/md/dm.h 2010-11-23 02:09:41.000000000 +0100
@@ -41,6 +41,8 @@ struct dm_dev_internal {
struct dm_table;
struct dm_md_mempools;
/*-----------------------------------------------------------------
* Internal table functions.
*---------------------------------------------------------------*/
-diff -NurpP --minimal linux-2.6.37/drivers/md/dm-ioctl.c linux-2.6.37-vs2.3.0.37-rc1/drivers/md/dm-ioctl.c
+diff -NurpP --minimal linux-2.6.37/drivers/md/dm-ioctl.c linux-2.6.37-vs2.3.0.37-rc2/drivers/md/dm-ioctl.c
--- linux-2.6.37/drivers/md/dm-ioctl.c 2011-01-05 21:49:35.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/drivers/md/dm-ioctl.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/drivers/md/dm-ioctl.c 2010-11-23 02:09:41.000000000 +0100
@@ -16,6 +16,7 @@
#include <linux/dm-ioctl.h>
#include <linux/hdreg.h>
return -EACCES;
if (_IOC_TYPE(command) != DM_IOCTL)
-diff -NurpP --minimal linux-2.6.37/drivers/net/tun.c linux-2.6.37-vs2.3.0.37-rc1/drivers/net/tun.c
+diff -NurpP --minimal linux-2.6.37/drivers/net/tun.c linux-2.6.37-vs2.3.0.37-rc2/drivers/net/tun.c
--- linux-2.6.37/drivers/net/tun.c 2010-10-21 13:07:15.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/drivers/net/tun.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/drivers/net/tun.c 2010-11-23 02:09:41.000000000 +0100
@@ -62,6 +62,7 @@
#include <linux/nsproxy.h>
#include <linux/virtio_net.h>
case TUNSETLINK:
/* Only allow setting the type when the interface is down */
if (tun->dev->flags & IFF_UP) {
-diff -NurpP --minimal linux-2.6.37/drivers/tty/sysrq.c linux-2.6.37-vs2.3.0.37-rc1/drivers/tty/sysrq.c
+diff -NurpP --minimal linux-2.6.37/drivers/tty/sysrq.c linux-2.6.37-vs2.3.0.37-rc2/drivers/tty/sysrq.c
--- linux-2.6.37/drivers/tty/sysrq.c 2011-01-05 21:50:13.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/drivers/tty/sysrq.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/drivers/tty/sysrq.c 2010-11-23 02:09:41.000000000 +0100
@@ -41,6 +41,7 @@
#include <linux/oom.h>
#include <linux/slab.h>
else
retval = -1;
return retval;
-diff -NurpP --minimal linux-2.6.37/drivers/tty/tty_io.c linux-2.6.37-vs2.3.0.37-rc1/drivers/tty/tty_io.c
+diff -NurpP --minimal linux-2.6.37/drivers/tty/tty_io.c linux-2.6.37-vs2.3.0.37-rc2/drivers/tty/tty_io.c
--- linux-2.6.37/drivers/tty/tty_io.c 2011-01-05 21:50:13.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/drivers/tty/tty_io.c 2011-01-05 22:30:36.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/drivers/tty/tty_io.c 2011-01-05 22:30:36.000000000 +0100
@@ -107,6 +107,7 @@
#include <linux/kmod.h>
if (pgrp_nr < 0)
return -EINVAL;
rcu_read_lock();
-diff -NurpP --minimal linux-2.6.37/fs/attr.c linux-2.6.37-vs2.3.0.37-rc1/fs/attr.c
+diff -NurpP --minimal linux-2.6.37/fs/attr.c linux-2.6.37-vs2.3.0.37-rc2/fs/attr.c
--- linux-2.6.37/fs/attr.c 2010-10-21 13:07:47.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/attr.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/attr.c 2010-11-23 02:09:41.000000000 +0100
@@ -13,6 +13,9 @@
#include <linux/fsnotify.h>
#include <linux/fcntl.h>
if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
return -EPERM;
}
-diff -NurpP --minimal linux-2.6.37/fs/binfmt_aout.c linux-2.6.37-vs2.3.0.37-rc1/fs/binfmt_aout.c
+diff -NurpP --minimal linux-2.6.37/fs/binfmt_aout.c linux-2.6.37-vs2.3.0.37-rc2/fs/binfmt_aout.c
--- linux-2.6.37/fs/binfmt_aout.c 2010-10-21 13:07:47.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/binfmt_aout.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/binfmt_aout.c 2010-11-23 02:09:41.000000000 +0100
@@ -25,6 +25,7 @@
#include <linux/init.h>
#include <linux/coredump.h>
#include <asm/system.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-2.6.37/fs/binfmt_elf.c linux-2.6.37-vs2.3.0.37-rc1/fs/binfmt_elf.c
+diff -NurpP --minimal linux-2.6.37/fs/binfmt_elf.c linux-2.6.37-vs2.3.0.37-rc2/fs/binfmt_elf.c
--- linux-2.6.37/fs/binfmt_elf.c 2011-01-05 21:50:20.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/binfmt_elf.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/binfmt_elf.c 2010-11-23 02:09:41.000000000 +0100
@@ -32,6 +32,7 @@
#include <linux/elf.h>
#include <linux/utsname.h>
#include <asm/uaccess.h>
#include <asm/param.h>
#include <asm/page.h>
-diff -NurpP --minimal linux-2.6.37/fs/binfmt_flat.c linux-2.6.37-vs2.3.0.37-rc1/fs/binfmt_flat.c
+diff -NurpP --minimal linux-2.6.37/fs/binfmt_flat.c linux-2.6.37-vs2.3.0.37-rc2/fs/binfmt_flat.c
--- linux-2.6.37/fs/binfmt_flat.c 2010-08-02 16:52:47.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/binfmt_flat.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/binfmt_flat.c 2010-11-23 02:09:41.000000000 +0100
@@ -35,6 +35,7 @@
#include <linux/init.h>
#include <linux/flat.h>
#include <asm/byteorder.h>
#include <asm/system.h>
-diff -NurpP --minimal linux-2.6.37/fs/binfmt_som.c linux-2.6.37-vs2.3.0.37-rc1/fs/binfmt_som.c
+diff -NurpP --minimal linux-2.6.37/fs/binfmt_som.c linux-2.6.37-vs2.3.0.37-rc2/fs/binfmt_som.c
--- linux-2.6.37/fs/binfmt_som.c 2010-02-25 11:52:04.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/binfmt_som.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/binfmt_som.c 2010-11-23 02:09:41.000000000 +0100
@@ -28,6 +28,7 @@
#include <linux/shm.h>
#include <linux/personality.h>
#include <asm/uaccess.h>
#include <asm/pgtable.h>
-diff -NurpP --minimal linux-2.6.37/fs/block_dev.c linux-2.6.37-vs2.3.0.37-rc1/fs/block_dev.c
+diff -NurpP --minimal linux-2.6.37/fs/block_dev.c linux-2.6.37-vs2.3.0.37-rc2/fs/block_dev.c
--- linux-2.6.37/fs/block_dev.c 2011-01-05 21:50:20.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/block_dev.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/block_dev.c 2010-11-23 02:09:41.000000000 +0100
@@ -25,6 +25,7 @@
#include <linux/namei.h>
#include <linux/log2.h>
if (bdev) {
spin_lock(&bdev_lock);
if (!inode->i_bdev) {
-diff -NurpP --minimal linux-2.6.37/fs/btrfs/ctree.h linux-2.6.37-vs2.3.0.37-rc1/fs/btrfs/ctree.h
+diff -NurpP --minimal linux-2.6.37/fs/btrfs/ctree.h linux-2.6.37-vs2.3.0.37-rc2/fs/btrfs/ctree.h
--- linux-2.6.37/fs/btrfs/ctree.h 2011-01-05 21:50:20.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/btrfs/ctree.h 2011-01-05 22:30:38.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/btrfs/ctree.h 2011-01-05 22:30:38.000000000 +0100
@@ -574,11 +574,14 @@ struct btrfs_inode_item {
/* modification sequence number for NFS */
__le64 sequence;
/* file.c */
int btrfs_sync_file(struct file *file, int datasync);
-diff -NurpP --minimal linux-2.6.37/fs/btrfs/disk-io.c linux-2.6.37-vs2.3.0.37-rc1/fs/btrfs/disk-io.c
+diff -NurpP --minimal linux-2.6.37/fs/btrfs/disk-io.c linux-2.6.37-vs2.3.0.37-rc2/fs/btrfs/disk-io.c
--- linux-2.6.37/fs/btrfs/disk-io.c 2011-01-05 21:50:20.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/btrfs/disk-io.c 2011-01-05 22:30:38.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/btrfs/disk-io.c 2011-01-05 22:30:38.000000000 +0100
@@ -1733,6 +1733,9 @@ struct btrfs_root *open_ctree(struct sup
goto fail_iput;
}
features = btrfs_super_incompat_flags(disk_super) &
~BTRFS_FEATURE_INCOMPAT_SUPP;
if (features) {
-diff -NurpP --minimal linux-2.6.37/fs/btrfs/inode.c linux-2.6.37-vs2.3.0.37-rc1/fs/btrfs/inode.c
+diff -NurpP --minimal linux-2.6.37/fs/btrfs/inode.c linux-2.6.37-vs2.3.0.37-rc2/fs/btrfs/inode.c
--- linux-2.6.37/fs/btrfs/inode.c 2011-01-05 21:50:21.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/btrfs/inode.c 2011-01-05 22:30:38.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/btrfs/inode.c 2011-01-05 22:30:38.000000000 +0100
@@ -37,6 +37,8 @@
#include <linux/posix_acl.h>
#include <linux/falloc.h>
};
static const struct inode_operations btrfs_special_inode_operations = {
.getattr = btrfs_getattr,
-diff -NurpP --minimal linux-2.6.37/fs/btrfs/ioctl.c linux-2.6.37-vs2.3.0.37-rc1/fs/btrfs/ioctl.c
+diff -NurpP --minimal linux-2.6.37/fs/btrfs/ioctl.c linux-2.6.37-vs2.3.0.37-rc2/fs/btrfs/ioctl.c
--- linux-2.6.37/fs/btrfs/ioctl.c 2011-01-05 21:50:21.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/btrfs/ioctl.c 2011-01-05 22:30:39.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/btrfs/ioctl.c 2011-01-05 22:30:39.000000000 +0100
@@ -68,10 +68,13 @@ static unsigned int btrfs_flags_to_ioctl
{
unsigned int iflags = 0;
if (flags & FS_APPEND_FL)
ip->flags |= BTRFS_INODE_APPEND;
else
-diff -NurpP --minimal linux-2.6.37/fs/btrfs/super.c linux-2.6.37-vs2.3.0.37-rc1/fs/btrfs/super.c
+diff -NurpP --minimal linux-2.6.37/fs/btrfs/super.c linux-2.6.37-vs2.3.0.37-rc2/fs/btrfs/super.c
--- linux-2.6.37/fs/btrfs/super.c 2011-01-05 21:50:21.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/btrfs/super.c 2011-01-05 23:28:17.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/btrfs/super.c 2011-01-05 23:28:17.000000000 +0100
@@ -70,8 +70,9 @@ enum {
Opt_nodatacow, Opt_max_inline, Opt_alloc_start, Opt_nobarrier, Opt_ssd,
Opt_nossd, Opt_ssd_spread, Opt_thread_pool, Opt_noacl, Opt_compress,
if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY))
return 0;
-diff -NurpP --minimal linux-2.6.37/fs/char_dev.c linux-2.6.37-vs2.3.0.37-rc1/fs/char_dev.c
+diff -NurpP --minimal linux-2.6.37/fs/char_dev.c linux-2.6.37-vs2.3.0.37-rc2/fs/char_dev.c
--- linux-2.6.37/fs/char_dev.c 2011-01-05 21:50:22.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/char_dev.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/char_dev.c 2010-11-23 02:09:41.000000000 +0100
@@ -21,6 +21,8 @@
#include <linux/mutex.h>
#include <linux/backing-dev.h>
if (!kobj)
return -ENXIO;
new = container_of(kobj, struct cdev, kobj);
-diff -NurpP --minimal linux-2.6.37/fs/dcache.c linux-2.6.37-vs2.3.0.37-rc1/fs/dcache.c
+diff -NurpP --minimal linux-2.6.37/fs/dcache.c linux-2.6.37-vs2.3.0.37-rc2/fs/dcache.c
--- linux-2.6.37/fs/dcache.c 2011-01-05 21:50:22.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/dcache.c 2010-11-23 03:34:02.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/dcache.c 2010-11-23 03:34:02.000000000 +0100
@@ -33,6 +33,7 @@
#include <linux/bootmem.h>
#include <linux/fs_struct.h>
found = dentry;
spin_unlock(&dentry->d_lock);
break;
-diff -NurpP --minimal linux-2.6.37/fs/devpts/inode.c linux-2.6.37-vs2.3.0.37-rc1/fs/devpts/inode.c
+diff -NurpP --minimal linux-2.6.37/fs/devpts/inode.c linux-2.6.37-vs2.3.0.37-rc2/fs/devpts/inode.c
--- linux-2.6.37/fs/devpts/inode.c 2011-01-05 21:50:22.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/devpts/inode.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/devpts/inode.c 2010-11-23 02:09:41.000000000 +0100
@@ -25,6 +25,7 @@
#include <linux/parser.h>
#include <linux/fsnotify.h>
inode->i_private = tty;
tty->driver_data = inode;
-diff -NurpP --minimal linux-2.6.37/fs/ext2/balloc.c linux-2.6.37-vs2.3.0.37-rc1/fs/ext2/balloc.c
+diff -NurpP --minimal linux-2.6.37/fs/ext2/balloc.c linux-2.6.37-vs2.3.0.37-rc2/fs/ext2/balloc.c
--- linux-2.6.37/fs/ext2/balloc.c 2011-01-05 21:50:22.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/ext2/balloc.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/ext2/balloc.c 2010-11-23 02:09:41.000000000 +0100
@@ -701,7 +701,6 @@ ext2_try_to_allocate(struct super_block
start = 0;
end = EXT2_BLOCKS_PER_GROUP(sb);
BUG_ON(start > EXT2_BLOCKS_PER_GROUP(sb));
repeat:
-diff -NurpP --minimal linux-2.6.37/fs/ext2/ext2.h linux-2.6.37-vs2.3.0.37-rc1/fs/ext2/ext2.h
+diff -NurpP --minimal linux-2.6.37/fs/ext2/ext2.h linux-2.6.37-vs2.3.0.37-rc2/fs/ext2/ext2.h
--- linux-2.6.37/fs/ext2/ext2.h 2011-01-05 21:50:22.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/ext2/ext2.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/ext2/ext2.h 2010-11-23 02:09:41.000000000 +0100
@@ -126,6 +126,7 @@ extern void ext2_set_inode_flags(struct
extern void ext2_get_inode_flags(struct ext2_inode_info *);
extern int ext2_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
/* ioctl.c */
extern long ext2_ioctl(struct file *, unsigned int, unsigned long);
-diff -NurpP --minimal linux-2.6.37/fs/ext2/file.c linux-2.6.37-vs2.3.0.37-rc1/fs/ext2/file.c
+diff -NurpP --minimal linux-2.6.37/fs/ext2/file.c linux-2.6.37-vs2.3.0.37-rc2/fs/ext2/file.c
--- linux-2.6.37/fs/ext2/file.c 2010-08-02 16:52:48.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/ext2/file.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/ext2/file.c 2010-11-23 02:09:41.000000000 +0100
@@ -104,4 +104,5 @@ const struct inode_operations ext2_file_
.setattr = ext2_setattr,
.check_acl = ext2_check_acl,
.fiemap = ext2_fiemap,
+ .sync_flags = ext2_sync_flags,
};
-diff -NurpP --minimal linux-2.6.37/fs/ext2/ialloc.c linux-2.6.37-vs2.3.0.37-rc1/fs/ext2/ialloc.c
+diff -NurpP --minimal linux-2.6.37/fs/ext2/ialloc.c linux-2.6.37-vs2.3.0.37-rc2/fs/ext2/ialloc.c
--- linux-2.6.37/fs/ext2/ialloc.c 2010-10-21 13:07:48.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/ext2/ialloc.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/ext2/ialloc.c 2010-11-23 02:09:41.000000000 +0100
@@ -17,6 +17,7 @@
#include <linux/backing-dev.h>
#include <linux/buffer_head.h>
} else
inode_init_owner(inode, dir, mode);
-diff -NurpP --minimal linux-2.6.37/fs/ext2/inode.c linux-2.6.37-vs2.3.0.37-rc1/fs/ext2/inode.c
+diff -NurpP --minimal linux-2.6.37/fs/ext2/inode.c linux-2.6.37-vs2.3.0.37-rc2/fs/ext2/inode.c
--- linux-2.6.37/fs/ext2/inode.c 2011-01-05 21:50:22.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/ext2/inode.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/ext2/inode.c 2010-11-23 02:09:41.000000000 +0100
@@ -32,6 +32,7 @@
#include <linux/mpage.h>
#include <linux/fiemap.h>
error = dquot_transfer(inode, iattr);
if (error)
return error;
-diff -NurpP --minimal linux-2.6.37/fs/ext2/ioctl.c linux-2.6.37-vs2.3.0.37-rc1/fs/ext2/ioctl.c
+diff -NurpP --minimal linux-2.6.37/fs/ext2/ioctl.c linux-2.6.37-vs2.3.0.37-rc2/fs/ext2/ioctl.c
--- linux-2.6.37/fs/ext2/ioctl.c 2009-09-10 15:26:21.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/ext2/ioctl.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/ext2/ioctl.c 2010-11-23 02:09:41.000000000 +0100
@@ -17,6 +17,16 @@
#include <asm/uaccess.h>
flags |= oldflags & ~EXT2_FL_USER_MODIFIABLE;
ei->i_flags = flags;
mutex_unlock(&inode->i_mutex);
-diff -NurpP --minimal linux-2.6.37/fs/ext2/namei.c linux-2.6.37-vs2.3.0.37-rc1/fs/ext2/namei.c
+diff -NurpP --minimal linux-2.6.37/fs/ext2/namei.c linux-2.6.37-vs2.3.0.37-rc2/fs/ext2/namei.c
--- linux-2.6.37/fs/ext2/namei.c 2011-01-05 21:50:22.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/ext2/namei.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/ext2/namei.c 2010-11-23 02:09:41.000000000 +0100
@@ -32,6 +32,7 @@
#include <linux/pagemap.h>
};
const struct inode_operations ext2_special_inode_operations = {
-diff -NurpP --minimal linux-2.6.37/fs/ext2/super.c linux-2.6.37-vs2.3.0.37-rc1/fs/ext2/super.c
+diff -NurpP --minimal linux-2.6.37/fs/ext2/super.c linux-2.6.37-vs2.3.0.37-rc2/fs/ext2/super.c
--- linux-2.6.37/fs/ext2/super.c 2011-01-05 21:50:22.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/ext2/super.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/ext2/super.c 2010-11-23 02:09:41.000000000 +0100
@@ -378,7 +378,8 @@ enum {
Opt_err_ro, Opt_nouid32, Opt_nocheck, Opt_debug,
Opt_oldalloc, Opt_orlov, Opt_nobh, Opt_user_xattr, Opt_nouser_xattr,
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
((sbi->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
-diff -NurpP --minimal linux-2.6.37/fs/ext3/file.c linux-2.6.37-vs2.3.0.37-rc1/fs/ext3/file.c
+diff -NurpP --minimal linux-2.6.37/fs/ext3/file.c linux-2.6.37-vs2.3.0.37-rc2/fs/ext3/file.c
--- linux-2.6.37/fs/ext3/file.c 2010-07-07 18:31:51.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/ext3/file.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/ext3/file.c 2010-11-23 02:09:41.000000000 +0100
@@ -81,5 +81,6 @@ const struct inode_operations ext3_file_
#endif
.check_acl = ext3_check_acl,
+ .sync_flags = ext3_sync_flags,
};
-diff -NurpP --minimal linux-2.6.37/fs/ext3/ialloc.c linux-2.6.37-vs2.3.0.37-rc1/fs/ext3/ialloc.c
+diff -NurpP --minimal linux-2.6.37/fs/ext3/ialloc.c linux-2.6.37-vs2.3.0.37-rc2/fs/ext3/ialloc.c
--- linux-2.6.37/fs/ext3/ialloc.c 2011-01-05 21:50:22.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/ext3/ialloc.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/ext3/ialloc.c 2010-11-23 02:09:41.000000000 +0100
@@ -23,6 +23,7 @@
#include <linux/buffer_head.h>
#include <linux/random.h>
} else
inode_init_owner(inode, dir, mode);
-diff -NurpP --minimal linux-2.6.37/fs/ext3/inode.c linux-2.6.37-vs2.3.0.37-rc1/fs/ext3/inode.c
+diff -NurpP --minimal linux-2.6.37/fs/ext3/inode.c linux-2.6.37-vs2.3.0.37-rc2/fs/ext3/inode.c
--- linux-2.6.37/fs/ext3/inode.c 2011-01-05 21:50:22.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/ext3/inode.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/ext3/inode.c 2010-11-23 02:09:41.000000000 +0100
@@ -38,6 +38,7 @@
#include <linux/bio.h>
#include <linux/fiemap.h>
error = ext3_mark_inode_dirty(handle, inode);
ext3_journal_stop(handle);
}
-diff -NurpP --minimal linux-2.6.37/fs/ext3/ioctl.c linux-2.6.37-vs2.3.0.37-rc1/fs/ext3/ioctl.c
+diff -NurpP --minimal linux-2.6.37/fs/ext3/ioctl.c linux-2.6.37-vs2.3.0.37-rc2/fs/ext3/ioctl.c
--- linux-2.6.37/fs/ext3/ioctl.c 2009-06-11 17:13:03.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/ext3/ioctl.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/ext3/ioctl.c 2010-11-23 02:09:41.000000000 +0100
@@ -8,6 +8,7 @@
*/
flags |= oldflags & ~EXT3_FL_USER_MODIFIABLE;
ei->i_flags = flags;
-diff -NurpP --minimal linux-2.6.37/fs/ext3/namei.c linux-2.6.37-vs2.3.0.37-rc1/fs/ext3/namei.c
+diff -NurpP --minimal linux-2.6.37/fs/ext3/namei.c linux-2.6.37-vs2.3.0.37-rc2/fs/ext3/namei.c
--- linux-2.6.37/fs/ext3/namei.c 2011-01-05 21:50:22.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/ext3/namei.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/ext3/namei.c 2010-11-23 02:09:41.000000000 +0100
@@ -36,6 +36,7 @@
#include <linux/quotaops.h>
#include <linux/buffer_head.h>
};
const struct inode_operations ext3_special_inode_operations = {
-diff -NurpP --minimal linux-2.6.37/fs/ext3/super.c linux-2.6.37-vs2.3.0.37-rc1/fs/ext3/super.c
+diff -NurpP --minimal linux-2.6.37/fs/ext3/super.c linux-2.6.37-vs2.3.0.37-rc2/fs/ext3/super.c
--- linux-2.6.37/fs/ext3/super.c 2011-01-05 21:50:23.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/ext3/super.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/ext3/super.c 2010-11-23 02:09:41.000000000 +0100
@@ -796,7 +796,8 @@ enum {
Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota,
Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_jqfmt_vfsv1, Opt_quota,
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
-diff -NurpP --minimal linux-2.6.37/fs/ext4/ext4.h linux-2.6.37-vs2.3.0.37-rc1/fs/ext4/ext4.h
+diff -NurpP --minimal linux-2.6.37/fs/ext4/ext4.h linux-2.6.37-vs2.3.0.37-rc2/fs/ext4/ext4.h
--- linux-2.6.37/fs/ext4/ext4.h 2011-01-05 21:50:23.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/ext4/ext4.h 2011-01-05 22:32:19.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/ext4/ext4.h 2011-01-05 22:32:19.000000000 +0100
@@ -347,8 +347,12 @@ struct flex_groups {
#define EXT4_EXTENTS_FL 0x00080000 /* Inode uses extents */
#define EXT4_EA_INODE_FL 0x00200000 /* Inode used for large EA */
/* move_extent.c */
extern int ext4_move_extents(struct file *o_filp, struct file *d_filp,
__u64 start_orig, __u64 start_donor,
-diff -NurpP --minimal linux-2.6.37/fs/ext4/file.c linux-2.6.37-vs2.3.0.37-rc1/fs/ext4/file.c
+diff -NurpP --minimal linux-2.6.37/fs/ext4/file.c linux-2.6.37-vs2.3.0.37-rc2/fs/ext4/file.c
--- linux-2.6.37/fs/ext4/file.c 2011-01-05 21:50:23.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/ext4/file.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/ext4/file.c 2010-11-23 02:09:41.000000000 +0100
@@ -203,5 +203,6 @@ const struct inode_operations ext4_file_
.check_acl = ext4_check_acl,
.fallocate = ext4_fallocate,
+ .sync_flags = ext4_sync_flags,
};
-diff -NurpP --minimal linux-2.6.37/fs/ext4/ialloc.c linux-2.6.37-vs2.3.0.37-rc1/fs/ext4/ialloc.c
+diff -NurpP --minimal linux-2.6.37/fs/ext4/ialloc.c linux-2.6.37-vs2.3.0.37-rc2/fs/ext4/ialloc.c
--- linux-2.6.37/fs/ext4/ialloc.c 2011-01-05 21:50:23.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/ext4/ialloc.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/ext4/ialloc.c 2010-11-23 02:09:41.000000000 +0100
@@ -22,6 +22,7 @@
#include <linux/random.h>
#include <linux/bitops.h>
} else
inode_init_owner(inode, dir, mode);
-diff -NurpP --minimal linux-2.6.37/fs/ext4/inode.c linux-2.6.37-vs2.3.0.37-rc1/fs/ext4/inode.c
+diff -NurpP --minimal linux-2.6.37/fs/ext4/inode.c linux-2.6.37-vs2.3.0.37-rc2/fs/ext4/inode.c
--- linux-2.6.37/fs/ext4/inode.c 2011-01-05 21:50:23.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/ext4/inode.c 2011-01-05 22:30:39.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/ext4/inode.c 2011-01-05 22:30:39.000000000 +0100
@@ -40,6 +40,7 @@
#include <linux/workqueue.h>
#include <linux/kernel.h>
error = ext4_mark_inode_dirty(handle, inode);
ext4_journal_stop(handle);
}
-diff -NurpP --minimal linux-2.6.37/fs/ext4/ioctl.c linux-2.6.37-vs2.3.0.37-rc1/fs/ext4/ioctl.c
+diff -NurpP --minimal linux-2.6.37/fs/ext4/ioctl.c linux-2.6.37-vs2.3.0.37-rc2/fs/ext4/ioctl.c
--- linux-2.6.37/fs/ext4/ioctl.c 2011-01-05 21:50:23.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/ext4/ioctl.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/ext4/ioctl.c 2010-11-23 02:09:41.000000000 +0100
@@ -14,10 +14,39 @@
#include <linux/compat.h>
#include <linux/mount.h>
if (!capable(CAP_LINUX_IMMUTABLE))
goto flags_out;
}
-diff -NurpP --minimal linux-2.6.37/fs/ext4/namei.c linux-2.6.37-vs2.3.0.37-rc1/fs/ext4/namei.c
+diff -NurpP --minimal linux-2.6.37/fs/ext4/namei.c linux-2.6.37-vs2.3.0.37-rc2/fs/ext4/namei.c
--- linux-2.6.37/fs/ext4/namei.c 2011-01-05 21:50:23.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/ext4/namei.c 2011-01-05 22:30:39.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/ext4/namei.c 2011-01-05 22:30:39.000000000 +0100
@@ -34,6 +34,7 @@
#include <linux/quotaops.h>
#include <linux/buffer_head.h>
};
const struct inode_operations ext4_special_inode_operations = {
-diff -NurpP --minimal linux-2.6.37/fs/ext4/super.c linux-2.6.37-vs2.3.0.37-rc1/fs/ext4/super.c
+diff -NurpP --minimal linux-2.6.37/fs/ext4/super.c linux-2.6.37-vs2.3.0.37-rc2/fs/ext4/super.c
--- linux-2.6.37/fs/ext4/super.c 2011-01-05 21:50:23.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/ext4/super.c 2011-01-05 22:30:39.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/ext4/super.c 2011-01-05 22:30:39.000000000 +0100
@@ -1247,6 +1247,7 @@ enum {
Opt_dioread_nolock, Opt_dioread_lock,
Opt_discard, Opt_nodiscard,
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
-diff -NurpP --minimal linux-2.6.37/fs/fcntl.c linux-2.6.37-vs2.3.0.37-rc1/fs/fcntl.c
+diff -NurpP --minimal linux-2.6.37/fs/fcntl.c linux-2.6.37-vs2.3.0.37-rc2/fs/fcntl.c
--- linux-2.6.37/fs/fcntl.c 2011-01-05 21:50:23.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/fcntl.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/fcntl.c 2010-11-23 02:09:41.000000000 +0100
@@ -20,6 +20,7 @@
#include <linux/signal.h>
#include <linux/rcupdate.h>
err = security_file_fcntl(filp, cmd, arg);
if (err) {
-diff -NurpP --minimal linux-2.6.37/fs/file.c linux-2.6.37-vs2.3.0.37-rc1/fs/file.c
+diff -NurpP --minimal linux-2.6.37/fs/file.c linux-2.6.37-vs2.3.0.37-rc2/fs/file.c
--- linux-2.6.37/fs/file.c 2010-10-21 13:07:48.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/file.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/file.c 2010-11-23 02:09:41.000000000 +0100
@@ -20,6 +20,7 @@
#include <linux/spinlock.h>
#include <linux/rcupdate.h>
#if 1
/* Sanity check */
if (rcu_dereference_raw(fdt->fd[fd]) != NULL) {
-diff -NurpP --minimal linux-2.6.37/fs/file_table.c linux-2.6.37-vs2.3.0.37-rc1/fs/file_table.c
+diff -NurpP --minimal linux-2.6.37/fs/file_table.c linux-2.6.37-vs2.3.0.37-rc2/fs/file_table.c
--- linux-2.6.37/fs/file_table.c 2011-01-05 21:50:23.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/file_table.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/file_table.c 2010-11-23 02:09:41.000000000 +0100
@@ -24,6 +24,8 @@
#include <linux/percpu_counter.h>
#include <linux/percpu.h>
file_sb_list_del(file);
file_free(file);
}
-diff -NurpP --minimal linux-2.6.37/fs/fs_struct.c linux-2.6.37-vs2.3.0.37-rc1/fs/fs_struct.c
+diff -NurpP --minimal linux-2.6.37/fs/fs_struct.c linux-2.6.37-vs2.3.0.37-rc2/fs/fs_struct.c
--- linux-2.6.37/fs/fs_struct.c 2010-10-21 13:07:48.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/fs_struct.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/fs_struct.c 2010-11-23 02:09:41.000000000 +0100
@@ -4,6 +4,7 @@
#include <linux/path.h>
#include <linux/slab.h>
}
return fs;
}
-diff -NurpP --minimal linux-2.6.37/fs/gfs2/file.c linux-2.6.37-vs2.3.0.37-rc1/fs/gfs2/file.c
+diff -NurpP --minimal linux-2.6.37/fs/gfs2/file.c linux-2.6.37-vs2.3.0.37-rc2/fs/gfs2/file.c
--- linux-2.6.37/fs/gfs2/file.c 2011-01-05 21:50:23.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/gfs2/file.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/gfs2/file.c 2010-11-23 02:09:41.000000000 +0100
@@ -132,6 +132,9 @@ static const u32 fsflags_to_gfs2[32] = {
[7] = GFS2_DIF_NOATIME,
[12] = GFS2_DIF_EXHASH,
static long gfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
switch(cmd) {
-diff -NurpP --minimal linux-2.6.37/fs/gfs2/inode.h linux-2.6.37-vs2.3.0.37-rc1/fs/gfs2/inode.h
+diff -NurpP --minimal linux-2.6.37/fs/gfs2/inode.h linux-2.6.37-vs2.3.0.37-rc2/fs/gfs2/inode.h
--- linux-2.6.37/fs/gfs2/inode.h 2011-01-05 21:50:23.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/gfs2/inode.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/gfs2/inode.h 2010-11-23 02:09:41.000000000 +0100
@@ -126,6 +126,7 @@ extern const struct file_operations gfs2
extern const struct file_operations gfs2_dir_fops_nolock;
#ifdef CONFIG_GFS2_FS_LOCKING_DLM
extern const struct file_operations gfs2_file_fops;
-diff -NurpP --minimal linux-2.6.37/fs/gfs2/ops_inode.c linux-2.6.37-vs2.3.0.37-rc1/fs/gfs2/ops_inode.c
+diff -NurpP --minimal linux-2.6.37/fs/gfs2/ops_inode.c linux-2.6.37-vs2.3.0.37-rc2/fs/gfs2/ops_inode.c
--- linux-2.6.37/fs/gfs2/ops_inode.c 2011-01-05 21:50:23.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/gfs2/ops_inode.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/gfs2/ops_inode.c 2010-11-23 02:09:41.000000000 +0100
@@ -1594,6 +1594,8 @@ const struct inode_operations gfs2_dir_i
.listxattr = gfs2_listxattr,
.removexattr = gfs2_removexattr,
};
const struct inode_operations gfs2_symlink_iops = {
-diff -NurpP --minimal linux-2.6.37/fs/inode.c linux-2.6.37-vs2.3.0.37-rc1/fs/inode.c
+diff -NurpP --minimal linux-2.6.37/fs/inode.c linux-2.6.37-vs2.3.0.37-rc2/fs/inode.c
--- linux-2.6.37/fs/inode.c 2011-01-05 21:50:24.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/inode.c 2010-11-23 03:34:25.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/inode.c 2010-11-23 03:34:25.000000000 +0100
@@ -25,6 +25,7 @@
#include <linux/async.h>
#include <linux/posix_acl.h>
+ inode->i_tag = dx_current_fstag(inode->i_sb);
}
EXPORT_SYMBOL(inode_init_owner);
-diff -NurpP --minimal linux-2.6.37/fs/ioctl.c linux-2.6.37-vs2.3.0.37-rc1/fs/ioctl.c
+diff -NurpP --minimal linux-2.6.37/fs/ioctl.c linux-2.6.37-vs2.3.0.37-rc2/fs/ioctl.c
--- linux-2.6.37/fs/ioctl.c 2011-01-05 21:50:24.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/ioctl.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/ioctl.c 2010-11-23 02:09:41.000000000 +0100
@@ -15,6 +15,9 @@
#include <linux/writeback.h>
#include <linux/buffer_head.h>
#include <asm/ioctls.h>
-diff -NurpP --minimal linux-2.6.37/fs/ioprio.c linux-2.6.37-vs2.3.0.37-rc1/fs/ioprio.c
+diff -NurpP --minimal linux-2.6.37/fs/ioprio.c linux-2.6.37-vs2.3.0.37-rc2/fs/ioprio.c
--- linux-2.6.37/fs/ioprio.c 2011-01-05 21:50:24.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/ioprio.c 2011-01-05 22:30:39.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/ioprio.c 2011-01-05 22:30:39.000000000 +0100
@@ -27,6 +27,7 @@
#include <linux/syscalls.h>
#include <linux/security.h>
tmpio = get_task_ioprio(p);
if (tmpio < 0)
continue;
-diff -NurpP --minimal linux-2.6.37/fs/jfs/file.c linux-2.6.37-vs2.3.0.37-rc1/fs/jfs/file.c
+diff -NurpP --minimal linux-2.6.37/fs/jfs/file.c linux-2.6.37-vs2.3.0.37-rc2/fs/jfs/file.c
--- linux-2.6.37/fs/jfs/file.c 2010-10-21 13:07:50.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/jfs/file.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/jfs/file.c 2010-11-23 02:09:41.000000000 +0100
@@ -102,7 +102,8 @@ int jfs_setattr(struct dentry *dentry, s
if (is_quota_modification(inode, iattr))
dquot_initialize(inode);
};
const struct file_operations jfs_file_operations = {
-diff -NurpP --minimal linux-2.6.37/fs/jfs/ioctl.c linux-2.6.37-vs2.3.0.37-rc1/fs/jfs/ioctl.c
+diff -NurpP --minimal linux-2.6.37/fs/jfs/ioctl.c linux-2.6.37-vs2.3.0.37-rc2/fs/jfs/ioctl.c
--- linux-2.6.37/fs/jfs/ioctl.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/jfs/ioctl.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/jfs/ioctl.c 2010-11-23 02:09:41.000000000 +0100
@@ -11,6 +11,7 @@
#include <linux/mount.h>
#include <linux/time.h>
flags |= oldflags & ~JFS_FL_USER_MODIFIABLE;
jfs_inode->mode2 = flags;
-diff -NurpP --minimal linux-2.6.37/fs/jfs/jfs_dinode.h linux-2.6.37-vs2.3.0.37-rc1/fs/jfs/jfs_dinode.h
+diff -NurpP --minimal linux-2.6.37/fs/jfs/jfs_dinode.h linux-2.6.37-vs2.3.0.37-rc2/fs/jfs/jfs_dinode.h
--- linux-2.6.37/fs/jfs/jfs_dinode.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/jfs/jfs_dinode.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/jfs/jfs_dinode.h 2010-11-23 02:09:41.000000000 +0100
@@ -161,9 +161,13 @@ struct dinode {
#define JFS_APPEND_FL 0x01000000 /* writes to file may only append */
#define JFS_FL_INHERIT 0x03C80000
/* These are identical to EXT[23]_IOC_GETFLAGS/SETFLAGS */
-diff -NurpP --minimal linux-2.6.37/fs/jfs/jfs_filsys.h linux-2.6.37-vs2.3.0.37-rc1/fs/jfs/jfs_filsys.h
+diff -NurpP --minimal linux-2.6.37/fs/jfs/jfs_filsys.h linux-2.6.37-vs2.3.0.37-rc2/fs/jfs/jfs_filsys.h
--- linux-2.6.37/fs/jfs/jfs_filsys.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/jfs/jfs_filsys.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/jfs/jfs_filsys.h 2010-11-23 02:09:41.000000000 +0100
@@ -263,6 +263,7 @@
#define JFS_NAME_MAX 255
#define JFS_PATH_MAX BPSIZE
/*
* file system state (superblock state)
-diff -NurpP --minimal linux-2.6.37/fs/jfs/jfs_imap.c linux-2.6.37-vs2.3.0.37-rc1/fs/jfs/jfs_imap.c
+diff -NurpP --minimal linux-2.6.37/fs/jfs/jfs_imap.c linux-2.6.37-vs2.3.0.37-rc2/fs/jfs/jfs_imap.c
--- linux-2.6.37/fs/jfs/jfs_imap.c 2011-01-05 21:50:24.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/jfs/jfs_imap.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/jfs/jfs_imap.c 2010-11-23 02:09:41.000000000 +0100
@@ -46,6 +46,7 @@
#include <linux/pagemap.h>
#include <linux/quotaops.h>
jfs_get_inode_flags(jfs_ip);
/*
* mode2 is only needed for storing the higher order bits.
-diff -NurpP --minimal linux-2.6.37/fs/jfs/jfs_inode.c linux-2.6.37-vs2.3.0.37-rc1/fs/jfs/jfs_inode.c
+diff -NurpP --minimal linux-2.6.37/fs/jfs/jfs_inode.c linux-2.6.37-vs2.3.0.37-rc2/fs/jfs/jfs_inode.c
--- linux-2.6.37/fs/jfs/jfs_inode.c 2010-08-02 16:52:49.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/jfs/jfs_inode.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/jfs/jfs_inode.c 2010-11-23 02:09:41.000000000 +0100
@@ -18,6 +18,7 @@
#include <linux/fs.h>
}
/*
-diff -NurpP --minimal linux-2.6.37/fs/jfs/jfs_inode.h linux-2.6.37-vs2.3.0.37-rc1/fs/jfs/jfs_inode.h
+diff -NurpP --minimal linux-2.6.37/fs/jfs/jfs_inode.h linux-2.6.37-vs2.3.0.37-rc2/fs/jfs/jfs_inode.h
--- linux-2.6.37/fs/jfs/jfs_inode.h 2010-10-21 13:07:50.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/jfs/jfs_inode.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/jfs/jfs_inode.h 2010-11-23 02:09:41.000000000 +0100
@@ -39,6 +39,7 @@ extern struct dentry *jfs_fh_to_dentry(s
extern struct dentry *jfs_fh_to_parent(struct super_block *sb, struct fid *fid,
int fh_len, int fh_type);
extern int jfs_get_block(struct inode *, sector_t, struct buffer_head *, int);
extern int jfs_setattr(struct dentry *, struct iattr *);
-diff -NurpP --minimal linux-2.6.37/fs/jfs/namei.c linux-2.6.37-vs2.3.0.37-rc1/fs/jfs/namei.c
+diff -NurpP --minimal linux-2.6.37/fs/jfs/namei.c linux-2.6.37-vs2.3.0.37-rc2/fs/jfs/namei.c
--- linux-2.6.37/fs/jfs/namei.c 2011-01-05 21:50:24.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/jfs/namei.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/jfs/namei.c 2010-11-23 02:09:41.000000000 +0100
@@ -21,6 +21,7 @@
#include <linux/ctype.h>
#include <linux/quotaops.h>
};
const struct file_operations jfs_dir_operations = {
-diff -NurpP --minimal linux-2.6.37/fs/jfs/super.c linux-2.6.37-vs2.3.0.37-rc1/fs/jfs/super.c
+diff -NurpP --minimal linux-2.6.37/fs/jfs/super.c linux-2.6.37-vs2.3.0.37-rc2/fs/jfs/super.c
--- linux-2.6.37/fs/jfs/super.c 2011-01-05 21:50:24.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/jfs/super.c 2010-11-23 03:40:34.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/jfs/super.c 2010-11-23 03:40:34.000000000 +0100
@@ -190,7 +190,8 @@ static void jfs_put_super(struct super_b
enum {
Opt_integrity, Opt_nointegrity, Opt_iocharset, Opt_resize,
if (newLVSize) {
printk(KERN_ERR "resize option for remount only\n");
-diff -NurpP --minimal linux-2.6.37/fs/libfs.c linux-2.6.37-vs2.3.0.37-rc1/fs/libfs.c
+diff -NurpP --minimal linux-2.6.37/fs/libfs.c linux-2.6.37-vs2.3.0.37-rc2/fs/libfs.c
--- linux-2.6.37/fs/libfs.c 2011-01-05 21:50:24.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/libfs.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/libfs.c 2010-11-23 02:09:41.000000000 +0100
@@ -124,7 +124,8 @@ static inline unsigned char dt_type(stru
* both impossible due to the lock on directory.
*/
EXPORT_SYMBOL(generic_read_dir);
EXPORT_SYMBOL(mount_pseudo);
EXPORT_SYMBOL(simple_write_begin);
-diff -NurpP --minimal linux-2.6.37/fs/locks.c linux-2.6.37-vs2.3.0.37-rc1/fs/locks.c
+diff -NurpP --minimal linux-2.6.37/fs/locks.c linux-2.6.37-vs2.3.0.37-rc2/fs/locks.c
--- linux-2.6.37/fs/locks.c 2011-01-05 21:50:24.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/locks.c 2010-11-23 03:38:48.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/locks.c 2010-11-23 03:38:48.000000000 +0100
@@ -126,6 +126,8 @@
#include <linux/time.h>
#include <linux/rcupdate.h>
return 0;
}
-diff -NurpP --minimal linux-2.6.37/fs/namei.c linux-2.6.37-vs2.3.0.37-rc1/fs/namei.c
+diff -NurpP --minimal linux-2.6.37/fs/namei.c linux-2.6.37-vs2.3.0.37-rc2/fs/namei.c
--- linux-2.6.37/fs/namei.c 2011-01-05 21:50:24.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/namei.c 2011-01-05 22:30:39.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/namei.c 2011-01-05 22:30:39.000000000 +0100
@@ -32,6 +32,14 @@
#include <linux/fcntl.h>
#include <linux/device_cgroup.h>
/* get the link contents into pagecache */
static char *page_getlink(struct dentry * dentry, struct page **ppage)
{
-diff -NurpP --minimal linux-2.6.37/fs/namespace.c linux-2.6.37-vs2.3.0.37-rc1/fs/namespace.c
+diff -NurpP --minimal linux-2.6.37/fs/namespace.c linux-2.6.37-vs2.3.0.37-rc2/fs/namespace.c
--- linux-2.6.37/fs/namespace.c 2011-01-05 21:50:24.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/namespace.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/namespace.c 2010-11-23 02:09:41.000000000 +0100
@@ -31,6 +31,11 @@
#include <linux/idr.h>
#include <linux/fs_struct.h>
kfree(ns);
}
EXPORT_SYMBOL(put_mnt_ns);
-diff -NurpP --minimal linux-2.6.37/fs/nfs/client.c linux-2.6.37-vs2.3.0.37-rc1/fs/nfs/client.c
+diff -NurpP --minimal linux-2.6.37/fs/nfs/client.c linux-2.6.37-vs2.3.0.37-rc2/fs/nfs/client.c
--- linux-2.6.37/fs/nfs/client.c 2011-01-05 21:50:24.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/nfs/client.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/nfs/client.c 2010-11-23 02:09:41.000000000 +0100
@@ -747,6 +747,9 @@ static int nfs_init_server_rpcclient(str
if (server->flags & NFS_MOUNT_SOFT)
server->client->cl_softrtry = 1;
server->maxfilesize = fsinfo->maxfilesize;
server->time_delta = fsinfo->time_delta;
-diff -NurpP --minimal linux-2.6.37/fs/nfs/dir.c linux-2.6.37-vs2.3.0.37-rc1/fs/nfs/dir.c
+diff -NurpP --minimal linux-2.6.37/fs/nfs/dir.c linux-2.6.37-vs2.3.0.37-rc2/fs/nfs/dir.c
--- linux-2.6.37/fs/nfs/dir.c 2011-01-05 21:50:25.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/nfs/dir.c 2011-01-05 22:30:39.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/nfs/dir.c 2011-01-05 22:30:39.000000000 +0100
@@ -35,6 +35,7 @@
#include <linux/sched.h>
#include <linux/vmalloc.h>
no_entry:
res = d_materialise_unique(dentry, inode);
if (res != NULL) {
-diff -NurpP --minimal linux-2.6.37/fs/nfs/inode.c linux-2.6.37-vs2.3.0.37-rc1/fs/nfs/inode.c
+diff -NurpP --minimal linux-2.6.37/fs/nfs/inode.c linux-2.6.37-vs2.3.0.37-rc2/fs/nfs/inode.c
--- linux-2.6.37/fs/nfs/inode.c 2011-01-05 21:50:25.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/nfs/inode.c 2011-01-05 22:30:39.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/nfs/inode.c 2011-01-05 22:30:39.000000000 +0100
@@ -37,6 +37,7 @@
#include <linux/inet.h>
#include <linux/nfs_xdr.h>
if (fattr->valid & NFS_ATTR_FATTR_NLINK) {
if (inode->i_nlink != fattr->nlink) {
invalid |= NFS_INO_INVALID_ATTR;
-diff -NurpP --minimal linux-2.6.37/fs/nfs/nfs3xdr.c linux-2.6.37-vs2.3.0.37-rc1/fs/nfs/nfs3xdr.c
+diff -NurpP --minimal linux-2.6.37/fs/nfs/nfs3xdr.c linux-2.6.37-vs2.3.0.37-rc2/fs/nfs/nfs3xdr.c
--- linux-2.6.37/fs/nfs/nfs3xdr.c 2011-01-05 21:50:25.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/nfs/nfs3xdr.c 2011-01-05 22:30:39.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/nfs/nfs3xdr.c 2011-01-05 22:30:39.000000000 +0100
@@ -20,6 +20,7 @@
#include <linux/nfs3.h>
#include <linux/nfs_fs.h>
if (args->type == NF3CHR || args->type == NF3BLK) {
*p++ = htonl(MAJOR(args->rdev));
*p++ = htonl(MINOR(args->rdev));
-diff -NurpP --minimal linux-2.6.37/fs/nfs/super.c linux-2.6.37-vs2.3.0.37-rc1/fs/nfs/super.c
+diff -NurpP --minimal linux-2.6.37/fs/nfs/super.c linux-2.6.37-vs2.3.0.37-rc2/fs/nfs/super.c
--- linux-2.6.37/fs/nfs/super.c 2011-01-05 21:50:25.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/nfs/super.c 2011-01-05 23:44:00.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/nfs/super.c 2011-01-05 23:44:00.000000000 +0100
@@ -53,6 +53,7 @@
#include <linux/nfs_xdr.h>
#include <linux/magic.h>
/*
* options that take text values
-diff -NurpP --minimal linux-2.6.37/fs/nfsd/auth.c linux-2.6.37-vs2.3.0.37-rc1/fs/nfsd/auth.c
+diff -NurpP --minimal linux-2.6.37/fs/nfsd/auth.c linux-2.6.37-vs2.3.0.37-rc2/fs/nfsd/auth.c
--- linux-2.6.37/fs/nfsd/auth.c 2010-02-25 11:52:05.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/nfsd/auth.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/nfsd/auth.c 2010-11-23 02:09:41.000000000 +0100
@@ -1,6 +1,7 @@
/* Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de> */
rqgi = rqstp->rq_cred.cr_group_info;
-diff -NurpP --minimal linux-2.6.37/fs/nfsd/nfs3xdr.c linux-2.6.37-vs2.3.0.37-rc1/fs/nfsd/nfs3xdr.c
+diff -NurpP --minimal linux-2.6.37/fs/nfsd/nfs3xdr.c linux-2.6.37-vs2.3.0.37-rc2/fs/nfsd/nfs3xdr.c
--- linux-2.6.37/fs/nfsd/nfs3xdr.c 2011-01-05 21:50:25.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/nfsd/nfs3xdr.c 2011-01-05 22:30:39.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/nfsd/nfs3xdr.c 2011-01-05 22:30:39.000000000 +0100
@@ -7,6 +7,7 @@
*/
if (S_ISLNK(stat->mode) && stat->size > NFS3_MAXPATHLEN) {
p = xdr_encode_hyper(p, (u64) NFS3_MAXPATHLEN);
} else {
-diff -NurpP --minimal linux-2.6.37/fs/nfsd/nfs4xdr.c linux-2.6.37-vs2.3.0.37-rc1/fs/nfsd/nfs4xdr.c
+diff -NurpP --minimal linux-2.6.37/fs/nfsd/nfs4xdr.c linux-2.6.37-vs2.3.0.37-rc2/fs/nfsd/nfs4xdr.c
--- linux-2.6.37/fs/nfsd/nfs4xdr.c 2011-01-05 21:50:25.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/nfsd/nfs4xdr.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/nfsd/nfs4xdr.c 2010-11-23 02:09:41.000000000 +0100
@@ -47,6 +47,7 @@
#include <linux/nfsd_idmap.h>
#include <linux/nfs4_acl.h>
if (status == nfserr_resource)
goto out_resource;
if (status)
-diff -NurpP --minimal linux-2.6.37/fs/nfsd/nfsxdr.c linux-2.6.37-vs2.3.0.37-rc1/fs/nfsd/nfsxdr.c
+diff -NurpP --minimal linux-2.6.37/fs/nfsd/nfsxdr.c linux-2.6.37-vs2.3.0.37-rc2/fs/nfsd/nfsxdr.c
--- linux-2.6.37/fs/nfsd/nfsxdr.c 2010-02-25 11:52:05.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/nfsd/nfsxdr.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/nfsd/nfsxdr.c 2010-11-23 02:09:41.000000000 +0100
@@ -6,6 +6,7 @@
#include "xdr.h"
if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) {
*p++ = htonl(NFS_MAXPATHLEN);
-diff -NurpP --minimal linux-2.6.37/fs/ocfs2/dlmglue.c linux-2.6.37-vs2.3.0.37-rc1/fs/ocfs2/dlmglue.c
+diff -NurpP --minimal linux-2.6.37/fs/ocfs2/dlmglue.c linux-2.6.37-vs2.3.0.37-rc2/fs/ocfs2/dlmglue.c
--- linux-2.6.37/fs/ocfs2/dlmglue.c 2011-01-05 21:50:26.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/ocfs2/dlmglue.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/ocfs2/dlmglue.c 2010-11-23 02:09:41.000000000 +0100
@@ -2114,6 +2114,7 @@ static void __ocfs2_stuff_meta_lvb(struc
lvb->lvb_iclusters = cpu_to_be32(oi->ip_clusters);
lvb->lvb_iuid = cpu_to_be32(inode->i_uid);
inode->i_mode = be16_to_cpu(lvb->lvb_imode);
inode->i_nlink = be16_to_cpu(lvb->lvb_inlink);
ocfs2_unpack_timespec(&inode->i_atime,
-diff -NurpP --minimal linux-2.6.37/fs/ocfs2/dlmglue.h linux-2.6.37-vs2.3.0.37-rc1/fs/ocfs2/dlmglue.h
+diff -NurpP --minimal linux-2.6.37/fs/ocfs2/dlmglue.h linux-2.6.37-vs2.3.0.37-rc2/fs/ocfs2/dlmglue.h
--- linux-2.6.37/fs/ocfs2/dlmglue.h 2010-10-21 13:07:50.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/ocfs2/dlmglue.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/ocfs2/dlmglue.h 2010-11-23 02:09:41.000000000 +0100
@@ -46,7 +46,8 @@ struct ocfs2_meta_lvb {
__be16 lvb_inlink;
__be32 lvb_iattr;
};
#define OCFS2_QINFO_LVB_VERSION 1
-diff -NurpP --minimal linux-2.6.37/fs/ocfs2/file.c linux-2.6.37-vs2.3.0.37-rc1/fs/ocfs2/file.c
+diff -NurpP --minimal linux-2.6.37/fs/ocfs2/file.c linux-2.6.37-vs2.3.0.37-rc2/fs/ocfs2/file.c
--- linux-2.6.37/fs/ocfs2/file.c 2011-01-05 21:50:26.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/ocfs2/file.c 2011-01-05 22:30:39.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/ocfs2/file.c 2011-01-05 22:30:39.000000000 +0100
@@ -1126,13 +1126,15 @@ int ocfs2_setattr(struct dentry *dentry,
mlog(0, "uid change: %d\n", attr->ia_uid);
if (attr->ia_valid & ATTR_GID)
if (!(attr->ia_valid & OCFS2_VALID_ATTRS)) {
mlog(0, "can't handle attrs: 0x%x\n", attr->ia_valid);
return 0;
-diff -NurpP --minimal linux-2.6.37/fs/ocfs2/inode.c linux-2.6.37-vs2.3.0.37-rc1/fs/ocfs2/inode.c
+diff -NurpP --minimal linux-2.6.37/fs/ocfs2/inode.c linux-2.6.37-vs2.3.0.37-rc2/fs/ocfs2/inode.c
--- linux-2.6.37/fs/ocfs2/inode.c 2011-01-05 21:50:26.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/ocfs2/inode.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/ocfs2/inode.c 2010-11-23 02:09:41.000000000 +0100
@@ -28,6 +28,7 @@
#include <linux/highmem.h>
#include <linux/pagemap.h>
/* Fast symlinks will have i_size but no allocated clusters. */
if (S_ISLNK(inode->i_mode) && !fe->i_clusters)
-diff -NurpP --minimal linux-2.6.37/fs/ocfs2/inode.h linux-2.6.37-vs2.3.0.37-rc1/fs/ocfs2/inode.h
+diff -NurpP --minimal linux-2.6.37/fs/ocfs2/inode.h linux-2.6.37-vs2.3.0.37-rc2/fs/ocfs2/inode.h
--- linux-2.6.37/fs/ocfs2/inode.h 2011-01-05 21:50:26.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/ocfs2/inode.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/ocfs2/inode.h 2010-11-23 02:09:41.000000000 +0100
@@ -151,6 +151,7 @@ struct buffer_head *ocfs2_bread(struct i
void ocfs2_set_inode_flags(struct inode *inode);
static inline blkcnt_t ocfs2_inode_sector_count(struct inode *inode)
{
-diff -NurpP --minimal linux-2.6.37/fs/ocfs2/ioctl.c linux-2.6.37-vs2.3.0.37-rc1/fs/ocfs2/ioctl.c
+diff -NurpP --minimal linux-2.6.37/fs/ocfs2/ioctl.c linux-2.6.37-vs2.3.0.37-rc2/fs/ocfs2/ioctl.c
--- linux-2.6.37/fs/ocfs2/ioctl.c 2011-01-05 21:50:26.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/ocfs2/ioctl.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/ocfs2/ioctl.c 2010-11-23 02:09:41.000000000 +0100
@@ -63,7 +63,41 @@ static int ocfs2_get_inode_attr(struct i
return status;
}
long ocfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
struct inode *inode = filp->f_path.dentry->d_inode;
-diff -NurpP --minimal linux-2.6.37/fs/ocfs2/namei.c linux-2.6.37-vs2.3.0.37-rc1/fs/ocfs2/namei.c
+diff -NurpP --minimal linux-2.6.37/fs/ocfs2/namei.c linux-2.6.37-vs2.3.0.37-rc2/fs/ocfs2/namei.c
--- linux-2.6.37/fs/ocfs2/namei.c 2011-01-05 21:50:26.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/ocfs2/namei.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/ocfs2/namei.c 2010-11-23 02:09:41.000000000 +0100
@@ -41,6 +41,7 @@
#include <linux/slab.h>
#include <linux/highmem.h>
fe->i_mode = cpu_to_le16(inode->i_mode);
if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode))
fe->id1.dev1.i_rdev = cpu_to_le64(huge_encode_dev(dev));
-diff -NurpP --minimal linux-2.6.37/fs/ocfs2/ocfs2_fs.h linux-2.6.37-vs2.3.0.37-rc1/fs/ocfs2/ocfs2_fs.h
+diff -NurpP --minimal linux-2.6.37/fs/ocfs2/ocfs2_fs.h linux-2.6.37-vs2.3.0.37-rc2/fs/ocfs2/ocfs2_fs.h
--- linux-2.6.37/fs/ocfs2/ocfs2_fs.h 2011-01-05 21:50:26.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/ocfs2/ocfs2_fs.h 2011-01-05 22:30:39.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/ocfs2/ocfs2_fs.h 2011-01-05 22:30:39.000000000 +0100
@@ -266,6 +266,11 @@
#define OCFS2_TOPDIR_FL FS_TOPDIR_FL /* Top of directory hierarchies*/
#define OCFS2_RESERVED_FL FS_RESERVED_FL /* reserved for ext2 lib */
#define OCFS2_FL_VISIBLE FS_FL_USER_VISIBLE /* User visible flags */
#define OCFS2_FL_MODIFIABLE FS_FL_USER_MODIFIABLE /* User modifiable flags */
-diff -NurpP --minimal linux-2.6.37/fs/ocfs2/ocfs2.h linux-2.6.37-vs2.3.0.37-rc1/fs/ocfs2/ocfs2.h
+diff -NurpP --minimal linux-2.6.37/fs/ocfs2/ocfs2.h linux-2.6.37-vs2.3.0.37-rc2/fs/ocfs2/ocfs2.h
--- linux-2.6.37/fs/ocfs2/ocfs2.h 2011-01-05 21:50:26.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/ocfs2/ocfs2.h 2011-01-05 22:30:39.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/ocfs2/ocfs2.h 2011-01-05 22:30:39.000000000 +0100
@@ -267,6 +267,7 @@ enum ocfs2_mount_options
writes */
OCFS2_MOUNT_HB_NONE = 1 << 13, /* No heartbeat */
};
#define OCFS2_OSB_SOFT_RO 0x0001
-diff -NurpP --minimal linux-2.6.37/fs/ocfs2/super.c linux-2.6.37-vs2.3.0.37-rc1/fs/ocfs2/super.c
+diff -NurpP --minimal linux-2.6.37/fs/ocfs2/super.c linux-2.6.37-vs2.3.0.37-rc2/fs/ocfs2/super.c
--- linux-2.6.37/fs/ocfs2/super.c 2011-01-05 21:50:26.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/ocfs2/super.c 2010-11-23 03:14:32.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/ocfs2/super.c 2010-11-23 03:14:32.000000000 +0100
@@ -181,6 +181,7 @@ enum {
Opt_coherency_full,
Opt_resv_level,
default:
mlog(ML_ERROR,
"Unrecognized mount option \"%s\" "
-diff -NurpP --minimal linux-2.6.37/fs/open.c linux-2.6.37-vs2.3.0.37-rc1/fs/open.c
+diff -NurpP --minimal linux-2.6.37/fs/open.c linux-2.6.37-vs2.3.0.37-rc2/fs/open.c
--- linux-2.6.37/fs/open.c 2011-01-05 21:50:26.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/open.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/open.c 2010-11-23 02:09:41.000000000 +0100
@@ -30,6 +30,11 @@
#include <linux/fs_struct.h>
#include <linux/ima.h>
}
void put_unused_fd(unsigned int fd)
-diff -NurpP --minimal linux-2.6.37/fs/proc/array.c linux-2.6.37-vs2.3.0.37-rc1/fs/proc/array.c
+diff -NurpP --minimal linux-2.6.37/fs/proc/array.c linux-2.6.37-vs2.3.0.37-rc2/fs/proc/array.c
--- linux-2.6.37/fs/proc/array.c 2010-08-02 16:52:51.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/proc/array.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/proc/array.c 2010-11-23 02:09:41.000000000 +0100
@@ -81,6 +81,8 @@
#include <linux/pid_namespace.h>
#include <linux/ptrace.h>
seq_printf(m, "%d (%s) %c %d %d %d %d %d %u %lu \
%lu %lu %lu %lu %lu %ld %ld %ld %ld %d 0 %llu %lu %ld %lu %lu %lu %lu %lu \
%lu %lu %lu %lu %lu %lu %lu %lu %d %d %u %u %llu %lu %ld\n",
-diff -NurpP --minimal linux-2.6.37/fs/proc/base.c linux-2.6.37-vs2.3.0.37-rc1/fs/proc/base.c
+diff -NurpP --minimal linux-2.6.37/fs/proc/base.c linux-2.6.37-vs2.3.0.37-rc2/fs/proc/base.c
--- linux-2.6.37/fs/proc/base.c 2011-01-05 21:50:26.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/proc/base.c 2011-01-05 22:30:39.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/proc/base.c 2011-01-05 22:30:39.000000000 +0100
@@ -83,6 +83,8 @@
#include <linux/pid_namespace.h>
#include <linux/fs_struct.h>
ns = dentry->d_sb->s_fs_info;
rcu_read_lock();
-diff -NurpP --minimal linux-2.6.37/fs/proc/generic.c linux-2.6.37-vs2.3.0.37-rc1/fs/proc/generic.c
+diff -NurpP --minimal linux-2.6.37/fs/proc/generic.c linux-2.6.37-vs2.3.0.37-rc2/fs/proc/generic.c
--- linux-2.6.37/fs/proc/generic.c 2010-10-21 13:07:51.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/proc/generic.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/proc/generic.c 2010-11-23 02:09:41.000000000 +0100
@@ -22,6 +22,7 @@
#include <linux/bitops.h>
#include <linux/spinlock.h>
} else {
kfree(ent);
ent = NULL;
-diff -NurpP --minimal linux-2.6.37/fs/proc/inode.c linux-2.6.37-vs2.3.0.37-rc1/fs/proc/inode.c
+diff -NurpP --minimal linux-2.6.37/fs/proc/inode.c linux-2.6.37-vs2.3.0.37-rc2/fs/proc/inode.c
--- linux-2.6.37/fs/proc/inode.c 2011-01-05 21:50:26.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/proc/inode.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/proc/inode.c 2010-11-23 02:09:41.000000000 +0100
@@ -427,6 +427,8 @@ struct inode *proc_get_inode(struct supe
inode->i_uid = de->uid;
inode->i_gid = de->gid;
if (de->size)
inode->i_size = de->size;
if (de->nlink)
-diff -NurpP --minimal linux-2.6.37/fs/proc/internal.h linux-2.6.37-vs2.3.0.37-rc1/fs/proc/internal.h
+diff -NurpP --minimal linux-2.6.37/fs/proc/internal.h linux-2.6.37-vs2.3.0.37-rc2/fs/proc/internal.h
--- linux-2.6.37/fs/proc/internal.h 2010-02-25 11:52:06.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/proc/internal.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/proc/internal.h 2010-11-23 02:09:41.000000000 +0100
@@ -10,6 +10,7 @@
*/
static inline int proc_fd(struct inode *inode)
{
return PROC_I(inode)->fd;
-diff -NurpP --minimal linux-2.6.37/fs/proc/loadavg.c linux-2.6.37-vs2.3.0.37-rc1/fs/proc/loadavg.c
+diff -NurpP --minimal linux-2.6.37/fs/proc/loadavg.c linux-2.6.37-vs2.3.0.37-rc2/fs/proc/loadavg.c
--- linux-2.6.37/fs/proc/loadavg.c 2009-09-10 15:26:23.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/proc/loadavg.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/proc/loadavg.c 2010-11-23 02:09:41.000000000 +0100
@@ -12,15 +12,27 @@
static int loadavg_proc_show(struct seq_file *m, void *v)
task_active_pid_ns(current)->last_pid);
return 0;
}
-diff -NurpP --minimal linux-2.6.37/fs/proc/meminfo.c linux-2.6.37-vs2.3.0.37-rc1/fs/proc/meminfo.c
+diff -NurpP --minimal linux-2.6.37/fs/proc/meminfo.c linux-2.6.37-vs2.3.0.37-rc2/fs/proc/meminfo.c
--- linux-2.6.37/fs/proc/meminfo.c 2009-12-03 20:02:53.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/proc/meminfo.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/proc/meminfo.c 2010-11-23 02:09:41.000000000 +0100
@@ -39,7 +39,8 @@ static int meminfo_proc_show(struct seq_
allowed = ((totalram_pages - hugetlb_total_pages())
* sysctl_overcommit_ratio / 100) + total_swap_pages;
total_swapcache_pages - i.bufferram;
if (cached < 0)
cached = 0;
-diff -NurpP --minimal linux-2.6.37/fs/proc/root.c linux-2.6.37-vs2.3.0.37-rc1/fs/proc/root.c
+diff -NurpP --minimal linux-2.6.37/fs/proc/root.c linux-2.6.37-vs2.3.0.37-rc2/fs/proc/root.c
--- linux-2.6.37/fs/proc/root.c 2011-01-05 21:50:26.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/proc/root.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/proc/root.c 2010-11-23 02:09:41.000000000 +0100
@@ -18,9 +18,14 @@
#include <linux/bitops.h>
#include <linux/mount.h>
};
int pid_ns_prepare_proc(struct pid_namespace *ns)
-diff -NurpP --minimal linux-2.6.37/fs/proc/uptime.c linux-2.6.37-vs2.3.0.37-rc1/fs/proc/uptime.c
+diff -NurpP --minimal linux-2.6.37/fs/proc/uptime.c linux-2.6.37-vs2.3.0.37-rc2/fs/proc/uptime.c
--- linux-2.6.37/fs/proc/uptime.c 2009-12-03 20:02:53.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/proc/uptime.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/proc/uptime.c 2010-11-23 02:09:41.000000000 +0100
@@ -4,22 +4,22 @@
#include <linux/sched.h>
#include <linux/seq_file.h>
seq_printf(m, "%lu.%02lu %lu.%02lu\n",
(unsigned long) uptime.tv_sec,
(uptime.tv_nsec / (NSEC_PER_SEC / 100)),
-diff -NurpP --minimal linux-2.6.37/fs/quota/dquot.c linux-2.6.37-vs2.3.0.37-rc1/fs/quota/dquot.c
+diff -NurpP --minimal linux-2.6.37/fs/quota/dquot.c linux-2.6.37-vs2.3.0.37-rc2/fs/quota/dquot.c
--- linux-2.6.37/fs/quota/dquot.c 2011-01-05 21:50:26.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/quota/dquot.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/quota/dquot.c 2010-11-23 02:09:41.000000000 +0100
@@ -1541,6 +1541,9 @@ int __dquot_alloc_space(struct inode *in
int reserve = flags & DQUOT_SPACE_RESERVE;
int nofail = flags & DQUOT_SPACE_NOFAIL;
/* First test before acquiring mutex - solves deadlocks when we
* re-enter the quota code and are already holding the mutex */
if (!dquot_active(inode))
-diff -NurpP --minimal linux-2.6.37/fs/quota/quota.c linux-2.6.37-vs2.3.0.37-rc1/fs/quota/quota.c
+diff -NurpP --minimal linux-2.6.37/fs/quota/quota.c linux-2.6.37-vs2.3.0.37-rc2/fs/quota/quota.c
--- linux-2.6.37/fs/quota/quota.c 2010-08-02 16:52:51.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/quota/quota.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/quota/quota.c 2010-11-23 02:09:41.000000000 +0100
@@ -8,6 +8,7 @@
#include <linux/fs.h>
#include <linux/namei.h>
sb = get_super(bdev);
bdput(bdev);
if (!sb)
-diff -NurpP --minimal linux-2.6.37/fs/reiserfs/file.c linux-2.6.37-vs2.3.0.37-rc1/fs/reiserfs/file.c
+diff -NurpP --minimal linux-2.6.37/fs/reiserfs/file.c linux-2.6.37-vs2.3.0.37-rc2/fs/reiserfs/file.c
--- linux-2.6.37/fs/reiserfs/file.c 2011-01-05 21:50:26.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/reiserfs/file.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/reiserfs/file.c 2010-11-23 02:09:41.000000000 +0100
@@ -312,4 +312,5 @@ const struct inode_operations reiserfs_f
.listxattr = reiserfs_listxattr,
.removexattr = reiserfs_removexattr,
.permission = reiserfs_permission,
+ .sync_flags = reiserfs_sync_flags,
};
-diff -NurpP --minimal linux-2.6.37/fs/reiserfs/inode.c linux-2.6.37-vs2.3.0.37-rc1/fs/reiserfs/inode.c
+diff -NurpP --minimal linux-2.6.37/fs/reiserfs/inode.c linux-2.6.37-vs2.3.0.37-rc2/fs/reiserfs/inode.c
--- linux-2.6.37/fs/reiserfs/inode.c 2011-01-05 21:50:26.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/reiserfs/inode.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/reiserfs/inode.c 2010-11-23 02:09:41.000000000 +0100
@@ -18,6 +18,7 @@
#include <linux/writeback.h>
#include <linux/quotaops.h>
mark_inode_dirty(inode);
error = journal_end(&th, inode->i_sb, jbegin_count);
if (error)
-diff -NurpP --minimal linux-2.6.37/fs/reiserfs/ioctl.c linux-2.6.37-vs2.3.0.37-rc1/fs/reiserfs/ioctl.c
+diff -NurpP --minimal linux-2.6.37/fs/reiserfs/ioctl.c linux-2.6.37-vs2.3.0.37-rc2/fs/reiserfs/ioctl.c
--- linux-2.6.37/fs/reiserfs/ioctl.c 2011-01-05 21:50:26.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/reiserfs/ioctl.c 2011-01-05 22:30:39.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/reiserfs/ioctl.c 2011-01-05 22:30:39.000000000 +0100
@@ -11,6 +11,21 @@
#include <linux/pagemap.h>
#include <linux/compat.h>
sd_attrs_to_i_attrs(flags, inode);
REISERFS_I(inode)->i_attrs = flags;
inode->i_ctime = CURRENT_TIME_SEC;
-diff -NurpP --minimal linux-2.6.37/fs/reiserfs/namei.c linux-2.6.37-vs2.3.0.37-rc1/fs/reiserfs/namei.c
+diff -NurpP --minimal linux-2.6.37/fs/reiserfs/namei.c linux-2.6.37-vs2.3.0.37-rc2/fs/reiserfs/namei.c
--- linux-2.6.37/fs/reiserfs/namei.c 2011-01-05 21:50:26.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/reiserfs/namei.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/reiserfs/namei.c 2010-11-23 02:09:41.000000000 +0100
@@ -18,6 +18,7 @@
#include <linux/reiserfs_acl.h>
#include <linux/reiserfs_xattr.h>
};
/*
-diff -NurpP --minimal linux-2.6.37/fs/reiserfs/super.c linux-2.6.37-vs2.3.0.37-rc1/fs/reiserfs/super.c
+diff -NurpP --minimal linux-2.6.37/fs/reiserfs/super.c linux-2.6.37-vs2.3.0.37-rc2/fs/reiserfs/super.c
--- linux-2.6.37/fs/reiserfs/super.c 2011-01-05 21:50:26.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/reiserfs/super.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/reiserfs/super.c 2010-11-23 02:09:41.000000000 +0100
@@ -892,6 +892,14 @@ static int reiserfs_parse_options(struct
{"user_xattr",.setmask = 1 << REISERFS_UNSUPPORTED_OPT},
{"nouser_xattr",.clrmask = 1 << REISERFS_UNSUPPORTED_OPT},
rs = SB_DISK_SUPER_BLOCK(s);
/* Let's do basic sanity check to verify that underlying device is not
smaller than the filesystem. If the check fails then abort and scream,
-diff -NurpP --minimal linux-2.6.37/fs/reiserfs/xattr.c linux-2.6.37-vs2.3.0.37-rc1/fs/reiserfs/xattr.c
+diff -NurpP --minimal linux-2.6.37/fs/reiserfs/xattr.c linux-2.6.37-vs2.3.0.37-rc2/fs/reiserfs/xattr.c
--- linux-2.6.37/fs/reiserfs/xattr.c 2011-01-05 21:50:26.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/reiserfs/xattr.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/reiserfs/xattr.c 2010-11-23 02:09:41.000000000 +0100
@@ -40,6 +40,7 @@
#include <linux/errno.h>
#include <linux/gfp.h>
#include <linux/file.h>
#include <linux/pagemap.h>
#include <linux/xattr.h>
-diff -NurpP --minimal linux-2.6.37/fs/stat.c linux-2.6.37-vs2.3.0.37-rc1/fs/stat.c
+diff -NurpP --minimal linux-2.6.37/fs/stat.c linux-2.6.37-vs2.3.0.37-rc2/fs/stat.c
--- linux-2.6.37/fs/stat.c 2010-10-21 13:07:51.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/stat.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/stat.c 2010-11-23 02:09:41.000000000 +0100
@@ -26,6 +26,7 @@ void generic_fillattr(struct inode *inod
stat->nlink = inode->i_nlink;
stat->uid = inode->i_uid;
stat->rdev = inode->i_rdev;
stat->atime = inode->i_atime;
stat->mtime = inode->i_mtime;
-diff -NurpP --minimal linux-2.6.37/fs/statfs.c linux-2.6.37-vs2.3.0.37-rc1/fs/statfs.c
+diff -NurpP --minimal linux-2.6.37/fs/statfs.c linux-2.6.37-vs2.3.0.37-rc2/fs/statfs.c
--- linux-2.6.37/fs/statfs.c 2010-10-21 13:07:51.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/statfs.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/statfs.c 2010-11-23 02:09:41.000000000 +0100
@@ -7,6 +7,8 @@
#include <linux/statfs.h>
#include <linux/security.h>
return retval;
}
-diff -NurpP --minimal linux-2.6.37/fs/super.c linux-2.6.37-vs2.3.0.37-rc1/fs/super.c
+diff -NurpP --minimal linux-2.6.37/fs/super.c linux-2.6.37-vs2.3.0.37-rc2/fs/super.c
--- linux-2.6.37/fs/super.c 2011-01-05 21:50:27.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/super.c 2010-11-23 03:09:36.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/super.c 2010-11-23 03:09:36.000000000 +0100
@@ -30,6 +30,9 @@
#include <linux/idr.h>
#include <linux/mutex.h>
if (error)
goto out_sb;
-diff -NurpP --minimal linux-2.6.37/fs/sysfs/mount.c linux-2.6.37-vs2.3.0.37-rc1/fs/sysfs/mount.c
+diff -NurpP --minimal linux-2.6.37/fs/sysfs/mount.c linux-2.6.37-vs2.3.0.37-rc2/fs/sysfs/mount.c
--- linux-2.6.37/fs/sysfs/mount.c 2011-01-05 21:50:27.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/sysfs/mount.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/sysfs/mount.c 2010-11-23 02:09:41.000000000 +0100
@@ -47,7 +47,7 @@ static int sysfs_fill_super(struct super
sb->s_blocksize = PAGE_CACHE_SIZE;
sb->s_op = &sysfs_ops;
sb->s_time_gran = 1;
-diff -NurpP --minimal linux-2.6.37/fs/utimes.c linux-2.6.37-vs2.3.0.37-rc1/fs/utimes.c
+diff -NurpP --minimal linux-2.6.37/fs/utimes.c linux-2.6.37-vs2.3.0.37-rc2/fs/utimes.c
--- linux-2.6.37/fs/utimes.c 2010-10-21 13:07:51.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/utimes.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/utimes.c 2010-11-23 02:09:41.000000000 +0100
@@ -8,6 +8,8 @@
#include <linux/stat.h>
#include <linux/utime.h>
if (times && times[0].tv_nsec == UTIME_NOW &&
times[1].tv_nsec == UTIME_NOW)
times = NULL;
-diff -NurpP --minimal linux-2.6.37/fs/xattr.c linux-2.6.37-vs2.3.0.37-rc1/fs/xattr.c
+diff -NurpP --minimal linux-2.6.37/fs/xattr.c linux-2.6.37-vs2.3.0.37-rc2/fs/xattr.c
--- linux-2.6.37/fs/xattr.c 2010-08-02 16:52:52.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/xattr.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/xattr.c 2010-11-23 02:09:41.000000000 +0100
@@ -18,6 +18,7 @@
#include <linux/module.h>
#include <linux/fsnotify.h>
/* In user.* namespace, only regular files and directories can have
* extended attributes. For sticky directories, only the owner and
-diff -NurpP --minimal linux-2.6.37/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.37-vs2.3.0.37-rc1/fs/xfs/linux-2.6/xfs_ioctl.c
+diff -NurpP --minimal linux-2.6.37/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.37-vs2.3.0.37-rc2/fs/xfs/linux-2.6/xfs_ioctl.c
--- linux-2.6.37/fs/xfs/linux-2.6/xfs_ioctl.c 2011-01-05 21:50:27.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/xfs/linux-2.6/xfs_ioctl.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/xfs/linux-2.6/xfs_ioctl.c 2010-11-23 02:09:41.000000000 +0100
@@ -28,7 +28,7 @@
#include "xfs_bmap_btree.h"
#include "xfs_dinode.h"
return xfs_ioc_setxflags(ip, filp, arg);
case XFS_IOC_FSSETDM: {
-diff -NurpP --minimal linux-2.6.37/fs/xfs/linux-2.6/xfs_ioctl.h linux-2.6.37-vs2.3.0.37-rc1/fs/xfs/linux-2.6/xfs_ioctl.h
+diff -NurpP --minimal linux-2.6.37/fs/xfs/linux-2.6/xfs_ioctl.h linux-2.6.37-vs2.3.0.37-rc2/fs/xfs/linux-2.6/xfs_ioctl.h
--- linux-2.6.37/fs/xfs/linux-2.6/xfs_ioctl.h 2010-07-07 18:31:54.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/xfs/linux-2.6/xfs_ioctl.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/xfs/linux-2.6/xfs_ioctl.h 2010-11-23 02:09:41.000000000 +0100
@@ -70,6 +70,12 @@ xfs_handle_to_dentry(
void __user *uhandle,
u32 hlen);
extern long
xfs_file_ioctl(
struct file *filp,
-diff -NurpP --minimal linux-2.6.37/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.37-vs2.3.0.37-rc1/fs/xfs/linux-2.6/xfs_iops.c
+diff -NurpP --minimal linux-2.6.37/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.37-vs2.3.0.37-rc2/fs/xfs/linux-2.6/xfs_iops.c
--- linux-2.6.37/fs/xfs/linux-2.6/xfs_iops.c 2011-01-05 21:50:27.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/xfs/linux-2.6/xfs_iops.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/xfs/linux-2.6/xfs_iops.c 2010-11-23 02:09:41.000000000 +0100
@@ -30,6 +30,7 @@
#include "xfs_bmap_btree.h"
#include "xfs_dinode.h"
switch (inode->i_mode & S_IFMT) {
case S_IFBLK:
-diff -NurpP --minimal linux-2.6.37/fs/xfs/linux-2.6/xfs_linux.h linux-2.6.37-vs2.3.0.37-rc1/fs/xfs/linux-2.6/xfs_linux.h
+diff -NurpP --minimal linux-2.6.37/fs/xfs/linux-2.6/xfs_linux.h linux-2.6.37-vs2.3.0.37-rc2/fs/xfs/linux-2.6/xfs_linux.h
--- linux-2.6.37/fs/xfs/linux-2.6/xfs_linux.h 2011-01-05 21:50:27.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/xfs/linux-2.6/xfs_linux.h 2010-11-23 03:28:16.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/xfs/linux-2.6/xfs_linux.h 2010-11-23 03:28:16.000000000 +0100
@@ -115,6 +115,7 @@
#define current_cpu() (raw_smp_processor_id())
#define current_test_flags(f) (current->flags & (f))
#define current_set_flags_nested(sp, f) \
(*(sp) = current->flags, current->flags |= (f))
-diff -NurpP --minimal linux-2.6.37/fs/xfs/linux-2.6/xfs_super.c linux-2.6.37-vs2.3.0.37-rc1/fs/xfs/linux-2.6/xfs_super.c
+diff -NurpP --minimal linux-2.6.37/fs/xfs/linux-2.6/xfs_super.c linux-2.6.37-vs2.3.0.37-rc2/fs/xfs/linux-2.6/xfs_super.c
--- linux-2.6.37/fs/xfs/linux-2.6/xfs_super.c 2011-01-05 21:50:27.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/xfs/linux-2.6/xfs_super.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/xfs/linux-2.6/xfs_super.c 2010-11-23 02:09:41.000000000 +0100
@@ -112,6 +112,9 @@ mempool_t *xfs_ioend_pool;
#define MNTOPT_QUOTANOENF "qnoenforce" /* same as uqnoenforce */
#define MNTOPT_DELAYLOG "delaylog" /* Delayed loging enabled */
sb->s_magic = XFS_SB_MAGIC;
sb->s_blocksize = mp->m_sb.sb_blocksize;
sb->s_blocksize_bits = ffs(sb->s_blocksize) - 1;
-diff -NurpP --minimal linux-2.6.37/fs/xfs/xfs_dinode.h linux-2.6.37-vs2.3.0.37-rc1/fs/xfs/xfs_dinode.h
+diff -NurpP --minimal linux-2.6.37/fs/xfs/xfs_dinode.h linux-2.6.37-vs2.3.0.37-rc2/fs/xfs/xfs_dinode.h
--- linux-2.6.37/fs/xfs/xfs_dinode.h 2011-01-05 21:50:28.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/xfs/xfs_dinode.h 2010-11-23 03:21:21.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/xfs/xfs_dinode.h 2010-11-23 03:21:21.000000000 +0100
@@ -51,7 +51,9 @@ typedef struct xfs_dinode {
__be32 di_nlink; /* number of links to file */
__be16 di_projid_lo; /* lower part of owner's project id */
+#define XFS_DIVFLAG_COW 0x02
#endif /* __XFS_DINODE_H__ */
-diff -NurpP --minimal linux-2.6.37/fs/xfs/xfs_fs.h linux-2.6.37-vs2.3.0.37-rc1/fs/xfs/xfs_fs.h
+diff -NurpP --minimal linux-2.6.37/fs/xfs/xfs_fs.h linux-2.6.37-vs2.3.0.37-rc2/fs/xfs/xfs_fs.h
--- linux-2.6.37/fs/xfs/xfs_fs.h 2011-01-05 21:50:28.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/xfs/xfs_fs.h 2010-11-23 03:16:13.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/xfs/xfs_fs.h 2010-11-23 03:16:13.000000000 +0100
@@ -67,6 +67,9 @@ struct fsxattr {
#define XFS_XFLAG_EXTSZINHERIT 0x00001000 /* inherit inode extent size */
#define XFS_XFLAG_NODEFRAG 0x00002000 /* do not defragment */
__u32 bs_dmevmask; /* DMIG event mask */
__u16 bs_dmstate; /* DMIG state info */
__u16 bs_aextents; /* attribute number of extents */
-diff -NurpP --minimal linux-2.6.37/fs/xfs/xfs_ialloc.c linux-2.6.37-vs2.3.0.37-rc1/fs/xfs/xfs_ialloc.c
+diff -NurpP --minimal linux-2.6.37/fs/xfs/xfs_ialloc.c linux-2.6.37-vs2.3.0.37-rc2/fs/xfs/xfs_ialloc.c
--- linux-2.6.37/fs/xfs/xfs_ialloc.c 2011-01-05 21:50:28.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/xfs/xfs_ialloc.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/xfs/xfs_ialloc.c 2010-11-23 02:09:41.000000000 +0100
@@ -37,7 +37,6 @@
#include "xfs_error.h"
#include "xfs_bmap.h"
/*
* Allocation group level functions.
*/
-diff -NurpP --minimal linux-2.6.37/fs/xfs/xfs_inode.c linux-2.6.37-vs2.3.0.37-rc1/fs/xfs/xfs_inode.c
+diff -NurpP --minimal linux-2.6.37/fs/xfs/xfs_inode.c linux-2.6.37-vs2.3.0.37-rc2/fs/xfs/xfs_inode.c
--- linux-2.6.37/fs/xfs/xfs_inode.c 2011-01-05 21:50:28.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/xfs/xfs_inode.c 2010-11-23 03:28:30.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/xfs/xfs_inode.c 2010-11-23 03:28:30.000000000 +0100
@@ -245,6 +245,7 @@ xfs_inotobp(
return 0;
}
/* Wrap, we never let the log put out DI_MAX_FLUSH */
if (ip->i_d.di_flushiter == DI_MAX_FLUSH)
-diff -NurpP --minimal linux-2.6.37/fs/xfs/xfs_inode.h linux-2.6.37-vs2.3.0.37-rc1/fs/xfs/xfs_inode.h
+diff -NurpP --minimal linux-2.6.37/fs/xfs/xfs_inode.h linux-2.6.37-vs2.3.0.37-rc2/fs/xfs/xfs_inode.h
--- linux-2.6.37/fs/xfs/xfs_inode.h 2011-01-05 21:50:28.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/xfs/xfs_inode.h 2010-11-23 03:29:08.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/xfs/xfs_inode.h 2010-11-23 03:29:08.000000000 +0100
@@ -136,7 +136,9 @@ typedef struct xfs_icdinode {
__uint32_t di_nlink; /* number of links to file */
__uint16_t di_projid_lo; /* lower part of owner's project id */
void xfs_idestroy_fork(struct xfs_inode *, int);
void xfs_idata_realloc(struct xfs_inode *, int, int);
void xfs_iroot_realloc(struct xfs_inode *, int, int);
-diff -NurpP --minimal linux-2.6.37/fs/xfs/xfs_itable.c linux-2.6.37-vs2.3.0.37-rc1/fs/xfs/xfs_itable.c
+diff -NurpP --minimal linux-2.6.37/fs/xfs/xfs_itable.c linux-2.6.37-vs2.3.0.37-rc2/fs/xfs/xfs_itable.c
--- linux-2.6.37/fs/xfs/xfs_itable.c 2011-01-05 21:50:28.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/xfs/xfs_itable.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/xfs/xfs_itable.c 2010-11-23 02:09:41.000000000 +0100
@@ -98,6 +98,7 @@ xfs_bulkstat_one_int(
buf->bs_mode = dic->di_mode;
buf->bs_uid = dic->di_uid;
buf->bs_size = dic->di_size;
/*
-diff -NurpP --minimal linux-2.6.37/fs/xfs/xfs_log_recover.c linux-2.6.37-vs2.3.0.37-rc1/fs/xfs/xfs_log_recover.c
+diff -NurpP --minimal linux-2.6.37/fs/xfs/xfs_log_recover.c linux-2.6.37-vs2.3.0.37-rc2/fs/xfs/xfs_log_recover.c
--- linux-2.6.37/fs/xfs/xfs_log_recover.c 2011-01-05 21:50:28.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/xfs/xfs_log_recover.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/xfs/xfs_log_recover.c 2010-11-23 02:09:41.000000000 +0100
@@ -2451,7 +2451,8 @@ xlog_recover_do_inode_trans(
}
/* the rest is in on-disk format */
if (item->ri_buf[1].i_len > sizeof(struct xfs_icdinode)) {
-diff -NurpP --minimal linux-2.6.37/fs/xfs/xfs_mount.h linux-2.6.37-vs2.3.0.37-rc1/fs/xfs/xfs_mount.h
+diff -NurpP --minimal linux-2.6.37/fs/xfs/xfs_mount.h linux-2.6.37-vs2.3.0.37-rc2/fs/xfs/xfs_mount.h
--- linux-2.6.37/fs/xfs/xfs_mount.h 2011-01-05 21:50:28.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/xfs/xfs_mount.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/xfs/xfs_mount.h 2010-11-23 02:09:41.000000000 +0100
@@ -239,6 +239,7 @@ typedef struct xfs_mount {
allocator */
#define XFS_MOUNT_NOATTR2 (1ULL << 25) /* disable use of attr2 format */
/*
* Default minimum read and write sizes.
-diff -NurpP --minimal linux-2.6.37/fs/xfs/xfs_vnodeops.c linux-2.6.37-vs2.3.0.37-rc1/fs/xfs/xfs_vnodeops.c
+diff -NurpP --minimal linux-2.6.37/fs/xfs/xfs_vnodeops.c linux-2.6.37-vs2.3.0.37-rc2/fs/xfs/xfs_vnodeops.c
--- linux-2.6.37/fs/xfs/xfs_vnodeops.c 2011-01-05 21:50:28.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/xfs/xfs_vnodeops.c 2011-01-06 00:07:49.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/xfs/xfs_vnodeops.c 2011-01-06 00:07:49.000000000 +0100
@@ -50,6 +50,78 @@
#include "xfs_vnodeops.h"
#include "xfs_trace.h"
if (iuid != uid) {
if (XFS_IS_QUOTA_RUNNING(mp) && XFS_IS_UQUOTA_ON(mp)) {
ASSERT(mask & ATTR_UID);
-diff -NurpP --minimal linux-2.6.37/fs/xfs/xfs_vnodeops.h linux-2.6.37-vs2.3.0.37-rc1/fs/xfs/xfs_vnodeops.h
+diff -NurpP --minimal linux-2.6.37/fs/xfs/xfs_vnodeops.h linux-2.6.37-vs2.3.0.37-rc2/fs/xfs/xfs_vnodeops.h
--- linux-2.6.37/fs/xfs/xfs_vnodeops.h 2011-01-05 21:50:28.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/fs/xfs/xfs_vnodeops.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/fs/xfs/xfs_vnodeops.h 2010-11-23 02:09:41.000000000 +0100
@@ -13,6 +13,7 @@ struct xfs_inode;
struct xfs_iomap;
int xfs_setattr(struct xfs_inode *ip, struct iattr *vap, int flags);
#define XFS_ATTR_DMI 0x01 /* invocation from a DMI function */
#define XFS_ATTR_NONBLOCK 0x02 /* return EAGAIN if operation would block */
-diff -NurpP --minimal linux-2.6.37/include/asm-generic/tlb.h linux-2.6.37-vs2.3.0.37-rc1/include/asm-generic/tlb.h
+diff -NurpP --minimal linux-2.6.37/include/asm-generic/tlb.h linux-2.6.37-vs2.3.0.37-rc2/include/asm-generic/tlb.h
--- linux-2.6.37/include/asm-generic/tlb.h 2009-09-10 15:26:24.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/asm-generic/tlb.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/asm-generic/tlb.h 2010-11-23 02:09:41.000000000 +0100
@@ -14,6 +14,7 @@
#define _ASM_GENERIC__TLB_H
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
-diff -NurpP --minimal linux-2.6.37/include/linux/capability.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/capability.h
+diff -NurpP --minimal linux-2.6.37/include/linux/capability.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/capability.h
--- linux-2.6.37/include/linux/capability.h 2010-10-21 13:07:52.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/capability.h 2011-01-06 01:44:43.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/capability.h 2011-01-06 01:44:43.000000000 +0100
@@ -280,6 +280,7 @@ struct cpu_vfs_cap_data {
arbitrary SCSI commands */
/* Allow setting encryption key on loopback filesystem */
/*
* Bit location of each capability (used by user-space library and kernel)
-diff -NurpP --minimal linux-2.6.37/include/linux/cred.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/cred.h
+diff -NurpP --minimal linux-2.6.37/include/linux/cred.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/cred.h
--- linux-2.6.37/include/linux/cred.h 2011-01-05 21:50:29.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/cred.h 2011-01-05 22:46:34.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/cred.h 2011-01-08 03:33:34.000000000 +0100
@@ -208,6 +208,31 @@ static inline void validate_process_cred
}
#endif
/**
* get_new_cred - Get a reference on a new set of credentials
* @cred: The new credentials to reference
-diff -NurpP --minimal linux-2.6.37/include/linux/devpts_fs.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/devpts_fs.h
+diff -NurpP --minimal linux-2.6.37/include/linux/devpts_fs.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/devpts_fs.h
--- linux-2.6.37/include/linux/devpts_fs.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/devpts_fs.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/devpts_fs.h 2010-11-23 02:09:41.000000000 +0100
@@ -45,5 +45,4 @@ static inline void devpts_pty_kill(struc
#endif
-
#endif /* _LINUX_DEVPTS_FS_H */
-diff -NurpP --minimal linux-2.6.37/include/linux/ext2_fs.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/ext2_fs.h
+diff -NurpP --minimal linux-2.6.37/include/linux/ext2_fs.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/ext2_fs.h
--- linux-2.6.37/include/linux/ext2_fs.h 2010-02-25 11:52:07.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/ext2_fs.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/ext2_fs.h 2010-11-23 02:09:41.000000000 +0100
@@ -189,8 +189,12 @@ struct ext2_group_desc
#define EXT2_NOTAIL_FL FS_NOTAIL_FL /* file tail should not be merged */
#define EXT2_DIRSYNC_FL FS_DIRSYNC_FL /* dirsync behaviour (directories only) */
#define clear_opt(o, opt) o &= ~EXT2_MOUNT_##opt
-diff -NurpP --minimal linux-2.6.37/include/linux/ext3_fs.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/ext3_fs.h
+diff -NurpP --minimal linux-2.6.37/include/linux/ext3_fs.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/ext3_fs.h
--- linux-2.6.37/include/linux/ext3_fs.h 2010-10-21 13:07:53.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/ext3_fs.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/ext3_fs.h 2010-11-23 02:09:41.000000000 +0100
@@ -173,10 +173,14 @@ struct ext3_group_desc
#define EXT3_NOTAIL_FL 0x00008000 /* file tail should not be merged */
#define EXT3_DIRSYNC_FL 0x00010000 /* dirsync behaviour (directories only) */
/* ioctl.c */
extern long ext3_ioctl(struct file *, unsigned int, unsigned long);
-diff -NurpP --minimal linux-2.6.37/include/linux/fs.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/fs.h
+diff -NurpP --minimal linux-2.6.37/include/linux/fs.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/fs.h
--- linux-2.6.37/include/linux/fs.h 2011-01-05 21:50:30.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/fs.h 2011-01-05 22:30:40.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/fs.h 2011-01-05 22:30:40.000000000 +0100
@@ -214,6 +214,9 @@ 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 */
extern int simple_setattr(struct dentry *, struct iattr *);
extern int simple_getattr(struct vfsmount *, struct dentry *, struct kstat *);
extern int simple_statfs(struct dentry *, struct kstatfs *);
-diff -NurpP --minimal linux-2.6.37/include/linux/gfs2_ondisk.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/gfs2_ondisk.h
+diff -NurpP --minimal linux-2.6.37/include/linux/gfs2_ondisk.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/gfs2_ondisk.h
--- linux-2.6.37/include/linux/gfs2_ondisk.h 2010-07-07 18:31:55.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/gfs2_ondisk.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/gfs2_ondisk.h 2010-11-23 02:09:41.000000000 +0100
@@ -211,6 +211,9 @@ enum {
gfs2fl_NoAtime = 7,
gfs2fl_Sync = 8,
#define GFS2_DIF_TRUNC_IN_PROG 0x20000000 /* New in gfs2 */
#define GFS2_DIF_INHERIT_DIRECTIO 0x40000000
#define GFS2_DIF_INHERIT_JDATA 0x80000000
-diff -NurpP --minimal linux-2.6.37/include/linux/if_tun.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/if_tun.h
+diff -NurpP --minimal linux-2.6.37/include/linux/if_tun.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/if_tun.h
--- linux-2.6.37/include/linux/if_tun.h 2010-08-02 16:52:54.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/if_tun.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/if_tun.h 2010-11-23 02:09:41.000000000 +0100
@@ -53,6 +53,7 @@
#define TUNDETACHFILTER _IOW('T', 214, struct sock_fprog)
#define TUNGETVNETHDRSZ _IOR('T', 215, int)
/* TUNSETIFF ifr flags */
#define IFF_TUN 0x0001
-diff -NurpP --minimal linux-2.6.37/include/linux/init_task.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/init_task.h
+diff -NurpP --minimal linux-2.6.37/include/linux/init_task.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/init_task.h
--- linux-2.6.37/include/linux/init_task.h 2011-01-05 21:50:30.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/init_task.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/init_task.h 2010-11-23 02:09:41.000000000 +0100
@@ -178,6 +178,10 @@ extern struct cred init_cred;
INIT_FTRACE_GRAPH \
INIT_TRACE_RECURSION \
}
-diff -NurpP --minimal linux-2.6.37/include/linux/ipc.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/ipc.h
+diff -NurpP --minimal linux-2.6.37/include/linux/ipc.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/ipc.h
--- linux-2.6.37/include/linux/ipc.h 2009-12-03 20:02:55.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/ipc.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/ipc.h 2010-11-23 02:09:41.000000000 +0100
@@ -91,6 +91,7 @@ struct kern_ipc_perm
key_t key;
uid_t uid;
uid_t cuid;
gid_t cgid;
mode_t mode;
-diff -NurpP --minimal linux-2.6.37/include/linux/Kbuild linux-2.6.37-vs2.3.0.37-rc1/include/linux/Kbuild
+diff -NurpP --minimal linux-2.6.37/include/linux/Kbuild linux-2.6.37-vs2.3.0.37-rc2/include/linux/Kbuild
--- linux-2.6.37/include/linux/Kbuild 2011-01-05 21:50:28.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/Kbuild 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/Kbuild 2010-11-23 02:09:41.000000000 +0100
@@ -15,6 +15,7 @@ header-y += netfilter_bridge/
header-y += netfilter_ipv4/
header-y += netfilter_ipv6/
header-y += wimax/
objhdr-y += version.h
-diff -NurpP --minimal linux-2.6.37/include/linux/loop.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/loop.h
+diff -NurpP --minimal linux-2.6.37/include/linux/loop.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/loop.h
--- linux-2.6.37/include/linux/loop.h 2009-09-10 15:26:25.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/loop.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/loop.h 2010-11-23 02:09:41.000000000 +0100
@@ -45,6 +45,7 @@ struct loop_device {
struct loop_func_table *lo_encryption;
__u32 lo_init[2];
int (*ioctl)(struct loop_device *, int cmd,
unsigned long arg);
-diff -NurpP --minimal linux-2.6.37/include/linux/magic.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/magic.h
+diff -NurpP --minimal linux-2.6.37/include/linux/magic.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/magic.h
--- linux-2.6.37/include/linux/magic.h 2011-01-05 21:50:30.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/magic.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/magic.h 2010-11-23 02:09:41.000000000 +0100
@@ -3,7 +3,7 @@
#define ADFS_SUPER_MAGIC 0xadf5
#define QNX4_SUPER_MAGIC 0x002f /* qnx4 fs detection */
#define REISERFS_SUPER_MAGIC 0x52654973 /* used by gcc */
-diff -NurpP --minimal linux-2.6.37/include/linux/major.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/major.h
+diff -NurpP --minimal linux-2.6.37/include/linux/major.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/major.h
--- linux-2.6.37/include/linux/major.h 2009-09-10 15:26:25.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/major.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/major.h 2010-11-23 02:09:41.000000000 +0100
@@ -15,6 +15,7 @@
#define HD_MAJOR IDE0_MAJOR
#define PTY_SLAVE_MAJOR 3
#define TTYAUX_MAJOR 5
#define LP_MAJOR 6
#define VCS_MAJOR 7
-diff -NurpP --minimal linux-2.6.37/include/linux/memcontrol.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/memcontrol.h
+diff -NurpP --minimal linux-2.6.37/include/linux/memcontrol.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/memcontrol.h
--- linux-2.6.37/include/linux/memcontrol.h 2010-10-21 13:07:53.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/memcontrol.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/memcontrol.h 2010-11-23 02:09:41.000000000 +0100
@@ -77,6 +77,13 @@ int task_in_mem_cgroup(struct task_struc
extern struct mem_cgroup *try_get_mem_cgroup_from_page(struct page *page);
extern struct mem_cgroup *mem_cgroup_from_task(struct task_struct *p);
static inline
int mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *cgroup)
{
-diff -NurpP --minimal linux-2.6.37/include/linux/mm_types.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/mm_types.h
+diff -NurpP --minimal linux-2.6.37/include/linux/mm_types.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/mm_types.h
--- linux-2.6.37/include/linux/mm_types.h 2011-01-05 21:50:31.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/mm_types.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/mm_types.h 2010-11-23 02:09:41.000000000 +0100
@@ -269,6 +269,7 @@ struct mm_struct {
/* Architecture-specific MM context */
/* Swap token stuff */
/*
-diff -NurpP --minimal linux-2.6.37/include/linux/mount.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/mount.h
+diff -NurpP --minimal linux-2.6.37/include/linux/mount.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/mount.h
--- linux-2.6.37/include/linux/mount.h 2010-10-21 13:07:53.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/mount.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/mount.h 2010-11-23 02:09:41.000000000 +0100
@@ -46,6 +46,9 @@ struct mnt_namespace;
#define MNT_INTERNAL 0x4000
};
static inline int *get_mnt_writers_ptr(struct vfsmount *mnt)
-diff -NurpP --minimal linux-2.6.37/include/linux/net.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/net.h
+diff -NurpP --minimal linux-2.6.37/include/linux/net.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/net.h
--- linux-2.6.37/include/linux/net.h 2011-01-05 21:50:31.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/net.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/net.h 2010-11-23 02:09:41.000000000 +0100
@@ -71,6 +71,7 @@ struct net;
#define SOCK_NOSPACE 2
#define SOCK_PASSCRED 3
#ifndef ARCH_HAS_SOCKET_TYPES
/**
-diff -NurpP --minimal linux-2.6.37/include/linux/nfs_mount.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/nfs_mount.h
+diff -NurpP --minimal linux-2.6.37/include/linux/nfs_mount.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/nfs_mount.h
--- linux-2.6.37/include/linux/nfs_mount.h 2011-01-05 21:50:31.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/nfs_mount.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/nfs_mount.h 2010-11-23 02:09:41.000000000 +0100
@@ -63,7 +63,8 @@ struct nfs_mount_data {
#define NFS_MOUNT_SECFLAVOUR 0x2000 /* 5 */
#define NFS_MOUNT_NORDIRPLUS 0x4000 /* 5 */
/* The following are for internal use only */
#define NFS_MOUNT_LOOKUP_CACHE_NONEG 0x10000
-diff -NurpP --minimal linux-2.6.37/include/linux/nsproxy.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/nsproxy.h
+diff -NurpP --minimal linux-2.6.37/include/linux/nsproxy.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/nsproxy.h
--- linux-2.6.37/include/linux/nsproxy.h 2009-06-11 17:13:17.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/nsproxy.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/nsproxy.h 2010-11-23 02:09:41.000000000 +0100
@@ -3,6 +3,7 @@
#include <linux/spinlock.h>
}
#ifdef CONFIG_CGROUP_NS
-diff -NurpP --minimal linux-2.6.37/include/linux/pid.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/pid.h
+diff -NurpP --minimal linux-2.6.37/include/linux/pid.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/pid.h
--- linux-2.6.37/include/linux/pid.h 2009-03-24 14:22:43.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/pid.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/pid.h 2010-11-23 02:09:41.000000000 +0100
@@ -8,7 +8,8 @@ enum pid_type
PIDTYPE_PID,
PIDTYPE_PGID,
pid_t pid_vnr(struct pid *pid);
#define do_each_pid_task(pid, type, task) \
-diff -NurpP --minimal linux-2.6.37/include/linux/proc_fs.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/proc_fs.h
+diff -NurpP --minimal linux-2.6.37/include/linux/proc_fs.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/proc_fs.h
--- linux-2.6.37/include/linux/proc_fs.h 2009-12-03 20:02:56.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/proc_fs.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/proc_fs.h 2010-11-23 02:09:41.000000000 +0100
@@ -56,6 +56,7 @@ struct proc_dir_entry {
nlink_t nlink;
uid_t uid;
int fd;
union proc_op op;
struct proc_dir_entry *pde;
-diff -NurpP --minimal linux-2.6.37/include/linux/quotaops.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/quotaops.h
+diff -NurpP --minimal linux-2.6.37/include/linux/quotaops.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/quotaops.h
--- linux-2.6.37/include/linux/quotaops.h 2010-10-21 13:07:54.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/quotaops.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/quotaops.h 2010-11-23 02:09:41.000000000 +0100
@@ -8,6 +8,7 @@
#define _LINUX_QUOTAOPS_
}
static inline int dquot_claim_space_nodirty(struct inode *inode, qsize_t number)
-diff -NurpP --minimal linux-2.6.37/include/linux/reboot.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/reboot.h
+diff -NurpP --minimal linux-2.6.37/include/linux/reboot.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/reboot.h
--- linux-2.6.37/include/linux/reboot.h 2010-07-07 18:31:56.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/reboot.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/reboot.h 2010-11-23 02:09:41.000000000 +0100
@@ -33,6 +33,7 @@
#define LINUX_REBOOT_CMD_RESTART2 0xA1B2C3D4
#define LINUX_REBOOT_CMD_SW_SUSPEND 0xD000FCE2
#ifdef __KERNEL__
-diff -NurpP --minimal linux-2.6.37/include/linux/reiserfs_fs.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/reiserfs_fs.h
+diff -NurpP --minimal linux-2.6.37/include/linux/reiserfs_fs.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/reiserfs_fs.h
--- linux-2.6.37/include/linux/reiserfs_fs.h 2011-01-05 21:50:32.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/reiserfs_fs.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/reiserfs_fs.h 2010-11-23 02:09:41.000000000 +0100
@@ -976,6 +976,11 @@ struct stat_data_v1 {
#define REISERFS_COMPR_FL FS_COMPR_FL
#define REISERFS_NOTAIL_FL FS_NOTAIL_FL
int __reiserfs_write_begin(struct page *page, unsigned from, unsigned len);
-diff -NurpP --minimal linux-2.6.37/include/linux/reiserfs_fs_sb.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/reiserfs_fs_sb.h
+diff -NurpP --minimal linux-2.6.37/include/linux/reiserfs_fs_sb.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/reiserfs_fs_sb.h
--- linux-2.6.37/include/linux/reiserfs_fs_sb.h 2010-02-25 11:52:07.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/reiserfs_fs_sb.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/reiserfs_fs_sb.h 2010-11-23 02:09:41.000000000 +0100
@@ -476,6 +476,7 @@ enum reiserfs_mount_options {
REISERFS_EXPOSE_PRIVROOT,
REISERFS_BARRIER_NONE,
/* Actions on error */
REISERFS_ERROR_PANIC,
-diff -NurpP --minimal linux-2.6.37/include/linux/sched.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/sched.h
+diff -NurpP --minimal linux-2.6.37/include/linux/sched.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/sched.h
--- linux-2.6.37/include/linux/sched.h 2011-01-05 21:50:32.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/sched.h 2011-01-05 22:30:40.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/sched.h 2011-01-05 22:30:40.000000000 +0100
@@ -1357,6 +1357,14 @@ struct task_struct {
#endif
seccomp_t seccomp;
}
-diff -NurpP --minimal linux-2.6.37/include/linux/shmem_fs.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/shmem_fs.h
+diff -NurpP --minimal linux-2.6.37/include/linux/shmem_fs.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/shmem_fs.h
--- linux-2.6.37/include/linux/shmem_fs.h 2010-10-21 13:07:55.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/shmem_fs.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/shmem_fs.h 2010-11-23 02:09:41.000000000 +0100
@@ -9,6 +9,9 @@
#define SHMEM_NR_DIRECT 16
struct shmem_inode_info {
spinlock_t lock;
unsigned long flags;
-diff -NurpP --minimal linux-2.6.37/include/linux/stat.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/stat.h
+diff -NurpP --minimal linux-2.6.37/include/linux/stat.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/stat.h
--- linux-2.6.37/include/linux/stat.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/stat.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/stat.h 2010-11-23 02:09:41.000000000 +0100
@@ -66,6 +66,7 @@ struct kstat {
unsigned int nlink;
uid_t uid;
dev_t rdev;
loff_t size;
struct timespec atime;
-diff -NurpP --minimal linux-2.6.37/include/linux/sunrpc/auth.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/sunrpc/auth.h
+diff -NurpP --minimal linux-2.6.37/include/linux/sunrpc/auth.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/sunrpc/auth.h
--- linux-2.6.37/include/linux/sunrpc/auth.h 2011-01-05 21:50:33.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/sunrpc/auth.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/sunrpc/auth.h 2010-11-23 02:09:41.000000000 +0100
@@ -25,6 +25,7 @@
struct auth_cred {
uid_t uid;
struct group_info *group_info;
unsigned char machine_cred : 1;
};
-diff -NurpP --minimal linux-2.6.37/include/linux/sunrpc/clnt.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/sunrpc/clnt.h
+diff -NurpP --minimal linux-2.6.37/include/linux/sunrpc/clnt.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/sunrpc/clnt.h
--- linux-2.6.37/include/linux/sunrpc/clnt.h 2011-01-05 21:50:33.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/sunrpc/clnt.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/sunrpc/clnt.h 2010-11-23 02:09:41.000000000 +0100
@@ -49,7 +49,8 @@ struct rpc_clnt {
unsigned int cl_softrtry : 1,/* soft timeouts */
cl_discrtry : 1,/* disconnect before retry */
struct rpc_rtt * cl_rtt; /* RTO estimator data */
const struct rpc_timeout *cl_timeout; /* Timeout strategy */
-diff -NurpP --minimal linux-2.6.37/include/linux/syscalls.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/syscalls.h
+diff -NurpP --minimal linux-2.6.37/include/linux/syscalls.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/syscalls.h
--- linux-2.6.37/include/linux/syscalls.h 2011-01-05 21:50:34.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/syscalls.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/syscalls.h 2010-11-23 02:09:41.000000000 +0100
@@ -478,6 +478,8 @@ asmlinkage long sys_symlink(const char _
asmlinkage long sys_unlink(const char __user *pathname);
asmlinkage long sys_rename(const char __user *oldname,
asmlinkage long sys_chmod(const char __user *filename, mode_t mode);
asmlinkage long sys_fchmod(unsigned int fd, mode_t mode);
-diff -NurpP --minimal linux-2.6.37/include/linux/sysctl.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/sysctl.h
+diff -NurpP --minimal linux-2.6.37/include/linux/sysctl.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/sysctl.h
--- linux-2.6.37/include/linux/sysctl.h 2010-08-02 16:52:56.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/sysctl.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/sysctl.h 2010-11-23 02:09:41.000000000 +0100
@@ -60,6 +60,7 @@ enum
CTL_ABI=9, /* Binary emulation */
CTL_CPU=10, /* CPU stuff (speed scaling, etc) */
KERN_SPARC_REBOOT=21, /* reboot command on Sparc */
KERN_CTLALTDEL=22, /* int: allow ctl-alt-del to reboot */
-diff -NurpP --minimal linux-2.6.37/include/linux/sysfs.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/sysfs.h
+diff -NurpP --minimal linux-2.6.37/include/linux/sysfs.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/sysfs.h
--- linux-2.6.37/include/linux/sysfs.h 2011-01-05 21:50:34.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/sysfs.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/sysfs.h 2010-11-23 02:09:41.000000000 +0100
@@ -19,6 +19,8 @@
#include <linux/kobject_ns.h>
#include <asm/atomic.h>
struct kobject;
struct module;
enum kobj_ns_type;
-diff -NurpP --minimal linux-2.6.37/include/linux/time.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/time.h
+diff -NurpP --minimal linux-2.6.37/include/linux/time.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/time.h
--- linux-2.6.37/include/linux/time.h 2010-10-21 13:07:55.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/time.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/time.h 2010-11-23 02:09:41.000000000 +0100
@@ -252,6 +252,9 @@ static __always_inline void timespec_add
a->tv_sec += __iter_div_u64_rem(a->tv_nsec + ns, NSEC_PER_SEC, &ns);
a->tv_nsec = ns;
#endif /* __KERNEL__ */
#define NFDBITS __NFDBITS
-diff -NurpP --minimal linux-2.6.37/include/linux/types.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/types.h
+diff -NurpP --minimal linux-2.6.37/include/linux/types.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/types.h
--- linux-2.6.37/include/linux/types.h 2011-01-05 21:50:34.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/types.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/types.h 2010-11-23 02:09:41.000000000 +0100
@@ -40,6 +40,9 @@ typedef __kernel_uid32_t uid_t;
typedef __kernel_gid32_t gid_t;
typedef __kernel_uid16_t uid16_t;
typedef unsigned long uintptr_t;
-diff -NurpP --minimal linux-2.6.37/include/linux/vroot.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/vroot.h
+diff -NurpP --minimal linux-2.6.37/include/linux/vroot.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/vroot.h
--- linux-2.6.37/include/linux/vroot.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/vroot.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/vroot.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,51 @@
+
+/*
+#define VROOT_CLR_DEV 0x5601
+
+#endif /* _LINUX_VROOT_H */
-diff -NurpP --minimal linux-2.6.37/include/linux/vs_base.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/vs_base.h
+diff -NurpP --minimal linux-2.6.37/include/linux/vs_base.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/vs_base.h
--- linux-2.6.37/include/linux/vs_base.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/vs_base.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/vs_base.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,10 @@
+#ifndef _VS_BASE_H
+#define _VS_BASE_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.37/include/linux/vs_context.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/vs_context.h
+diff -NurpP --minimal linux-2.6.37/include/linux/vs_context.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/vs_context.h
--- linux-2.6.37/include/linux/vs_context.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/vs_context.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/vs_context.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,242 @@
+#ifndef _VS_CONTEXT_H
+#define _VS_CONTEXT_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.37/include/linux/vs_cowbl.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/vs_cowbl.h
+diff -NurpP --minimal linux-2.6.37/include/linux/vs_cowbl.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/vs_cowbl.h
--- linux-2.6.37/include/linux/vs_cowbl.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/vs_cowbl.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/vs_cowbl.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,48 @@
+#ifndef _VS_COWBL_H
+#define _VS_COWBL_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.37/include/linux/vs_cvirt.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/vs_cvirt.h
+diff -NurpP --minimal linux-2.6.37/include/linux/vs_cvirt.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/vs_cvirt.h
--- linux-2.6.37/include/linux/vs_cvirt.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/vs_cvirt.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/vs_cvirt.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,50 @@
+#ifndef _VS_CVIRT_H
+#define _VS_CVIRT_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.37/include/linux/vs_device.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/vs_device.h
+diff -NurpP --minimal linux-2.6.37/include/linux/vs_device.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/vs_device.h
--- linux-2.6.37/include/linux/vs_device.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/vs_device.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/vs_device.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,45 @@
+#ifndef _VS_DEVICE_H
+#define _VS_DEVICE_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.37/include/linux/vs_dlimit.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/vs_dlimit.h
+diff -NurpP --minimal linux-2.6.37/include/linux/vs_dlimit.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/vs_dlimit.h
--- linux-2.6.37/include/linux/vs_dlimit.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/vs_dlimit.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/vs_dlimit.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,215 @@
+#ifndef _VS_DLIMIT_H
+#define _VS_DLIMIT_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.37/include/linux/vserver/base.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/base.h
+diff -NurpP --minimal linux-2.6.37/include/linux/vserver/base.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/base.h
--- linux-2.6.37/include/linux/vserver/base.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/base.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/base.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,170 @@
+#ifndef _VX_BASE_H
+#define _VX_BASE_H
+#define nx_info_state(n, m) (__nx_state(n) & (m))
+
+#endif
-diff -NurpP --minimal linux-2.6.37/include/linux/vserver/cacct_cmd.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/cacct_cmd.h
+diff -NurpP --minimal linux-2.6.37/include/linux/vserver/cacct_cmd.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/cacct_cmd.h
--- linux-2.6.37/include/linux/vserver/cacct_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/cacct_cmd.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/cacct_cmd.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,23 @@
+#ifndef _VX_CACCT_CMD_H
+#define _VX_CACCT_CMD_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CACCT_CMD_H */
-diff -NurpP --minimal linux-2.6.37/include/linux/vserver/cacct_def.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/cacct_def.h
+diff -NurpP --minimal linux-2.6.37/include/linux/vserver/cacct_def.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/cacct_def.h
--- linux-2.6.37/include/linux/vserver/cacct_def.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/cacct_def.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/cacct_def.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,43 @@
+#ifndef _VX_CACCT_DEF_H
+#define _VX_CACCT_DEF_H
+#endif
+
+#endif /* _VX_CACCT_DEF_H */
-diff -NurpP --minimal linux-2.6.37/include/linux/vserver/cacct.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/cacct.h
+diff -NurpP --minimal linux-2.6.37/include/linux/vserver/cacct.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/cacct.h
--- linux-2.6.37/include/linux/vserver/cacct.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/cacct.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/cacct.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,15 @@
+#ifndef _VX_CACCT_H
+#define _VX_CACCT_H
+};
+
+#endif /* _VX_CACCT_H */
-diff -NurpP --minimal linux-2.6.37/include/linux/vserver/cacct_int.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/cacct_int.h
+diff -NurpP --minimal linux-2.6.37/include/linux/vserver/cacct_int.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/cacct_int.h
--- linux-2.6.37/include/linux/vserver/cacct_int.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/cacct_int.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/cacct_int.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,21 @@
+#ifndef _VX_CACCT_INT_H
+#define _VX_CACCT_INT_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CACCT_INT_H */
-diff -NurpP --minimal linux-2.6.37/include/linux/vserver/check.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/check.h
+diff -NurpP --minimal linux-2.6.37/include/linux/vserver/check.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/check.h
--- linux-2.6.37/include/linux/vserver/check.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/check.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/check.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,89 @@
+#ifndef _VS_CHECK_H
+#define _VS_CHECK_H
+#define nx_weak_check(c, m) ((m) ? nx_check(c, m) : 1)
+
+#endif
-diff -NurpP --minimal linux-2.6.37/include/linux/vserver/context_cmd.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/context_cmd.h
+diff -NurpP --minimal linux-2.6.37/include/linux/vserver/context_cmd.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/context_cmd.h
--- linux-2.6.37/include/linux/vserver/context_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/context_cmd.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/context_cmd.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,145 @@
+#ifndef _VX_CONTEXT_CMD_H
+#define _VX_CONTEXT_CMD_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CONTEXT_CMD_H */
-diff -NurpP --minimal linux-2.6.37/include/linux/vserver/context.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/context.h
+diff -NurpP --minimal linux-2.6.37/include/linux/vserver/context.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/context.h
--- linux-2.6.37/include/linux/vserver/context.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/context.h 2011-01-05 22:46:44.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/context.h 2011-01-08 03:34:09.000000000 +0100
@@ -0,0 +1,190 @@
+#ifndef _VX_CONTEXT_H
+#define _VX_CONTEXT_H
+ unsigned long vx_nsmask; /* assignment mask */
+ struct nsproxy *vx_nsproxy; /* private namespaces */
+ struct fs_struct *vx_fs; /* private namespace fs */
-+ const struct cred *vx_real_cred; /* real task credentials */
-+ const struct cred *vx_cred; /* task credentials */
++// const struct cred *vx_real_cred; /* real task credentials */
++// const struct cred *vx_cred; /* task credentials */
+};
+
+struct vx_info {
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CONTEXT_H */
-diff -NurpP --minimal linux-2.6.37/include/linux/vserver/cvirt_cmd.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/cvirt_cmd.h
+diff -NurpP --minimal linux-2.6.37/include/linux/vserver/cvirt_cmd.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/cvirt_cmd.h
--- linux-2.6.37/include/linux/vserver/cvirt_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/cvirt_cmd.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/cvirt_cmd.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,53 @@
+#ifndef _VX_CVIRT_CMD_H
+#define _VX_CVIRT_CMD_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CVIRT_CMD_H */
-diff -NurpP --minimal linux-2.6.37/include/linux/vserver/cvirt_def.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/cvirt_def.h
+diff -NurpP --minimal linux-2.6.37/include/linux/vserver/cvirt_def.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/cvirt_def.h
--- linux-2.6.37/include/linux/vserver/cvirt_def.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/cvirt_def.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/cvirt_def.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,80 @@
+#ifndef _VX_CVIRT_DEF_H
+#define _VX_CVIRT_DEF_H
+#endif
+
+#endif /* _VX_CVIRT_DEF_H */
-diff -NurpP --minimal linux-2.6.37/include/linux/vserver/cvirt.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/cvirt.h
+diff -NurpP --minimal linux-2.6.37/include/linux/vserver/cvirt.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/cvirt.h
--- linux-2.6.37/include/linux/vserver/cvirt.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/cvirt.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/cvirt.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,20 @@
+#ifndef _VX_CVIRT_H
+#define _VX_CVIRT_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CVIRT_H */
-diff -NurpP --minimal linux-2.6.37/include/linux/vserver/debug_cmd.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/debug_cmd.h
+diff -NurpP --minimal linux-2.6.37/include/linux/vserver/debug_cmd.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/debug_cmd.h
--- linux-2.6.37/include/linux/vserver/debug_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/debug_cmd.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/debug_cmd.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,58 @@
+#ifndef _VX_DEBUG_CMD_H
+#define _VX_DEBUG_CMD_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_DEBUG_CMD_H */
-diff -NurpP --minimal linux-2.6.37/include/linux/vserver/debug.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/debug.h
+diff -NurpP --minimal linux-2.6.37/include/linux/vserver/debug.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/debug.h
--- linux-2.6.37/include/linux/vserver/debug.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/debug.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/debug.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,140 @@
+#ifndef _VX_DEBUG_H
+#define _VX_DEBUG_H
+
+
+#endif /* _VX_DEBUG_H */
-diff -NurpP --minimal linux-2.6.37/include/linux/vserver/device_cmd.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/device_cmd.h
+diff -NurpP --minimal linux-2.6.37/include/linux/vserver/device_cmd.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/device_cmd.h
--- linux-2.6.37/include/linux/vserver/device_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/device_cmd.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/device_cmd.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,44 @@
+#ifndef _VX_DEVICE_CMD_H
+#define _VX_DEVICE_CMD_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_DEVICE_CMD_H */
-diff -NurpP --minimal linux-2.6.37/include/linux/vserver/device_def.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/device_def.h
+diff -NurpP --minimal linux-2.6.37/include/linux/vserver/device_def.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/device_def.h
--- linux-2.6.37/include/linux/vserver/device_def.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/device_def.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/device_def.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,17 @@
+#ifndef _VX_DEVICE_DEF_H
+#define _VX_DEVICE_DEF_H
+};
+
+#endif /* _VX_DEVICE_DEF_H */
-diff -NurpP --minimal linux-2.6.37/include/linux/vserver/device.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/device.h
+diff -NurpP --minimal linux-2.6.37/include/linux/vserver/device.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/device.h
--- linux-2.6.37/include/linux/vserver/device.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/device.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/device.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,15 @@
+#ifndef _VX_DEVICE_H
+#define _VX_DEVICE_H
+#else /* _VX_DEVICE_H */
+#warning duplicate inclusion
+#endif /* _VX_DEVICE_H */
-diff -NurpP --minimal linux-2.6.37/include/linux/vserver/dlimit_cmd.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/dlimit_cmd.h
+diff -NurpP --minimal linux-2.6.37/include/linux/vserver/dlimit_cmd.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/dlimit_cmd.h
--- linux-2.6.37/include/linux/vserver/dlimit_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/dlimit_cmd.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/dlimit_cmd.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,109 @@
+#ifndef _VX_DLIMIT_CMD_H
+#define _VX_DLIMIT_CMD_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_DLIMIT_CMD_H */
-diff -NurpP --minimal linux-2.6.37/include/linux/vserver/dlimit.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/dlimit.h
+diff -NurpP --minimal linux-2.6.37/include/linux/vserver/dlimit.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/dlimit.h
--- linux-2.6.37/include/linux/vserver/dlimit.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/dlimit.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/dlimit.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,54 @@
+#ifndef _VX_DLIMIT_H
+#define _VX_DLIMIT_H
+#else /* _VX_DLIMIT_H */
+#warning duplicate inclusion
+#endif /* _VX_DLIMIT_H */
-diff -NurpP --minimal linux-2.6.37/include/linux/vserver/global.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/global.h
+diff -NurpP --minimal linux-2.6.37/include/linux/vserver/global.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/global.h
--- linux-2.6.37/include/linux/vserver/global.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/global.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/global.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,19 @@
+#ifndef _VX_GLOBAL_H
+#define _VX_GLOBAL_H
+
+
+#endif /* _VX_GLOBAL_H */
-diff -NurpP --minimal linux-2.6.37/include/linux/vserver/history.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/history.h
+diff -NurpP --minimal linux-2.6.37/include/linux/vserver/history.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/history.h
--- linux-2.6.37/include/linux/vserver/history.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/history.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/history.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,197 @@
+#ifndef _VX_HISTORY_H
+#define _VX_HISTORY_H
+#endif /* CONFIG_VSERVER_HISTORY */
+
+#endif /* _VX_HISTORY_H */
-diff -NurpP --minimal linux-2.6.37/include/linux/vserver/inode_cmd.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/inode_cmd.h
+diff -NurpP --minimal linux-2.6.37/include/linux/vserver/inode_cmd.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/inode_cmd.h
--- linux-2.6.37/include/linux/vserver/inode_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/inode_cmd.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/inode_cmd.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,59 @@
+#ifndef _VX_INODE_CMD_H
+#define _VX_INODE_CMD_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_INODE_CMD_H */
-diff -NurpP --minimal linux-2.6.37/include/linux/vserver/inode.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/inode.h
+diff -NurpP --minimal linux-2.6.37/include/linux/vserver/inode.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/inode.h
--- linux-2.6.37/include/linux/vserver/inode.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/inode.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/inode.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,39 @@
+#ifndef _VX_INODE_H
+#define _VX_INODE_H
+#else /* _VX_INODE_H */
+#warning duplicate inclusion
+#endif /* _VX_INODE_H */
-diff -NurpP --minimal linux-2.6.37/include/linux/vserver/Kbuild linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/Kbuild
+diff -NurpP --minimal linux-2.6.37/include/linux/vserver/Kbuild linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/Kbuild
--- linux-2.6.37/include/linux/vserver/Kbuild 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/Kbuild 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/Kbuild 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,8 @@
+
+unifdef-y += context_cmd.h network_cmd.h space_cmd.h \
+
+unifdef-y += switch.h network.h monitor.h inode.h device.h
+
-diff -NurpP --minimal linux-2.6.37/include/linux/vserver/limit_cmd.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/limit_cmd.h
+diff -NurpP --minimal linux-2.6.37/include/linux/vserver/limit_cmd.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/limit_cmd.h
--- linux-2.6.37/include/linux/vserver/limit_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/limit_cmd.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/limit_cmd.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,71 @@
+#ifndef _VX_LIMIT_CMD_H
+#define _VX_LIMIT_CMD_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_LIMIT_CMD_H */
-diff -NurpP --minimal linux-2.6.37/include/linux/vserver/limit_def.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/limit_def.h
+diff -NurpP --minimal linux-2.6.37/include/linux/vserver/limit_def.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/limit_def.h
--- linux-2.6.37/include/linux/vserver/limit_def.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/limit_def.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/limit_def.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,47 @@
+#ifndef _VX_LIMIT_DEF_H
+#define _VX_LIMIT_DEF_H
+#endif
+
+#endif /* _VX_LIMIT_DEF_H */
-diff -NurpP --minimal linux-2.6.37/include/linux/vserver/limit.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/limit.h
+diff -NurpP --minimal linux-2.6.37/include/linux/vserver/limit.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/limit.h
--- linux-2.6.37/include/linux/vserver/limit.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/limit.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/limit.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,71 @@
+#ifndef _VX_LIMIT_H
+#define _VX_LIMIT_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_LIMIT_H */
-diff -NurpP --minimal linux-2.6.37/include/linux/vserver/limit_int.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/limit_int.h
+diff -NurpP --minimal linux-2.6.37/include/linux/vserver/limit_int.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/limit_int.h
--- linux-2.6.37/include/linux/vserver/limit_int.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/limit_int.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/limit_int.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,198 @@
+#ifndef _VX_LIMIT_INT_H
+#define _VX_LIMIT_INT_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_LIMIT_INT_H */
-diff -NurpP --minimal linux-2.6.37/include/linux/vserver/monitor.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/monitor.h
+diff -NurpP --minimal linux-2.6.37/include/linux/vserver/monitor.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/monitor.h
--- linux-2.6.37/include/linux/vserver/monitor.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/monitor.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/monitor.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,96 @@
+#ifndef _VX_MONITOR_H
+#define _VX_MONITOR_H
+
+
+#endif /* _VX_MONITOR_H */
-diff -NurpP --minimal linux-2.6.37/include/linux/vserver/network_cmd.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/network_cmd.h
+diff -NurpP --minimal linux-2.6.37/include/linux/vserver/network_cmd.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/network_cmd.h
--- linux-2.6.37/include/linux/vserver/network_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/network_cmd.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/network_cmd.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,150 @@
+#ifndef _VX_NETWORK_CMD_H
+#define _VX_NETWORK_CMD_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CONTEXT_CMD_H */
-diff -NurpP --minimal linux-2.6.37/include/linux/vserver/network.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/network.h
+diff -NurpP --minimal linux-2.6.37/include/linux/vserver/network.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/network.h
--- linux-2.6.37/include/linux/vserver/network.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/network.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/network.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,146 @@
+#ifndef _VX_NETWORK_H
+#define _VX_NETWORK_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_NETWORK_H */
-diff -NurpP --minimal linux-2.6.37/include/linux/vserver/percpu.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/percpu.h
+diff -NurpP --minimal linux-2.6.37/include/linux/vserver/percpu.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/percpu.h
--- linux-2.6.37/include/linux/vserver/percpu.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/percpu.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/percpu.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,14 @@
+#ifndef _VX_PERCPU_H
+#define _VX_PERCPU_H
+#define PERCPU_PERCTX (sizeof(struct _vx_percpu))
+
+#endif /* _VX_PERCPU_H */
-diff -NurpP --minimal linux-2.6.37/include/linux/vserver/pid.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/pid.h
+diff -NurpP --minimal linux-2.6.37/include/linux/vserver/pid.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/pid.h
--- linux-2.6.37/include/linux/vserver/pid.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/pid.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/pid.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,51 @@
+#ifndef _VSERVER_PID_H
+#define _VSERVER_PID_H
+}
+
+#endif
-diff -NurpP --minimal linux-2.6.37/include/linux/vserver/sched_cmd.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/sched_cmd.h
+diff -NurpP --minimal linux-2.6.37/include/linux/vserver/sched_cmd.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/sched_cmd.h
--- linux-2.6.37/include/linux/vserver/sched_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/sched_cmd.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/sched_cmd.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,21 @@
+#ifndef _VX_SCHED_CMD_H
+#define _VX_SCHED_CMD_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_SCHED_CMD_H */
-diff -NurpP --minimal linux-2.6.37/include/linux/vserver/sched_def.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/sched_def.h
+diff -NurpP --minimal linux-2.6.37/include/linux/vserver/sched_def.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/sched_def.h
--- linux-2.6.37/include/linux/vserver/sched_def.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/sched_def.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/sched_def.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,38 @@
+#ifndef _VX_SCHED_DEF_H
+#define _VX_SCHED_DEF_H
+#endif
+
+#endif /* _VX_SCHED_DEF_H */
-diff -NurpP --minimal linux-2.6.37/include/linux/vserver/sched.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/sched.h
+diff -NurpP --minimal linux-2.6.37/include/linux/vserver/sched.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/sched.h
--- linux-2.6.37/include/linux/vserver/sched.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/sched.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/sched.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,23 @@
+#ifndef _VX_SCHED_H
+#define _VX_SCHED_H
+#else /* _VX_SCHED_H */
+#warning duplicate inclusion
+#endif /* _VX_SCHED_H */
-diff -NurpP --minimal linux-2.6.37/include/linux/vserver/signal_cmd.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/signal_cmd.h
+diff -NurpP --minimal linux-2.6.37/include/linux/vserver/signal_cmd.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/signal_cmd.h
--- linux-2.6.37/include/linux/vserver/signal_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/signal_cmd.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/signal_cmd.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,43 @@
+#ifndef _VX_SIGNAL_CMD_H
+#define _VX_SIGNAL_CMD_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_SIGNAL_CMD_H */
-diff -NurpP --minimal linux-2.6.37/include/linux/vserver/signal.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/signal.h
+diff -NurpP --minimal linux-2.6.37/include/linux/vserver/signal.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/signal.h
--- linux-2.6.37/include/linux/vserver/signal.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/signal.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/signal.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,14 @@
+#ifndef _VX_SIGNAL_H
+#define _VX_SIGNAL_H
+#else /* _VX_SIGNAL_H */
+#warning duplicate inclusion
+#endif /* _VX_SIGNAL_H */
-diff -NurpP --minimal linux-2.6.37/include/linux/vserver/space_cmd.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/space_cmd.h
+diff -NurpP --minimal linux-2.6.37/include/linux/vserver/space_cmd.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/space_cmd.h
--- linux-2.6.37/include/linux/vserver/space_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/space_cmd.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/space_cmd.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,38 @@
+#ifndef _VX_SPACE_CMD_H
+#define _VX_SPACE_CMD_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_SPACE_CMD_H */
-diff -NurpP --minimal linux-2.6.37/include/linux/vserver/space.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/space.h
+diff -NurpP --minimal linux-2.6.37/include/linux/vserver/space.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/space.h
--- linux-2.6.37/include/linux/vserver/space.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/space.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/space.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,12 @@
+#ifndef _VX_SPACE_H
+#define _VX_SPACE_H
+#else /* _VX_SPACE_H */
+#warning duplicate inclusion
+#endif /* _VX_SPACE_H */
-diff -NurpP --minimal linux-2.6.37/include/linux/vserver/switch.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/switch.h
+diff -NurpP --minimal linux-2.6.37/include/linux/vserver/switch.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/switch.h
--- linux-2.6.37/include/linux/vserver/switch.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/switch.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/switch.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,98 @@
+#ifndef _VX_SWITCH_H
+#define _VX_SWITCH_H
+
+#endif /* _VX_SWITCH_H */
+
-diff -NurpP --minimal linux-2.6.37/include/linux/vserver/tag_cmd.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/tag_cmd.h
+diff -NurpP --minimal linux-2.6.37/include/linux/vserver/tag_cmd.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/tag_cmd.h
--- linux-2.6.37/include/linux/vserver/tag_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/tag_cmd.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/tag_cmd.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,22 @@
+#ifndef _VX_TAG_CMD_H
+#define _VX_TAG_CMD_H
+
+#endif /* __KERNEL__ */
+#endif /* _VX_TAG_CMD_H */
-diff -NurpP --minimal linux-2.6.37/include/linux/vserver/tag.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/tag.h
+diff -NurpP --minimal linux-2.6.37/include/linux/vserver/tag.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/tag.h
--- linux-2.6.37/include/linux/vserver/tag.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/vserver/tag.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/vserver/tag.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,143 @@
+#ifndef _DX_TAG_H
+#define _DX_TAG_H
+#endif
+
+#endif /* _DX_TAG_H */
-diff -NurpP --minimal linux-2.6.37/include/linux/vs_inet6.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/vs_inet6.h
+diff -NurpP --minimal linux-2.6.37/include/linux/vs_inet6.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/vs_inet6.h
--- linux-2.6.37/include/linux/vs_inet6.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/vs_inet6.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/vs_inet6.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,246 @@
+#ifndef _VS_INET6_H
+#define _VS_INET6_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.37/include/linux/vs_inet.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/vs_inet.h
+diff -NurpP --minimal linux-2.6.37/include/linux/vs_inet.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/vs_inet.h
--- linux-2.6.37/include/linux/vs_inet.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/vs_inet.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/vs_inet.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,351 @@
+#ifndef _VS_INET_H
+#define _VS_INET_H
+#else
+// #warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.37/include/linux/vs_limit.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/vs_limit.h
+diff -NurpP --minimal linux-2.6.37/include/linux/vs_limit.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/vs_limit.h
--- linux-2.6.37/include/linux/vs_limit.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/vs_limit.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/vs_limit.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,140 @@
+#ifndef _VS_LIMIT_H
+#define _VS_LIMIT_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.37/include/linux/vs_memory.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/vs_memory.h
+diff -NurpP --minimal linux-2.6.37/include/linux/vs_memory.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/vs_memory.h
--- linux-2.6.37/include/linux/vs_memory.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/vs_memory.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/vs_memory.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,58 @@
+#ifndef _VS_MEMORY_H
+#define _VS_MEMORY_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.37/include/linux/vs_network.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/vs_network.h
+diff -NurpP --minimal linux-2.6.37/include/linux/vs_network.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/vs_network.h
--- linux-2.6.37/include/linux/vs_network.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/vs_network.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/vs_network.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,169 @@
+#ifndef _NX_VS_NETWORK_H
+#define _NX_VS_NETWORK_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.37/include/linux/vs_pid.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/vs_pid.h
+diff -NurpP --minimal linux-2.6.37/include/linux/vs_pid.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/vs_pid.h
--- linux-2.6.37/include/linux/vs_pid.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/vs_pid.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/vs_pid.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,95 @@
+#ifndef _VS_PID_H
+#define _VS_PID_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.37/include/linux/vs_sched.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/vs_sched.h
+diff -NurpP --minimal linux-2.6.37/include/linux/vs_sched.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/vs_sched.h
--- linux-2.6.37/include/linux/vs_sched.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/vs_sched.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/vs_sched.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,40 @@
+#ifndef _VS_SCHED_H
+#define _VS_SCHED_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.37/include/linux/vs_socket.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/vs_socket.h
+diff -NurpP --minimal linux-2.6.37/include/linux/vs_socket.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/vs_socket.h
--- linux-2.6.37/include/linux/vs_socket.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/vs_socket.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/vs_socket.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,67 @@
+#ifndef _VS_SOCKET_H
+#define _VS_SOCKET_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.37/include/linux/vs_tag.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/vs_tag.h
+diff -NurpP --minimal linux-2.6.37/include/linux/vs_tag.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/vs_tag.h
--- linux-2.6.37/include/linux/vs_tag.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/vs_tag.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/vs_tag.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,47 @@
+#ifndef _VS_TAG_H
+#define _VS_TAG_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.37/include/linux/vs_time.h linux-2.6.37-vs2.3.0.37-rc1/include/linux/vs_time.h
+diff -NurpP --minimal linux-2.6.37/include/linux/vs_time.h linux-2.6.37-vs2.3.0.37-rc2/include/linux/vs_time.h
--- linux-2.6.37/include/linux/vs_time.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/linux/vs_time.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/linux/vs_time.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,19 @@
+#ifndef _VS_TIME_H
+#define _VS_TIME_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.37/include/net/addrconf.h linux-2.6.37-vs2.3.0.37-rc1/include/net/addrconf.h
+diff -NurpP --minimal linux-2.6.37/include/net/addrconf.h linux-2.6.37-vs2.3.0.37-rc2/include/net/addrconf.h
--- linux-2.6.37/include/net/addrconf.h 2011-01-05 21:50:35.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/net/addrconf.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/net/addrconf.h 2010-11-23 02:09:41.000000000 +0100
@@ -84,7 +84,8 @@ extern int ipv6_dev_get_saddr(struct n
struct net_device *dev,
const struct in6_addr *daddr,
extern int ipv6_get_lladdr(struct net_device *dev,
struct in6_addr *addr,
unsigned char banned_flags);
-diff -NurpP --minimal linux-2.6.37/include/net/af_unix.h linux-2.6.37-vs2.3.0.37-rc1/include/net/af_unix.h
+diff -NurpP --minimal linux-2.6.37/include/net/af_unix.h linux-2.6.37-vs2.3.0.37-rc2/include/net/af_unix.h
--- linux-2.6.37/include/net/af_unix.h 2011-01-05 21:50:35.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/net/af_unix.h 2011-01-05 22:30:40.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/net/af_unix.h 2011-01-05 22:30:40.000000000 +0100
@@ -4,6 +4,7 @@
#include <linux/socket.h>
#include <linux/un.h>
#include <net/sock.h>
extern void unix_inflight(struct file *fp);
-diff -NurpP --minimal linux-2.6.37/include/net/inet_timewait_sock.h linux-2.6.37-vs2.3.0.37-rc1/include/net/inet_timewait_sock.h
+diff -NurpP --minimal linux-2.6.37/include/net/inet_timewait_sock.h linux-2.6.37-vs2.3.0.37-rc2/include/net/inet_timewait_sock.h
--- linux-2.6.37/include/net/inet_timewait_sock.h 2010-08-02 16:52:56.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/net/inet_timewait_sock.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/net/inet_timewait_sock.h 2010-11-23 02:09:41.000000000 +0100
@@ -117,6 +117,10 @@ struct inet_timewait_sock {
#define tw_hash __tw_common.skc_hash
#define tw_prot __tw_common.skc_prot
int tw_timeout;
volatile unsigned char tw_substate;
/* 3 bits hole, try to pack */
-diff -NurpP --minimal linux-2.6.37/include/net/route.h linux-2.6.37-vs2.3.0.37-rc1/include/net/route.h
+diff -NurpP --minimal linux-2.6.37/include/net/route.h linux-2.6.37-vs2.3.0.37-rc2/include/net/route.h
--- linux-2.6.37/include/net/route.h 2010-10-21 13:07:56.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/net/route.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/net/route.h 2010-11-23 02:09:41.000000000 +0100
@@ -145,6 +145,9 @@ static inline void ip_rt_put(struct rtab
dst_release(&rt->dst);
}
err = __ip_route_output_key(net, rp, &fl);
if (err)
return err;
-diff -NurpP --minimal linux-2.6.37/include/net/sock.h linux-2.6.37-vs2.3.0.37-rc1/include/net/sock.h
+diff -NurpP --minimal linux-2.6.37/include/net/sock.h linux-2.6.37-vs2.3.0.37-rc2/include/net/sock.h
--- linux-2.6.37/include/net/sock.h 2011-01-05 21:50:36.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/include/net/sock.h 2011-01-05 22:30:42.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/include/net/sock.h 2011-01-05 22:30:42.000000000 +0100
@@ -150,6 +150,10 @@ struct sock_common {
#ifdef CONFIG_NET_NS
struct net *skc_net;
kmemcheck_bitfield_begin(flags);
unsigned int sk_shutdown : 2,
sk_no_check : 2,
-diff -NurpP --minimal linux-2.6.37/init/Kconfig linux-2.6.37-vs2.3.0.37-rc1/init/Kconfig
+diff -NurpP --minimal linux-2.6.37/init/Kconfig linux-2.6.37-vs2.3.0.37-rc2/init/Kconfig
--- linux-2.6.37/init/Kconfig 2011-01-05 21:50:37.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/init/Kconfig 2011-01-05 22:30:42.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/init/Kconfig 2011-01-05 22:30:42.000000000 +0100
@@ -503,6 +503,7 @@ config HAVE_UNSTABLE_SCHED_CLOCK
menuconfig CGROUPS
boolean "Control Group support"
help
Provides a simple namespace cgroup subsystem to
provide hierarchical naming of sets of namespaces,
-diff -NurpP --minimal linux-2.6.37/init/main.c linux-2.6.37-vs2.3.0.37-rc1/init/main.c
+diff -NurpP --minimal linux-2.6.37/init/main.c linux-2.6.37-vs2.3.0.37-rc2/init/main.c
--- linux-2.6.37/init/main.c 2011-01-05 21:50:37.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/init/main.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/init/main.c 2010-11-23 02:09:41.000000000 +0100
@@ -67,6 +67,7 @@
#include <linux/sfi.h>
#include <linux/shmem_fs.h>
#include <asm/io.h>
#include <asm/bugs.h>
-diff -NurpP --minimal linux-2.6.37/ipc/mqueue.c linux-2.6.37-vs2.3.0.37-rc1/ipc/mqueue.c
+diff -NurpP --minimal linux-2.6.37/ipc/mqueue.c linux-2.6.37-vs2.3.0.37-rc2/ipc/mqueue.c
--- linux-2.6.37/ipc/mqueue.c 2011-01-05 21:50:37.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/ipc/mqueue.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/ipc/mqueue.c 2010-11-23 02:09:41.000000000 +0100
@@ -33,6 +33,8 @@
#include <linux/pid.h>
#include <linux/ipc_namespace.h>
free_uid(user);
}
if (ipc_ns)
-diff -NurpP --minimal linux-2.6.37/ipc/msg.c linux-2.6.37-vs2.3.0.37-rc1/ipc/msg.c
+diff -NurpP --minimal linux-2.6.37/ipc/msg.c linux-2.6.37-vs2.3.0.37-rc2/ipc/msg.c
--- linux-2.6.37/ipc/msg.c 2010-08-02 16:52:57.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/ipc/msg.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/ipc/msg.c 2010-11-23 02:09:41.000000000 +0100
@@ -37,6 +37,7 @@
#include <linux/rwsem.h>
#include <linux/nsproxy.h>
msq->q_perm.security = NULL;
retval = security_msg_queue_alloc(msq);
-diff -NurpP --minimal linux-2.6.37/ipc/namespace.c linux-2.6.37-vs2.3.0.37-rc1/ipc/namespace.c
+diff -NurpP --minimal linux-2.6.37/ipc/namespace.c linux-2.6.37-vs2.3.0.37-rc2/ipc/namespace.c
--- linux-2.6.37/ipc/namespace.c 2009-09-10 15:26:27.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/ipc/namespace.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/ipc/namespace.c 2010-11-23 02:09:41.000000000 +0100
@@ -11,6 +11,8 @@
#include <linux/slab.h>
#include <linux/fs.h>
#include "util.h"
-diff -NurpP --minimal linux-2.6.37/ipc/sem.c linux-2.6.37-vs2.3.0.37-rc1/ipc/sem.c
+diff -NurpP --minimal linux-2.6.37/ipc/sem.c linux-2.6.37-vs2.3.0.37-rc2/ipc/sem.c
--- linux-2.6.37/ipc/sem.c 2010-10-21 13:07:56.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/ipc/sem.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/ipc/sem.c 2010-11-23 02:09:41.000000000 +0100
@@ -86,6 +86,8 @@
#include <linux/rwsem.h>
#include <linux/nsproxy.h>
security_sem_free(sma);
ipc_rcu_putref(sma);
}
-diff -NurpP --minimal linux-2.6.37/ipc/shm.c linux-2.6.37-vs2.3.0.37-rc1/ipc/shm.c
+diff -NurpP --minimal linux-2.6.37/ipc/shm.c linux-2.6.37-vs2.3.0.37-rc2/ipc/shm.c
--- linux-2.6.37/ipc/shm.c 2011-01-05 21:50:37.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/ipc/shm.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/ipc/shm.c 2010-11-23 02:09:41.000000000 +0100
@@ -39,6 +39,8 @@
#include <linux/nsproxy.h>
#include <linux/mount.h>
return error;
no_id:
-diff -NurpP --minimal linux-2.6.37/kernel/capability.c linux-2.6.37-vs2.3.0.37-rc1/kernel/capability.c
+diff -NurpP --minimal linux-2.6.37/kernel/capability.c linux-2.6.37-vs2.3.0.37-rc2/kernel/capability.c
--- linux-2.6.37/kernel/capability.c 2010-08-02 16:52:57.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/kernel/capability.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/kernel/capability.c 2010-11-23 02:09:41.000000000 +0100
@@ -14,6 +14,7 @@
#include <linux/security.h>
#include <linux/syscalls.h>
if (unlikely(!cap_valid(cap))) {
printk(KERN_CRIT "capable() called with invalid cap=%u\n", cap);
BUG();
-diff -NurpP --minimal linux-2.6.37/kernel/compat.c linux-2.6.37-vs2.3.0.37-rc1/kernel/compat.c
+diff -NurpP --minimal linux-2.6.37/kernel/compat.c linux-2.6.37-vs2.3.0.37-rc2/kernel/compat.c
--- linux-2.6.37/kernel/compat.c 2010-10-21 13:07:56.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/kernel/compat.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/kernel/compat.c 2010-11-23 02:09:41.000000000 +0100
@@ -914,7 +914,7 @@ asmlinkage long compat_sys_stime(compat_
if (err)
return err;
return 0;
}
-diff -NurpP --minimal linux-2.6.37/kernel/cred.c linux-2.6.37-vs2.3.0.37-rc1/kernel/cred.c
+diff -NurpP --minimal linux-2.6.37/kernel/cred.c linux-2.6.37-vs2.3.0.37-rc2/kernel/cred.c
--- linux-2.6.37/kernel/cred.c 2011-01-05 21:50:37.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/kernel/cred.c 2011-01-05 22:46:34.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/kernel/cred.c 2011-01-08 03:33:34.000000000 +0100
@@ -60,31 +60,6 @@ struct cred init_cred = {
#endif
};
/*
* Dispose of the shared task group credentials
*/
-diff -NurpP --minimal linux-2.6.37/kernel/exit.c linux-2.6.37-vs2.3.0.37-rc1/kernel/exit.c
+diff -NurpP --minimal linux-2.6.37/kernel/exit.c linux-2.6.37-vs2.3.0.37-rc2/kernel/exit.c
--- linux-2.6.37/kernel/exit.c 2011-01-05 21:50:37.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/kernel/exit.c 2011-01-05 22:30:42.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/kernel/exit.c 2011-01-05 22:30:42.000000000 +0100
@@ -48,6 +48,10 @@
#include <linux/fs_struct.h>
#include <linux/init_task.h>
BUG();
/* Avoid "noreturn function does return". */
for (;;)
-diff -NurpP --minimal linux-2.6.37/kernel/fork.c linux-2.6.37-vs2.3.0.37-rc1/kernel/fork.c
+diff -NurpP --minimal linux-2.6.37/kernel/fork.c linux-2.6.37-vs2.3.0.37-rc2/kernel/fork.c
--- linux-2.6.37/kernel/fork.c 2011-01-05 21:50:37.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/kernel/fork.c 2011-01-05 22:30:42.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/kernel/fork.c 2011-01-05 22:30:42.000000000 +0100
@@ -66,6 +66,10 @@
#include <linux/posix-timers.h>
#include <linux/user-return-notifier.h>
write_unlock_irq(&tasklist_lock);
proc_fork_connector(p);
cgroup_post_fork(p);
-diff -NurpP --minimal linux-2.6.37/kernel/kthread.c linux-2.6.37-vs2.3.0.37-rc1/kernel/kthread.c
+diff -NurpP --minimal linux-2.6.37/kernel/kthread.c linux-2.6.37-vs2.3.0.37-rc2/kernel/kthread.c
--- linux-2.6.37/kernel/kthread.c 2011-01-05 21:50:38.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/kernel/kthread.c 2011-01-05 22:30:42.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/kernel/kthread.c 2011-01-05 22:30:42.000000000 +0100
@@ -16,6 +16,7 @@
#include <linux/mutex.h>
#include <linux/slab.h>
#include <trace/events/sched.h>
static DEFINE_SPINLOCK(kthread_create_lock);
-diff -NurpP --minimal linux-2.6.37/kernel/Makefile linux-2.6.37-vs2.3.0.37-rc1/kernel/Makefile
+diff -NurpP --minimal linux-2.6.37/kernel/Makefile linux-2.6.37-vs2.3.0.37-rc2/kernel/Makefile
--- linux-2.6.37/kernel/Makefile 2011-01-05 21:50:37.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/kernel/Makefile 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/kernel/Makefile 2010-11-23 02:09:41.000000000 +0100
@@ -25,6 +25,7 @@ CFLAGS_REMOVE_perf_event.o = -pg
CFLAGS_REMOVE_irq_work.o = -pg
endif
obj-$(CONFIG_FREEZER) += freezer.o
obj-$(CONFIG_PROFILING) += profile.o
obj-$(CONFIG_SYSCTL_SYSCALL_CHECK) += sysctl_check.o
-diff -NurpP --minimal linux-2.6.37/kernel/nsproxy.c linux-2.6.37-vs2.3.0.37-rc1/kernel/nsproxy.c
+diff -NurpP --minimal linux-2.6.37/kernel/nsproxy.c linux-2.6.37-vs2.3.0.37-rc2/kernel/nsproxy.c
--- linux-2.6.37/kernel/nsproxy.c 2010-07-07 18:31:57.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/kernel/nsproxy.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/kernel/nsproxy.c 2010-11-23 02:09:41.000000000 +0100
@@ -20,6 +20,8 @@
#include <linux/mnt_namespace.h>
#include <linux/utsname.h>
return -EPERM;
*new_nsp = create_new_namespaces(unshare_flags, current,
-diff -NurpP --minimal linux-2.6.37/kernel/pid.c linux-2.6.37-vs2.3.0.37-rc1/kernel/pid.c
+diff -NurpP --minimal linux-2.6.37/kernel/pid.c linux-2.6.37-vs2.3.0.37-rc2/kernel/pid.c
--- linux-2.6.37/kernel/pid.c 2011-01-05 21:50:38.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/kernel/pid.c 2010-11-23 02:37:26.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/kernel/pid.c 2010-11-23 02:37:26.000000000 +0100
@@ -36,6 +36,7 @@
#include <linux/pid_namespace.h>
#include <linux/init_task.h>
pid_t pid_vnr(struct pid *pid)
{
return pid_nr_ns(pid, current->nsproxy->pid_ns);
-diff -NurpP --minimal linux-2.6.37/kernel/pid_namespace.c linux-2.6.37-vs2.3.0.37-rc1/kernel/pid_namespace.c
+diff -NurpP --minimal linux-2.6.37/kernel/pid_namespace.c linux-2.6.37-vs2.3.0.37-rc2/kernel/pid_namespace.c
--- linux-2.6.37/kernel/pid_namespace.c 2010-07-07 18:31:57.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/kernel/pid_namespace.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/kernel/pid_namespace.c 2010-11-23 02:09:41.000000000 +0100
@@ -14,6 +14,7 @@
#include <linux/err.h>
#include <linux/acct.h>
kmem_cache_free(pid_ns_cachep, ns);
}
-diff -NurpP --minimal linux-2.6.37/kernel/posix-timers.c linux-2.6.37-vs2.3.0.37-rc1/kernel/posix-timers.c
+diff -NurpP --minimal linux-2.6.37/kernel/posix-timers.c linux-2.6.37-vs2.3.0.37-rc2/kernel/posix-timers.c
--- linux-2.6.37/kernel/posix-timers.c 2010-10-21 13:07:57.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/kernel/posix-timers.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/kernel/posix-timers.c 2010-11-23 02:09:41.000000000 +0100
@@ -46,6 +46,7 @@
#include <linux/wait.h>
#include <linux/workqueue.h>
/* If we failed to send the signal the timer stops. */
return ret > 0;
}
-diff -NurpP --minimal linux-2.6.37/kernel/printk.c linux-2.6.37-vs2.3.0.37-rc1/kernel/printk.c
+diff -NurpP --minimal linux-2.6.37/kernel/printk.c linux-2.6.37-vs2.3.0.37-rc2/kernel/printk.c
--- linux-2.6.37/kernel/printk.c 2011-01-05 21:50:38.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/kernel/printk.c 2011-01-05 22:30:42.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/kernel/printk.c 2011-01-05 22:30:42.000000000 +0100
@@ -39,6 +39,7 @@
#include <linux/syslog.h>
#include <linux/cpu.h>
count = len;
if (count > log_buf_len)
count = log_buf_len;
-diff -NurpP --minimal linux-2.6.37/kernel/ptrace.c linux-2.6.37-vs2.3.0.37-rc1/kernel/ptrace.c
+diff -NurpP --minimal linux-2.6.37/kernel/ptrace.c linux-2.6.37-vs2.3.0.37-rc2/kernel/ptrace.c
--- linux-2.6.37/kernel/ptrace.c 2011-01-05 21:50:38.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/kernel/ptrace.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/kernel/ptrace.c 2010-11-23 02:09:41.000000000 +0100
@@ -22,6 +22,7 @@
#include <linux/syscalls.h>
#include <linux/uaccess.h>
if (request == PTRACE_ATTACH) {
ret = ptrace_attach(child);
/*
-diff -NurpP --minimal linux-2.6.37/kernel/sched.c linux-2.6.37-vs2.3.0.37-rc1/kernel/sched.c
+diff -NurpP --minimal linux-2.6.37/kernel/sched.c linux-2.6.37-vs2.3.0.37-rc2/kernel/sched.c
--- linux-2.6.37/kernel/sched.c 2011-01-05 21:50:38.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/kernel/sched.c 2011-01-05 22:30:42.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/kernel/sched.c 2011-01-05 22:30:42.000000000 +0100
@@ -72,6 +72,8 @@
#include <linux/ctype.h>
#include <linux/ftrace.h>
retval = security_task_setnice(current, nice);
if (retval)
-diff -NurpP --minimal linux-2.6.37/kernel/sched_fair.c linux-2.6.37-vs2.3.0.37-rc1/kernel/sched_fair.c
+diff -NurpP --minimal linux-2.6.37/kernel/sched_fair.c linux-2.6.37-vs2.3.0.37-rc2/kernel/sched_fair.c
--- linux-2.6.37/kernel/sched_fair.c 2011-01-05 21:50:38.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/kernel/sched_fair.c 2011-01-05 22:30:42.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/kernel/sched_fair.c 2011-01-05 22:30:42.000000000 +0100
@@ -782,6 +782,9 @@ enqueue_entity(struct cfs_rq *cfs_rq, st
check_spread(cfs_rq, se);
if (se != cfs_rq->curr)
account_entity_dequeue(cfs_rq, se);
update_min_vruntime(cfs_rq);
-diff -NurpP --minimal linux-2.6.37/kernel/signal.c linux-2.6.37-vs2.3.0.37-rc1/kernel/signal.c
+diff -NurpP --minimal linux-2.6.37/kernel/signal.c linux-2.6.37-vs2.3.0.37-rc2/kernel/signal.c
--- linux-2.6.37/kernel/signal.c 2011-01-05 21:50:38.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/kernel/signal.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/kernel/signal.c 2010-11-23 02:09:41.000000000 +0100
@@ -28,6 +28,8 @@
#include <linux/freezer.h>
#include <linux/pid_namespace.h>
if (sig_kernel_stop(signr)) {
/*
* The default action is to stop all threads in
-diff -NurpP --minimal linux-2.6.37/kernel/softirq.c linux-2.6.37-vs2.3.0.37-rc1/kernel/softirq.c
+diff -NurpP --minimal linux-2.6.37/kernel/softirq.c linux-2.6.37-vs2.3.0.37-rc2/kernel/softirq.c
--- linux-2.6.37/kernel/softirq.c 2011-01-05 21:50:38.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/kernel/softirq.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/kernel/softirq.c 2010-11-23 02:09:41.000000000 +0100
@@ -24,6 +24,7 @@
#include <linux/ftrace.h>
#include <linux/smp.h>
#define CREATE_TRACE_POINTS
#include <trace/events/irq.h>
-diff -NurpP --minimal linux-2.6.37/kernel/sys.c linux-2.6.37-vs2.3.0.37-rc1/kernel/sys.c
+diff -NurpP --minimal linux-2.6.37/kernel/sys.c linux-2.6.37-vs2.3.0.37-rc2/kernel/sys.c
--- linux-2.6.37/kernel/sys.c 2010-10-21 13:07:57.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/kernel/sys.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/kernel/sys.c 2010-11-23 02:09:41.000000000 +0100
@@ -42,6 +42,7 @@
#include <linux/syscalls.h>
#include <linux/kprobes.h>
return -EPERM;
}
-diff -NurpP --minimal linux-2.6.37/kernel/sysctl_binary.c linux-2.6.37-vs2.3.0.37-rc1/kernel/sysctl_binary.c
+diff -NurpP --minimal linux-2.6.37/kernel/sysctl_binary.c linux-2.6.37-vs2.3.0.37-rc2/kernel/sysctl_binary.c
--- linux-2.6.37/kernel/sysctl_binary.c 2010-08-02 16:52:57.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/kernel/sysctl_binary.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/kernel/sysctl_binary.c 2010-11-23 02:09:41.000000000 +0100
@@ -73,6 +73,7 @@ static const struct bin_table bin_kern_t
{ CTL_INT, KERN_PANIC, "panic" },
{ CTL_STR, KERN_SPARC_REBOOT, "reboot-cmd" },
{ CTL_INT, KERN_CTLALTDEL, "ctrl-alt-del" },
-diff -NurpP --minimal linux-2.6.37/kernel/sysctl.c linux-2.6.37-vs2.3.0.37-rc1/kernel/sysctl.c
+diff -NurpP --minimal linux-2.6.37/kernel/sysctl.c linux-2.6.37-vs2.3.0.37-rc2/kernel/sysctl.c
--- linux-2.6.37/kernel/sysctl.c 2011-01-05 21:50:39.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/kernel/sysctl.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/kernel/sysctl.c 2010-11-23 02:09:41.000000000 +0100
@@ -73,6 +73,7 @@
#if defined(CONFIG_PROVE_LOCKING) || defined(CONFIG_LOCK_STAT)
#include <linux/lockdep.h>
#ifdef CONFIG_CHR_DEV_SG
{
.procname = "sg-big-buff",
-diff -NurpP --minimal linux-2.6.37/kernel/time/timekeeping.c linux-2.6.37-vs2.3.0.37-rc1/kernel/time/timekeeping.c
+diff -NurpP --minimal linux-2.6.37/kernel/time/timekeeping.c linux-2.6.37-vs2.3.0.37-rc2/kernel/time/timekeeping.c
--- linux-2.6.37/kernel/time/timekeeping.c 2010-10-21 13:07:57.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/kernel/time/timekeeping.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/kernel/time/timekeeping.c 2010-11-23 02:09:41.000000000 +0100
@@ -229,6 +229,7 @@ void getnstimeofday(struct timespec *ts)
} while (read_seqretry(&xtime_lock, seq));
}
EXPORT_SYMBOL(getnstimeofday);
-diff -NurpP --minimal linux-2.6.37/kernel/time.c linux-2.6.37-vs2.3.0.37-rc1/kernel/time.c
+diff -NurpP --minimal linux-2.6.37/kernel/time.c linux-2.6.37-vs2.3.0.37-rc2/kernel/time.c
--- linux-2.6.37/kernel/time.c 2010-10-21 13:07:57.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/kernel/time.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/kernel/time.c 2010-11-23 02:09:41.000000000 +0100
@@ -92,7 +92,7 @@ SYSCALL_DEFINE1(stime, time_t __user *,
if (err)
return err;
}
return 0;
}
-diff -NurpP --minimal linux-2.6.37/kernel/timer.c linux-2.6.37-vs2.3.0.37-rc1/kernel/timer.c
+diff -NurpP --minimal linux-2.6.37/kernel/timer.c linux-2.6.37-vs2.3.0.37-rc2/kernel/timer.c
--- linux-2.6.37/kernel/timer.c 2011-01-05 21:50:39.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/kernel/timer.c 2011-01-05 22:30:42.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/kernel/timer.c 2011-01-05 22:30:42.000000000 +0100
@@ -40,6 +40,10 @@
#include <linux/irq_work.h>
#include <linux/sched.h>
SYSCALL_DEFINE0(getuid)
{
/* Only we change this so SMP safe */
-diff -NurpP --minimal linux-2.6.37/kernel/user_namespace.c linux-2.6.37-vs2.3.0.37-rc1/kernel/user_namespace.c
+diff -NurpP --minimal linux-2.6.37/kernel/user_namespace.c linux-2.6.37-vs2.3.0.37-rc2/kernel/user_namespace.c
--- linux-2.6.37/kernel/user_namespace.c 2010-10-21 13:07:57.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/kernel/user_namespace.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/kernel/user_namespace.c 2010-11-23 02:09:41.000000000 +0100
@@ -11,6 +11,7 @@
#include <linux/user_namespace.h>
#include <linux/highuid.h>
INIT_WORK(&ns->destroyer, free_user_ns_work);
schedule_work(&ns->destroyer);
}
-diff -NurpP --minimal linux-2.6.37/kernel/utsname.c linux-2.6.37-vs2.3.0.37-rc1/kernel/utsname.c
+diff -NurpP --minimal linux-2.6.37/kernel/utsname.c linux-2.6.37-vs2.3.0.37-rc2/kernel/utsname.c
--- linux-2.6.37/kernel/utsname.c 2009-09-10 15:26:28.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/kernel/utsname.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/kernel/utsname.c 2010-11-23 02:09:41.000000000 +0100
@@ -14,14 +14,17 @@
#include <linux/utsname.h>
#include <linux/err.h>
+ atomic_dec(&vs_global_uts_ns);
kfree(ns);
}
-diff -NurpP --minimal linux-2.6.37/kernel/vserver/cacct.c linux-2.6.37-vs2.3.0.37-rc1/kernel/vserver/cacct.c
+diff -NurpP --minimal linux-2.6.37/kernel/vserver/cacct.c linux-2.6.37-vs2.3.0.37-rc2/kernel/vserver/cacct.c
--- linux-2.6.37/kernel/vserver/cacct.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/kernel/vserver/cacct.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/kernel/vserver/cacct.c 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,42 @@
+/*
+ * linux/kernel/vserver/cacct.c
+ return 0;
+}
+
-diff -NurpP --minimal linux-2.6.37/kernel/vserver/cacct_init.h linux-2.6.37-vs2.3.0.37-rc1/kernel/vserver/cacct_init.h
+diff -NurpP --minimal linux-2.6.37/kernel/vserver/cacct_init.h linux-2.6.37-vs2.3.0.37-rc2/kernel/vserver/cacct_init.h
--- linux-2.6.37/kernel/vserver/cacct_init.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/kernel/vserver/cacct_init.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/kernel/vserver/cacct_init.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,25 @@
+
+
+ return;
+}
+
-diff -NurpP --minimal linux-2.6.37/kernel/vserver/cacct_proc.h linux-2.6.37-vs2.3.0.37-rc1/kernel/vserver/cacct_proc.h
+diff -NurpP --minimal linux-2.6.37/kernel/vserver/cacct_proc.h linux-2.6.37-vs2.3.0.37-rc2/kernel/vserver/cacct_proc.h
--- linux-2.6.37/kernel/vserver/cacct_proc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/kernel/vserver/cacct_proc.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/kernel/vserver/cacct_proc.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,53 @@
+#ifndef _VX_CACCT_PROC_H
+#define _VX_CACCT_PROC_H
+}
+
+#endif /* _VX_CACCT_PROC_H */
-diff -NurpP --minimal linux-2.6.37/kernel/vserver/context.c linux-2.6.37-vs2.3.0.37-rc1/kernel/vserver/context.c
+diff -NurpP --minimal linux-2.6.37/kernel/vserver/context.c linux-2.6.37-vs2.3.0.37-rc2/kernel/vserver/context.c
--- linux-2.6.37/kernel/vserver/context.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/kernel/vserver/context.c 2011-01-05 22:46:44.000000000 +0100
-@@ -0,0 +1,1087 @@
++++ linux-2.6.37-vs2.3.0.37-rc2/kernel/vserver/context.c 2011-01-08 03:38:49.000000000 +0100
+@@ -0,0 +1,1088 @@
+/*
+ * linux/kernel/vserver/context.c
+ *
+ space->vx_fs = &init_fs;
+
+ /* FIXME: do we want defaults? */
-+ space->vx_real_cred = 0;
-+ space->vx_cred = 0;
++ // space->vx_real_cred = 0;
++ // space->vx_cred = 0;
+ }
+
+
+ spin_unlock(&fs->lock);
+ if (kill)
+ free_fs_struct(fs);
-+
++#if 0
+ cred = xchg(&space->vx_real_cred, NULL);
+ if (cred) {
+ alter_cred_subscribers(cred, -1);
+ alter_cred_subscribers(cred, -1);
+ put_cred(cred);
+ }
++#endif
+ }
+}
+
+
+ BUG_ON(space->vx_nsproxy);
+ BUG_ON(space->vx_fs);
-+ BUG_ON(space->vx_real_cred);
-+ BUG_ON(space->vx_cred);
++ // BUG_ON(space->vx_real_cred);
++ // BUG_ON(space->vx_cred);
+ }
+
+ spin_lock_irqsave(&vx_info_inactive_lock, flags);
+
+EXPORT_SYMBOL_GPL(free_vx_info);
+
-diff -NurpP --minimal linux-2.6.37/kernel/vserver/cvirt.c linux-2.6.37-vs2.3.0.37-rc1/kernel/vserver/cvirt.c
+diff -NurpP --minimal linux-2.6.37/kernel/vserver/cvirt.c linux-2.6.37-vs2.3.0.37-rc2/kernel/vserver/cvirt.c
--- linux-2.6.37/kernel/vserver/cvirt.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/kernel/vserver/cvirt.c 2011-01-05 22:46:44.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/kernel/vserver/cvirt.c 2011-01-08 03:33:34.000000000 +0100
@@ -0,0 +1,303 @@
+/*
+ * linux/kernel/vserver/cvirt.c
+
+#endif
+
-diff -NurpP --minimal linux-2.6.37/kernel/vserver/cvirt_init.h linux-2.6.37-vs2.3.0.37-rc1/kernel/vserver/cvirt_init.h
+diff -NurpP --minimal linux-2.6.37/kernel/vserver/cvirt_init.h linux-2.6.37-vs2.3.0.37-rc2/kernel/vserver/cvirt_init.h
--- linux-2.6.37/kernel/vserver/cvirt_init.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/kernel/vserver/cvirt_init.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/kernel/vserver/cvirt_init.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,69 @@
+
+
+ return;
+}
+
-diff -NurpP --minimal linux-2.6.37/kernel/vserver/cvirt_proc.h linux-2.6.37-vs2.3.0.37-rc1/kernel/vserver/cvirt_proc.h
+diff -NurpP --minimal linux-2.6.37/kernel/vserver/cvirt_proc.h linux-2.6.37-vs2.3.0.37-rc2/kernel/vserver/cvirt_proc.h
--- linux-2.6.37/kernel/vserver/cvirt_proc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/kernel/vserver/cvirt_proc.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/kernel/vserver/cvirt_proc.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,135 @@
+#ifndef _VX_CVIRT_PROC_H
+#define _VX_CVIRT_PROC_H
+}
+
+#endif /* _VX_CVIRT_PROC_H */
-diff -NurpP --minimal linux-2.6.37/kernel/vserver/debug.c linux-2.6.37-vs2.3.0.37-rc1/kernel/vserver/debug.c
+diff -NurpP --minimal linux-2.6.37/kernel/vserver/debug.c linux-2.6.37-vs2.3.0.37-rc2/kernel/vserver/debug.c
--- linux-2.6.37/kernel/vserver/debug.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/kernel/vserver/debug.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/kernel/vserver/debug.c 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,32 @@
+/*
+ * kernel/vserver/debug.c
+
+EXPORT_SYMBOL_GPL(dump_vx_info);
+
-diff -NurpP --minimal linux-2.6.37/kernel/vserver/device.c linux-2.6.37-vs2.3.0.37-rc1/kernel/vserver/device.c
+diff -NurpP --minimal linux-2.6.37/kernel/vserver/device.c linux-2.6.37-vs2.3.0.37-rc2/kernel/vserver/device.c
--- linux-2.6.37/kernel/vserver/device.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/kernel/vserver/device.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/kernel/vserver/device.c 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,443 @@
+/*
+ * linux/kernel/vserver/device.c
+#endif /* CONFIG_COMPAT */
+
+
-diff -NurpP --minimal linux-2.6.37/kernel/vserver/dlimit.c linux-2.6.37-vs2.3.0.37-rc1/kernel/vserver/dlimit.c
+diff -NurpP --minimal linux-2.6.37/kernel/vserver/dlimit.c linux-2.6.37-vs2.3.0.37-rc2/kernel/vserver/dlimit.c
--- linux-2.6.37/kernel/vserver/dlimit.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/kernel/vserver/dlimit.c 2011-01-05 23:26:15.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/kernel/vserver/dlimit.c 2011-01-05 23:26:15.000000000 +0100
@@ -0,0 +1,531 @@
+/*
+ * linux/kernel/vserver/dlimit.c
+EXPORT_SYMBOL_GPL(locate_dl_info);
+EXPORT_SYMBOL_GPL(rcu_free_dl_info);
+
-diff -NurpP --minimal linux-2.6.37/kernel/vserver/helper.c linux-2.6.37-vs2.3.0.37-rc1/kernel/vserver/helper.c
+diff -NurpP --minimal linux-2.6.37/kernel/vserver/helper.c linux-2.6.37-vs2.3.0.37-rc2/kernel/vserver/helper.c
--- linux-2.6.37/kernel/vserver/helper.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/kernel/vserver/helper.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/kernel/vserver/helper.c 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,223 @@
+/*
+ * linux/kernel/vserver/helper.c
+ return do_vshelper(vshelper_path, argv, envp, 1);
+}
+
-diff -NurpP --minimal linux-2.6.37/kernel/vserver/history.c linux-2.6.37-vs2.3.0.37-rc1/kernel/vserver/history.c
+diff -NurpP --minimal linux-2.6.37/kernel/vserver/history.c linux-2.6.37-vs2.3.0.37-rc2/kernel/vserver/history.c
--- linux-2.6.37/kernel/vserver/history.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/kernel/vserver/history.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/kernel/vserver/history.c 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,258 @@
+/*
+ * kernel/vserver/history.c
+
+#endif /* CONFIG_COMPAT */
+
-diff -NurpP --minimal linux-2.6.37/kernel/vserver/inet.c linux-2.6.37-vs2.3.0.37-rc1/kernel/vserver/inet.c
+diff -NurpP --minimal linux-2.6.37/kernel/vserver/inet.c linux-2.6.37-vs2.3.0.37-rc2/kernel/vserver/inet.c
--- linux-2.6.37/kernel/vserver/inet.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/kernel/vserver/inet.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/kernel/vserver/inet.c 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,224 @@
+
+#include <linux/in.h>
+
+EXPORT_SYMBOL_GPL(ip_v4_find_src);
+
-diff -NurpP --minimal linux-2.6.37/kernel/vserver/init.c linux-2.6.37-vs2.3.0.37-rc1/kernel/vserver/init.c
+diff -NurpP --minimal linux-2.6.37/kernel/vserver/init.c linux-2.6.37-vs2.3.0.37-rc2/kernel/vserver/init.c
--- linux-2.6.37/kernel/vserver/init.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/kernel/vserver/init.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/kernel/vserver/init.c 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,45 @@
+/*
+ * linux/kernel/init.c
+module_init(init_vserver);
+module_exit(exit_vserver);
+
-diff -NurpP --minimal linux-2.6.37/kernel/vserver/inode.c linux-2.6.37-vs2.3.0.37-rc1/kernel/vserver/inode.c
+diff -NurpP --minimal linux-2.6.37/kernel/vserver/inode.c linux-2.6.37-vs2.3.0.37-rc2/kernel/vserver/inode.c
--- linux-2.6.37/kernel/vserver/inode.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/kernel/vserver/inode.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/kernel/vserver/inode.c 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,435 @@
+/*
+ * linux/kernel/vserver/inode.c
+
+#endif /* CONFIG_PROPAGATE */
+
-diff -NurpP --minimal linux-2.6.37/kernel/vserver/Kconfig linux-2.6.37-vs2.3.0.37-rc1/kernel/vserver/Kconfig
+diff -NurpP --minimal linux-2.6.37/kernel/vserver/Kconfig linux-2.6.37-vs2.3.0.37-rc2/kernel/vserver/Kconfig
--- linux-2.6.37/kernel/vserver/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/kernel/vserver/Kconfig 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/kernel/vserver/Kconfig 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,265 @@
+#
+# Linux VServer configuration
+ default y
+ select SECURITY_CAPABILITIES
+
-diff -NurpP --minimal linux-2.6.37/kernel/vserver/limit.c linux-2.6.37-vs2.3.0.37-rc1/kernel/vserver/limit.c
+diff -NurpP --minimal linux-2.6.37/kernel/vserver/limit.c linux-2.6.37-vs2.3.0.37-rc2/kernel/vserver/limit.c
--- linux-2.6.37/kernel/vserver/limit.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/kernel/vserver/limit.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/kernel/vserver/limit.c 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,354 @@
+/*
+ * linux/kernel/vserver/limit.c
+ return points;
+}
+
-diff -NurpP --minimal linux-2.6.37/kernel/vserver/limit_init.h linux-2.6.37-vs2.3.0.37-rc1/kernel/vserver/limit_init.h
+diff -NurpP --minimal linux-2.6.37/kernel/vserver/limit_init.h linux-2.6.37-vs2.3.0.37-rc2/kernel/vserver/limit_init.h
--- linux-2.6.37/kernel/vserver/limit_init.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/kernel/vserver/limit_init.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/kernel/vserver/limit_init.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,31 @@
+
+
+ }
+}
+
-diff -NurpP --minimal linux-2.6.37/kernel/vserver/limit_proc.h linux-2.6.37-vs2.3.0.37-rc1/kernel/vserver/limit_proc.h
+diff -NurpP --minimal linux-2.6.37/kernel/vserver/limit_proc.h linux-2.6.37-vs2.3.0.37-rc2/kernel/vserver/limit_proc.h
--- linux-2.6.37/kernel/vserver/limit_proc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/kernel/vserver/limit_proc.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/kernel/vserver/limit_proc.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,57 @@
+#ifndef _VX_LIMIT_PROC_H
+#define _VX_LIMIT_PROC_H
+#endif /* _VX_LIMIT_PROC_H */
+
+
-diff -NurpP --minimal linux-2.6.37/kernel/vserver/Makefile linux-2.6.37-vs2.3.0.37-rc1/kernel/vserver/Makefile
+diff -NurpP --minimal linux-2.6.37/kernel/vserver/Makefile linux-2.6.37-vs2.3.0.37-rc2/kernel/vserver/Makefile
--- linux-2.6.37/kernel/vserver/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/kernel/vserver/Makefile 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/kernel/vserver/Makefile 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,18 @@
+#
+# Makefile for the Linux vserver routines.
+vserver-$(CONFIG_VSERVER_MONITOR) += monitor.o
+vserver-$(CONFIG_VSERVER_DEVICE) += device.o
+
-diff -NurpP --minimal linux-2.6.37/kernel/vserver/network.c linux-2.6.37-vs2.3.0.37-rc1/kernel/vserver/network.c
+diff -NurpP --minimal linux-2.6.37/kernel/vserver/network.c linux-2.6.37-vs2.3.0.37-rc2/kernel/vserver/network.c
--- linux-2.6.37/kernel/vserver/network.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/kernel/vserver/network.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/kernel/vserver/network.c 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,864 @@
+/*
+ * linux/kernel/vserver/network.c
+EXPORT_SYMBOL_GPL(free_nx_info);
+EXPORT_SYMBOL_GPL(unhash_nx_info);
+
-diff -NurpP --minimal linux-2.6.37/kernel/vserver/proc.c linux-2.6.37-vs2.3.0.37-rc1/kernel/vserver/proc.c
+diff -NurpP --minimal linux-2.6.37/kernel/vserver/proc.c linux-2.6.37-vs2.3.0.37-rc2/kernel/vserver/proc.c
--- linux-2.6.37/kernel/vserver/proc.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/kernel/vserver/proc.c 2011-01-05 22:46:44.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/kernel/vserver/proc.c 2011-01-08 03:33:34.000000000 +0100
@@ -0,0 +1,1098 @@
+/*
+ * linux/kernel/vserver/proc.c
+ return buffer - orig;
+}
+
-diff -NurpP --minimal linux-2.6.37/kernel/vserver/sched.c linux-2.6.37-vs2.3.0.37-rc1/kernel/vserver/sched.c
+diff -NurpP --minimal linux-2.6.37/kernel/vserver/sched.c linux-2.6.37-vs2.3.0.37-rc2/kernel/vserver/sched.c
--- linux-2.6.37/kernel/vserver/sched.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/kernel/vserver/sched.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/kernel/vserver/sched.c 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,82 @@
+/*
+ * linux/kernel/vserver/sched.c
+ return 0;
+}
+
-diff -NurpP --minimal linux-2.6.37/kernel/vserver/sched_init.h linux-2.6.37-vs2.3.0.37-rc1/kernel/vserver/sched_init.h
+diff -NurpP --minimal linux-2.6.37/kernel/vserver/sched_init.h linux-2.6.37-vs2.3.0.37-rc2/kernel/vserver/sched_init.h
--- linux-2.6.37/kernel/vserver/sched_init.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/kernel/vserver/sched_init.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/kernel/vserver/sched_init.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,27 @@
+
+static inline void vx_info_init_sched(struct _vx_sched *sched)
+{
+ return;
+}
-diff -NurpP --minimal linux-2.6.37/kernel/vserver/sched_proc.h linux-2.6.37-vs2.3.0.37-rc1/kernel/vserver/sched_proc.h
+diff -NurpP --minimal linux-2.6.37/kernel/vserver/sched_proc.h linux-2.6.37-vs2.3.0.37-rc2/kernel/vserver/sched_proc.h
--- linux-2.6.37/kernel/vserver/sched_proc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/kernel/vserver/sched_proc.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/kernel/vserver/sched_proc.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,32 @@
+#ifndef _VX_SCHED_PROC_H
+#define _VX_SCHED_PROC_H
+}
+
+#endif /* _VX_SCHED_PROC_H */
-diff -NurpP --minimal linux-2.6.37/kernel/vserver/signal.c linux-2.6.37-vs2.3.0.37-rc1/kernel/vserver/signal.c
+diff -NurpP --minimal linux-2.6.37/kernel/vserver/signal.c linux-2.6.37-vs2.3.0.37-rc2/kernel/vserver/signal.c
--- linux-2.6.37/kernel/vserver/signal.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/kernel/vserver/signal.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/kernel/vserver/signal.c 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,132 @@
+/*
+ * linux/kernel/vserver/signal.c
+ return ret;
+}
+
-diff -NurpP --minimal linux-2.6.37/kernel/vserver/space.c linux-2.6.37-vs2.3.0.37-rc1/kernel/vserver/space.c
+diff -NurpP --minimal linux-2.6.37/kernel/vserver/space.c linux-2.6.37-vs2.3.0.37-rc2/kernel/vserver/space.c
--- linux-2.6.37/kernel/vserver/space.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/kernel/vserver/space.c 2011-01-05 22:46:44.000000000 +0100
-@@ -0,0 +1,433 @@
++++ linux-2.6.37-vs2.3.0.37-rc2/kernel/vserver/space.c 2011-01-08 04:03:49.000000000 +0100
+@@ -0,0 +1,441 @@
+/*
+ * linux/kernel/vserver/space.c
+ *
+
+ if (mask & CLONE_NEWUSER) {
+ vxdprintk(VXD_CBIT(space, 10),
++#if 1
++ "vx_enter_space(%p[#%u])", vxi, vxi->vx_id);
++#else
+ "vx_enter_space(%p[#%u],%p,%p) cred (%p,%p)",
+ vxi, vxi->vx_id,
+ space->vx_real_cred, space->vx_cred,
+ alter_cred_subscribers(current->real_cred, 1);
+ current->cred = get_cred(space->vx_cred);
+ alter_cred_subscribers(current->cred, 1);
++#endif
+ }
+
+ ret = 0;
+ space->vx_nsmask |= mask;
+
+ if (mask & CLONE_NEWUSER) {
-+ const struct cred *cred;
++ // const struct cred *cred;
+
+ vxdprintk(VXD_CBIT(space, 10),
++#if 1
++ "vx_set_space(%p[#%u])", vxi, vxi->vx_id);
++#else
+ "vx_set_space(%p[#%u],%p,%p) cred (%p,%p)",
+ vxi, vxi->vx_id,
+ space->vx_real_cred, space->vx_cred,
+ alter_cred_subscribers(cred, -1);
+ put_cred(cred);
+ }
++#endif
+ }
+
+ ret = 0;
+ return 0;
+}
+
-diff -NurpP --minimal linux-2.6.37/kernel/vserver/switch.c linux-2.6.37-vs2.3.0.37-rc1/kernel/vserver/switch.c
+diff -NurpP --minimal linux-2.6.37/kernel/vserver/switch.c linux-2.6.37-vs2.3.0.37-rc2/kernel/vserver/switch.c
--- linux-2.6.37/kernel/vserver/switch.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/kernel/vserver/switch.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/kernel/vserver/switch.c 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,531 @@
+/*
+ * linux/kernel/vserver/switch.c
+}
+
+#endif /* CONFIG_COMPAT */
-diff -NurpP --minimal linux-2.6.37/kernel/vserver/sysctl.c linux-2.6.37-vs2.3.0.37-rc1/kernel/vserver/sysctl.c
+diff -NurpP --minimal linux-2.6.37/kernel/vserver/sysctl.c linux-2.6.37-vs2.3.0.37-rc2/kernel/vserver/sysctl.c
--- linux-2.6.37/kernel/vserver/sysctl.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/kernel/vserver/sysctl.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/kernel/vserver/sysctl.c 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,241 @@
+/*
+ * kernel/vserver/sysctl.c
+EXPORT_SYMBOL_GPL(vx_debug_space);
+EXPORT_SYMBOL_GPL(vx_debug_misc);
+
-diff -NurpP --minimal linux-2.6.37/kernel/vserver/tag.c linux-2.6.37-vs2.3.0.37-rc1/kernel/vserver/tag.c
+diff -NurpP --minimal linux-2.6.37/kernel/vserver/tag.c linux-2.6.37-vs2.3.0.37-rc2/kernel/vserver/tag.c
--- linux-2.6.37/kernel/vserver/tag.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/kernel/vserver/tag.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/kernel/vserver/tag.c 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,63 @@
+/*
+ * linux/kernel/vserver/tag.c
+}
+
+
-diff -NurpP --minimal linux-2.6.37/kernel/vserver/vci_config.h linux-2.6.37-vs2.3.0.37-rc1/kernel/vserver/vci_config.h
+diff -NurpP --minimal linux-2.6.37/kernel/vserver/vci_config.h linux-2.6.37-vs2.3.0.37-rc2/kernel/vserver/vci_config.h
--- linux-2.6.37/kernel/vserver/vci_config.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/kernel/vserver/vci_config.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/kernel/vserver/vci_config.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,82 @@
+
+/* interface version */
+ 0;
+}
+
-diff -NurpP --minimal linux-2.6.37/mm/filemap_xip.c linux-2.6.37-vs2.3.0.37-rc1/mm/filemap_xip.c
+diff -NurpP --minimal linux-2.6.37/mm/filemap_xip.c linux-2.6.37-vs2.3.0.37-rc2/mm/filemap_xip.c
--- linux-2.6.37/mm/filemap_xip.c 2010-07-07 18:31:58.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/mm/filemap_xip.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/mm/filemap_xip.c 2010-11-23 02:09:41.000000000 +0100
@@ -18,6 +18,7 @@
#include <linux/seqlock.h>
#include <linux/mutex.h>
#include <asm/tlbflush.h>
#include <asm/io.h>
-diff -NurpP --minimal linux-2.6.37/mm/fremap.c linux-2.6.37-vs2.3.0.37-rc1/mm/fremap.c
+diff -NurpP --minimal linux-2.6.37/mm/fremap.c linux-2.6.37-vs2.3.0.37-rc2/mm/fremap.c
--- linux-2.6.37/mm/fremap.c 2010-10-21 13:07:57.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/mm/fremap.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/mm/fremap.c 2010-11-23 02:09:41.000000000 +0100
@@ -16,6 +16,7 @@
#include <linux/module.h>
#include <linux/syscalls.h>
#include <asm/mmu_context.h>
#include <asm/cacheflush.h>
-diff -NurpP --minimal linux-2.6.37/mm/hugetlb.c linux-2.6.37-vs2.3.0.37-rc1/mm/hugetlb.c
+diff -NurpP --minimal linux-2.6.37/mm/hugetlb.c linux-2.6.37-vs2.3.0.37-rc2/mm/hugetlb.c
--- linux-2.6.37/mm/hugetlb.c 2011-01-05 21:50:39.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/mm/hugetlb.c 2011-01-05 22:30:43.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/mm/hugetlb.c 2011-01-05 22:30:43.000000000 +0100
@@ -28,6 +28,7 @@
#include <linux/hugetlb.h>
#include "internal.h"
const unsigned long hugetlb_zero = 0, hugetlb_infinity = ~0UL;
-diff -NurpP --minimal linux-2.6.37/mm/memcontrol.c linux-2.6.37-vs2.3.0.37-rc1/mm/memcontrol.c
+diff -NurpP --minimal linux-2.6.37/mm/memcontrol.c linux-2.6.37-vs2.3.0.37-rc2/mm/memcontrol.c
--- linux-2.6.37/mm/memcontrol.c 2011-01-05 21:50:40.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/mm/memcontrol.c 2011-01-05 22:30:43.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/mm/memcontrol.c 2011-01-05 22:30:43.000000000 +0100
@@ -681,6 +681,31 @@ struct mem_cgroup *mem_cgroup_from_task(
struct mem_cgroup, css);
}
static struct mem_cgroup *try_get_mem_cgroup_from_mm(struct mm_struct *mm)
{
struct mem_cgroup *mem = NULL;
-diff -NurpP --minimal linux-2.6.37/mm/memory.c linux-2.6.37-vs2.3.0.37-rc1/mm/memory.c
+diff -NurpP --minimal linux-2.6.37/mm/memory.c linux-2.6.37-vs2.3.0.37-rc2/mm/memory.c
--- linux-2.6.37/mm/memory.c 2011-01-05 21:50:40.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/mm/memory.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/mm/memory.c 2010-11-23 02:09:41.000000000 +0100
@@ -3153,6 +3153,7 @@ static inline int handle_pte_fault(struc
{
pte_t entry;
}
/*
-diff -NurpP --minimal linux-2.6.37/mm/mremap.c linux-2.6.37-vs2.3.0.37-rc1/mm/mremap.c
+diff -NurpP --minimal linux-2.6.37/mm/mremap.c linux-2.6.37-vs2.3.0.37-rc2/mm/mremap.c
--- linux-2.6.37/mm/mremap.c 2011-01-05 21:50:40.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/mm/mremap.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/mm/mremap.c 2010-11-23 02:09:41.000000000 +0100
@@ -19,6 +19,7 @@
#include <linux/security.h>
#include <linux/syscalls.h>
#include <asm/uaccess.h>
#include <asm/cacheflush.h>
-diff -NurpP --minimal linux-2.6.37/mm/oom_kill.c linux-2.6.37-vs2.3.0.37-rc1/mm/oom_kill.c
+diff -NurpP --minimal linux-2.6.37/mm/oom_kill.c linux-2.6.37-vs2.3.0.37-rc2/mm/oom_kill.c
--- linux-2.6.37/mm/oom_kill.c 2011-01-05 21:50:40.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/mm/oom_kill.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/mm/oom_kill.c 2010-11-23 02:09:41.000000000 +0100
@@ -31,6 +31,9 @@
#include <linux/memcontrol.h>
#include <linux/mempolicy.h>
}
if (oom_kill_process(p, gfp_mask, order, points, totalpages, NULL,
-diff -NurpP --minimal linux-2.6.37/mm/page_alloc.c linux-2.6.37-vs2.3.0.37-rc1/mm/page_alloc.c
+diff -NurpP --minimal linux-2.6.37/mm/page_alloc.c linux-2.6.37-vs2.3.0.37-rc2/mm/page_alloc.c
--- linux-2.6.37/mm/page_alloc.c 2011-01-05 21:50:40.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/mm/page_alloc.c 2011-01-05 22:30:43.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/mm/page_alloc.c 2011-01-05 22:30:43.000000000 +0100
@@ -53,6 +53,8 @@
#include <linux/compaction.h>
#include <trace/events/kmem.h>
}
#endif
-diff -NurpP --minimal linux-2.6.37/mm/rmap.c linux-2.6.37-vs2.3.0.37-rc1/mm/rmap.c
+diff -NurpP --minimal linux-2.6.37/mm/rmap.c linux-2.6.37-vs2.3.0.37-rc2/mm/rmap.c
--- linux-2.6.37/mm/rmap.c 2011-01-05 21:50:40.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/mm/rmap.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/mm/rmap.c 2010-11-23 02:09:41.000000000 +0100
@@ -57,6 +57,7 @@
#include <linux/mmu_notifier.h>
#include <linux/migrate.h>
#include <asm/tlbflush.h>
-diff -NurpP --minimal linux-2.6.37/mm/shmem.c linux-2.6.37-vs2.3.0.37-rc1/mm/shmem.c
+diff -NurpP --minimal linux-2.6.37/mm/shmem.c linux-2.6.37-vs2.3.0.37-rc2/mm/shmem.c
--- linux-2.6.37/mm/shmem.c 2011-01-05 21:50:40.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/mm/shmem.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/mm/shmem.c 2010-11-23 02:09:41.000000000 +0100
@@ -1816,7 +1816,7 @@ static int shmem_statfs(struct dentry *d
{
struct shmem_sb_info *sbinfo = SHMEM_SB(dentry->d_sb);
sb->s_op = &shmem_ops;
sb->s_time_gran = 1;
#ifdef CONFIG_TMPFS_POSIX_ACL
-diff -NurpP --minimal linux-2.6.37/mm/slab.c linux-2.6.37-vs2.3.0.37-rc1/mm/slab.c
+diff -NurpP --minimal linux-2.6.37/mm/slab.c linux-2.6.37-vs2.3.0.37-rc2/mm/slab.c
--- linux-2.6.37/mm/slab.c 2011-01-05 21:50:40.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/mm/slab.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/mm/slab.c 2010-11-23 02:09:41.000000000 +0100
@@ -407,6 +407,8 @@ static void kmem_list3_init(struct kmem_
#define STATS_INC_FREEMISS(x) do { } while (0)
#endif
kmemcheck_slab_free(cachep, objp, obj_size(cachep));
-diff -NurpP --minimal linux-2.6.37/mm/slab_vs.h linux-2.6.37-vs2.3.0.37-rc1/mm/slab_vs.h
+diff -NurpP --minimal linux-2.6.37/mm/slab_vs.h linux-2.6.37-vs2.3.0.37-rc2/mm/slab_vs.h
--- linux-2.6.37/mm/slab_vs.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/mm/slab_vs.h 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/mm/slab_vs.h 2010-11-23 02:09:41.000000000 +0100
@@ -0,0 +1,29 @@
+
+#include <linux/vserver/context.h>
+ atomic_sub(cachep->buffer_size, &vxi->cacct.slab[what]);
+}
+
-diff -NurpP --minimal linux-2.6.37/mm/swapfile.c linux-2.6.37-vs2.3.0.37-rc1/mm/swapfile.c
+diff -NurpP --minimal linux-2.6.37/mm/swapfile.c linux-2.6.37-vs2.3.0.37-rc2/mm/swapfile.c
--- linux-2.6.37/mm/swapfile.c 2011-01-05 21:50:40.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/mm/swapfile.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/mm/swapfile.c 2010-11-23 02:09:41.000000000 +0100
@@ -36,6 +36,8 @@
#include <asm/tlbflush.h>
#include <linux/swapops.h>
}
/*
-diff -NurpP --minimal linux-2.6.37/net/core/dev.c linux-2.6.37-vs2.3.0.37-rc1/net/core/dev.c
+diff -NurpP --minimal linux-2.6.37/net/core/dev.c linux-2.6.37-vs2.3.0.37-rc2/net/core/dev.c
--- linux-2.6.37/net/core/dev.c 2011-01-05 21:50:41.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/net/core/dev.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/net/core/dev.c 2010-11-23 02:09:41.000000000 +0100
@@ -127,6 +127,7 @@
#include <linux/in.h>
#include <linux/jhash.h>
seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
"%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n",
dev->name, stats->rx_bytes, stats->rx_packets,
-diff -NurpP --minimal linux-2.6.37/net/core/rtnetlink.c linux-2.6.37-vs2.3.0.37-rc1/net/core/rtnetlink.c
+diff -NurpP --minimal linux-2.6.37/net/core/rtnetlink.c linux-2.6.37-vs2.3.0.37-rc2/net/core/rtnetlink.c
--- linux-2.6.37/net/core/rtnetlink.c 2011-01-05 21:50:41.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/net/core/rtnetlink.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/net/core/rtnetlink.c 2010-11-23 02:09:41.000000000 +0100
@@ -891,6 +891,8 @@ static int rtnl_dump_ifinfo(struct sk_bu
hlist_for_each_entry(dev, node, head, index_hlist) {
if (idx < s_idx)
skb = nlmsg_new(if_nlmsg_size(dev), GFP_KERNEL);
if (skb == NULL)
goto errout;
-diff -NurpP --minimal linux-2.6.37/net/core/sock.c linux-2.6.37-vs2.3.0.37-rc1/net/core/sock.c
+diff -NurpP --minimal linux-2.6.37/net/core/sock.c linux-2.6.37-vs2.3.0.37-rc2/net/core/sock.c
--- linux-2.6.37/net/core/sock.c 2011-01-05 21:50:41.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/net/core/sock.c 2011-01-05 22:30:43.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/net/core/sock.c 2011-01-05 22:30:43.000000000 +0100
@@ -127,6 +127,10 @@
#include <net/cls_cgroup.h>
/*
* Before updating sk_refcnt, we must commit prior changes to memory
* (Documentation/RCU/rculist_nulls.txt for details)
-diff -NurpP --minimal linux-2.6.37/net/ipv4/af_inet.c linux-2.6.37-vs2.3.0.37-rc1/net/ipv4/af_inet.c
+diff -NurpP --minimal linux-2.6.37/net/ipv4/af_inet.c linux-2.6.37-vs2.3.0.37-rc2/net/ipv4/af_inet.c
--- linux-2.6.37/net/ipv4/af_inet.c 2011-01-05 21:50:41.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/net/ipv4/af_inet.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/net/ipv4/af_inet.c 2010-11-23 02:09:41.000000000 +0100
@@ -116,6 +116,7 @@
#ifdef CONFIG_IP_MROUTE
#include <linux/mroute.h>
sin->sin_port = inet->inet_sport;
sin->sin_addr.s_addr = addr;
}
-diff -NurpP --minimal linux-2.6.37/net/ipv4/devinet.c linux-2.6.37-vs2.3.0.37-rc1/net/ipv4/devinet.c
+diff -NurpP --minimal linux-2.6.37/net/ipv4/devinet.c linux-2.6.37-vs2.3.0.37-rc2/net/ipv4/devinet.c
--- linux-2.6.37/net/ipv4/devinet.c 2011-01-05 21:50:41.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/net/ipv4/devinet.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/net/ipv4/devinet.c 2010-11-23 02:09:41.000000000 +0100
@@ -420,6 +420,7 @@ struct in_device *inetdev_by_index(struc
}
EXPORT_SYMBOL(inetdev_by_index);
if (ip_idx < s_ip_idx)
continue;
if (inet_fill_ifaddr(skb, ifa,
-diff -NurpP --minimal linux-2.6.37/net/ipv4/fib_hash.c linux-2.6.37-vs2.3.0.37-rc1/net/ipv4/fib_hash.c
+diff -NurpP --minimal linux-2.6.37/net/ipv4/fib_hash.c linux-2.6.37-vs2.3.0.37-rc2/net/ipv4/fib_hash.c
--- linux-2.6.37/net/ipv4/fib_hash.c 2011-01-05 21:50:41.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/net/ipv4/fib_hash.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/net/ipv4/fib_hash.c 2010-11-23 02:09:41.000000000 +0100
@@ -1080,7 +1080,7 @@ static int fib_seq_show(struct seq_file
prefix = f->fn_key;
mask = FZ_MASK(iter->zone);
seq_printf(seq,
"%s\t%08X\t%08X\t%04X\t%d\t%u\t%d\t%08X\t%d\t%u\t%u%n",
fi->fib_dev ? fi->fib_dev->name : "*", prefix,
-diff -NurpP --minimal linux-2.6.37/net/ipv4/inet_connection_sock.c linux-2.6.37-vs2.3.0.37-rc1/net/ipv4/inet_connection_sock.c
+diff -NurpP --minimal linux-2.6.37/net/ipv4/inet_connection_sock.c linux-2.6.37-vs2.3.0.37-rc2/net/ipv4/inet_connection_sock.c
--- linux-2.6.37/net/ipv4/inet_connection_sock.c 2010-10-21 13:07:58.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/net/ipv4/inet_connection_sock.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/net/ipv4/inet_connection_sock.c 2010-11-23 02:09:41.000000000 +0100
@@ -52,10 +52,40 @@ void inet_get_local_port_range(int *low,
}
EXPORT_SYMBOL(inet_get_local_port_range);
break;
}
}
-diff -NurpP --minimal linux-2.6.37/net/ipv4/inet_diag.c linux-2.6.37-vs2.3.0.37-rc1/net/ipv4/inet_diag.c
+diff -NurpP --minimal linux-2.6.37/net/ipv4/inet_diag.c linux-2.6.37-vs2.3.0.37-rc2/net/ipv4/inet_diag.c
--- linux-2.6.37/net/ipv4/inet_diag.c 2011-01-05 21:50:42.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/net/ipv4/inet_diag.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/net/ipv4/inet_diag.c 2010-11-23 02:09:41.000000000 +0100
@@ -33,6 +33,8 @@
#include <linux/stddef.h>
if (num < s_num)
goto next_dying;
if (r->id.idiag_sport != tw->tw_sport &&
-diff -NurpP --minimal linux-2.6.37/net/ipv4/inet_hashtables.c linux-2.6.37-vs2.3.0.37-rc1/net/ipv4/inet_hashtables.c
+diff -NurpP --minimal linux-2.6.37/net/ipv4/inet_hashtables.c linux-2.6.37-vs2.3.0.37-rc2/net/ipv4/inet_hashtables.c
--- linux-2.6.37/net/ipv4/inet_hashtables.c 2011-01-05 21:50:42.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/net/ipv4/inet_hashtables.c 2011-01-05 22:30:43.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/net/ipv4/inet_hashtables.c 2011-01-05 22:30:43.000000000 +0100
@@ -21,6 +21,7 @@
#include <net/inet_connection_sock.h>
/*
* if the nulls value we got at the end of this lookup is
* not the expected one, we must restart lookup.
-diff -NurpP --minimal linux-2.6.37/net/ipv4/netfilter/nf_nat_helper.c linux-2.6.37-vs2.3.0.37-rc1/net/ipv4/netfilter/nf_nat_helper.c
+diff -NurpP --minimal linux-2.6.37/net/ipv4/netfilter/nf_nat_helper.c linux-2.6.37-vs2.3.0.37-rc2/net/ipv4/netfilter/nf_nat_helper.c
--- linux-2.6.37/net/ipv4/netfilter/nf_nat_helper.c 2011-01-05 21:50:42.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/net/ipv4/netfilter/nf_nat_helper.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/net/ipv4/netfilter/nf_nat_helper.c 2010-11-23 02:09:41.000000000 +0100
@@ -20,6 +20,7 @@
#include <net/route.h>
#include <net/netfilter/nf_conntrack.h>
#include <net/netfilter/nf_conntrack_helper.h>
#include <net/netfilter/nf_conntrack_ecache.h>
-diff -NurpP --minimal linux-2.6.37/net/ipv4/netfilter.c linux-2.6.37-vs2.3.0.37-rc1/net/ipv4/netfilter.c
+diff -NurpP --minimal linux-2.6.37/net/ipv4/netfilter.c linux-2.6.37-vs2.3.0.37-rc2/net/ipv4/netfilter.c
--- linux-2.6.37/net/ipv4/netfilter.c 2010-10-21 13:07:58.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/net/ipv4/netfilter.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/net/ipv4/netfilter.c 2010-11-23 02:09:41.000000000 +0100
@@ -5,7 +5,7 @@
#include <linux/ip.h>
#include <linux/skbuff.h>
#include <net/xfrm.h>
#include <net/ip.h>
#include <net/netfilter/nf_queue.h>
-diff -NurpP --minimal linux-2.6.37/net/ipv4/raw.c linux-2.6.37-vs2.3.0.37-rc1/net/ipv4/raw.c
+diff -NurpP --minimal linux-2.6.37/net/ipv4/raw.c linux-2.6.37-vs2.3.0.37-rc2/net/ipv4/raw.c
--- linux-2.6.37/net/ipv4/raw.c 2011-01-05 21:50:42.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/net/ipv4/raw.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/net/ipv4/raw.c 2010-11-23 02:09:41.000000000 +0100
@@ -116,7 +116,7 @@ static struct sock *__raw_v4_lookup(stru
if (net_eq(sock_net(sk), net) && inet->inet_num == num &&
sk_wmem_alloc_get(sp),
sk_rmem_alloc_get(sp),
0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
-diff -NurpP --minimal linux-2.6.37/net/ipv4/tcp.c linux-2.6.37-vs2.3.0.37-rc1/net/ipv4/tcp.c
+diff -NurpP --minimal linux-2.6.37/net/ipv4/tcp.c linux-2.6.37-vs2.3.0.37-rc2/net/ipv4/tcp.c
--- linux-2.6.37/net/ipv4/tcp.c 2011-01-05 21:50:42.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/net/ipv4/tcp.c 2011-01-05 22:30:43.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/net/ipv4/tcp.c 2011-01-05 22:30:43.000000000 +0100
@@ -266,6 +266,7 @@
#include <linux/crypto.h>
#include <linux/time.h>
#include <net/icmp.h>
#include <net/tcp.h>
-diff -NurpP --minimal linux-2.6.37/net/ipv4/tcp_ipv4.c linux-2.6.37-vs2.3.0.37-rc1/net/ipv4/tcp_ipv4.c
+diff -NurpP --minimal linux-2.6.37/net/ipv4/tcp_ipv4.c linux-2.6.37-vs2.3.0.37-rc2/net/ipv4/tcp_ipv4.c
--- linux-2.6.37/net/ipv4/tcp_ipv4.c 2011-01-05 21:50:42.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/net/ipv4/tcp_ipv4.c 2011-01-05 22:33:32.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/net/ipv4/tcp_ipv4.c 2011-01-05 22:33:32.000000000 +0100
@@ -2018,6 +2018,12 @@ static void *listening_get_next(struct s
req = req->dl_next;
while (1) {
3, jiffies_to_clock_t(ttd), 0, 0, 0, 0,
atomic_read(&tw->tw_refcnt), tw, len);
}
-diff -NurpP --minimal linux-2.6.37/net/ipv4/tcp_minisocks.c linux-2.6.37-vs2.3.0.37-rc1/net/ipv4/tcp_minisocks.c
+diff -NurpP --minimal linux-2.6.37/net/ipv4/tcp_minisocks.c linux-2.6.37-vs2.3.0.37-rc2/net/ipv4/tcp_minisocks.c
--- linux-2.6.37/net/ipv4/tcp_minisocks.c 2011-01-05 21:50:42.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/net/ipv4/tcp_minisocks.c 2011-01-05 22:30:43.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/net/ipv4/tcp_minisocks.c 2011-01-05 22:30:43.000000000 +0100
@@ -23,6 +23,9 @@
#include <linux/slab.h>
#include <linux/sysctl.h>
#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
if (tw->tw_family == PF_INET6) {
struct ipv6_pinfo *np = inet6_sk(sk);
-diff -NurpP --minimal linux-2.6.37/net/ipv4/udp.c linux-2.6.37-vs2.3.0.37-rc1/net/ipv4/udp.c
+diff -NurpP --minimal linux-2.6.37/net/ipv4/udp.c linux-2.6.37-vs2.3.0.37-rc2/net/ipv4/udp.c
--- linux-2.6.37/net/ipv4/udp.c 2011-01-05 21:50:42.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/net/ipv4/udp.c 2011-01-05 22:30:43.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/net/ipv4/udp.c 2011-01-05 22:30:43.000000000 +0100
@@ -296,14 +296,7 @@ fail:
}
EXPORT_SYMBOL(udp_lib_get_port);
sk_wmem_alloc_get(sp),
sk_rmem_alloc_get(sp),
0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
-diff -NurpP --minimal linux-2.6.37/net/ipv6/addrconf.c linux-2.6.37-vs2.3.0.37-rc1/net/ipv6/addrconf.c
+diff -NurpP --minimal linux-2.6.37/net/ipv6/addrconf.c linux-2.6.37-vs2.3.0.37-rc2/net/ipv6/addrconf.c
--- linux-2.6.37/net/ipv6/addrconf.c 2011-01-05 21:50:42.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/net/ipv6/addrconf.c 2011-01-05 22:30:43.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/net/ipv6/addrconf.c 2011-01-05 22:30:43.000000000 +0100
@@ -87,6 +87,8 @@
#include <linux/proc_fs.h>
idev = __in6_dev_get(dev);
if (!idev)
goto cont;
-diff -NurpP --minimal linux-2.6.37/net/ipv6/af_inet6.c linux-2.6.37-vs2.3.0.37-rc1/net/ipv6/af_inet6.c
+diff -NurpP --minimal linux-2.6.37/net/ipv6/af_inet6.c linux-2.6.37-vs2.3.0.37-rc2/net/ipv6/af_inet6.c
--- linux-2.6.37/net/ipv6/af_inet6.c 2011-01-05 21:50:42.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/net/ipv6/af_inet6.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/net/ipv6/af_inet6.c 2010-11-23 02:09:41.000000000 +0100
@@ -42,6 +42,8 @@
#include <linux/netdevice.h>
#include <linux/icmpv6.h>
if (ipv6_addr_any(&np->rcv_saddr))
ipv6_addr_copy(&sin->sin6_addr, &np->saddr);
else
-diff -NurpP --minimal linux-2.6.37/net/ipv6/fib6_rules.c linux-2.6.37-vs2.3.0.37-rc1/net/ipv6/fib6_rules.c
+diff -NurpP --minimal linux-2.6.37/net/ipv6/fib6_rules.c linux-2.6.37-vs2.3.0.37-rc2/net/ipv6/fib6_rules.c
--- linux-2.6.37/net/ipv6/fib6_rules.c 2011-01-05 21:50:42.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/net/ipv6/fib6_rules.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/net/ipv6/fib6_rules.c 2010-11-23 02:09:41.000000000 +0100
@@ -88,7 +88,7 @@ static int fib6_rule_action(struct fib_r
ip6_dst_idev(&rt->dst)->dev,
&flp->fl6_dst,
goto again;
if (!ipv6_prefix_equal(&saddr, &r->src.addr,
r->src.plen))
-diff -NurpP --minimal linux-2.6.37/net/ipv6/inet6_hashtables.c linux-2.6.37-vs2.3.0.37-rc1/net/ipv6/inet6_hashtables.c
+diff -NurpP --minimal linux-2.6.37/net/ipv6/inet6_hashtables.c linux-2.6.37-vs2.3.0.37-rc2/net/ipv6/inet6_hashtables.c
--- linux-2.6.37/net/ipv6/inet6_hashtables.c 2010-02-25 11:52:10.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/net/ipv6/inet6_hashtables.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/net/ipv6/inet6_hashtables.c 2010-11-23 02:09:41.000000000 +0100
@@ -16,6 +16,7 @@
#include <linux/module.h>
}
if (sk->sk_bound_dev_if) {
if (sk->sk_bound_dev_if != dif)
-diff -NurpP --minimal linux-2.6.37/net/ipv6/ip6_output.c linux-2.6.37-vs2.3.0.37-rc1/net/ipv6/ip6_output.c
+diff -NurpP --minimal linux-2.6.37/net/ipv6/ip6_output.c linux-2.6.37-vs2.3.0.37-rc2/net/ipv6/ip6_output.c
--- linux-2.6.37/net/ipv6/ip6_output.c 2011-01-05 21:50:42.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/net/ipv6/ip6_output.c 2011-01-05 22:30:43.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/net/ipv6/ip6_output.c 2011-01-05 22:30:43.000000000 +0100
@@ -930,7 +930,7 @@ static int ip6_dst_lookup_tail(struct so
err = ipv6_dev_get_saddr(net, ip6_dst_idev(*dst)->dev,
&fl->fl6_dst,
if (err)
goto out_err_release;
}
-diff -NurpP --minimal linux-2.6.37/net/ipv6/Kconfig linux-2.6.37-vs2.3.0.37-rc1/net/ipv6/Kconfig
+diff -NurpP --minimal linux-2.6.37/net/ipv6/Kconfig linux-2.6.37-vs2.3.0.37-rc2/net/ipv6/Kconfig
--- linux-2.6.37/net/ipv6/Kconfig 2010-08-02 16:52:59.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/net/ipv6/Kconfig 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/net/ipv6/Kconfig 2010-11-23 02:09:41.000000000 +0100
@@ -4,8 +4,8 @@
# IPv6 as module will cause a CRASH if you try to unload it
---help---
This is complemental support for the IP version 6.
You will still be able to do traditional IPv4 networking as well.
-diff -NurpP --minimal linux-2.6.37/net/ipv6/ndisc.c linux-2.6.37-vs2.3.0.37-rc1/net/ipv6/ndisc.c
+diff -NurpP --minimal linux-2.6.37/net/ipv6/ndisc.c linux-2.6.37-vs2.3.0.37-rc2/net/ipv6/ndisc.c
--- linux-2.6.37/net/ipv6/ndisc.c 2011-01-05 21:50:42.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/net/ipv6/ndisc.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/net/ipv6/ndisc.c 2010-11-23 02:09:41.000000000 +0100
@@ -595,7 +595,7 @@ static void ndisc_send_na(struct net_dev
} else {
if (ipv6_dev_get_saddr(dev_net(dev), dev, daddr,
return;
src_addr = &tmpaddr;
}
-diff -NurpP --minimal linux-2.6.37/net/ipv6/raw.c linux-2.6.37-vs2.3.0.37-rc1/net/ipv6/raw.c
+diff -NurpP --minimal linux-2.6.37/net/ipv6/raw.c linux-2.6.37-vs2.3.0.37-rc2/net/ipv6/raw.c
--- linux-2.6.37/net/ipv6/raw.c 2011-01-05 21:50:42.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/net/ipv6/raw.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/net/ipv6/raw.c 2010-11-23 02:09:41.000000000 +0100
@@ -30,6 +30,7 @@
#include <linux/icmpv6.h>
#include <linux/netfilter.h>
/* ipv4 addr of the socket is invalid. Only the
* unspecified and mapped address have a v4 equivalent.
*/
-diff -NurpP --minimal linux-2.6.37/net/ipv6/route.c linux-2.6.37-vs2.3.0.37-rc1/net/ipv6/route.c
+diff -NurpP --minimal linux-2.6.37/net/ipv6/route.c linux-2.6.37-vs2.3.0.37-rc2/net/ipv6/route.c
--- linux-2.6.37/net/ipv6/route.c 2011-01-05 21:50:42.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/net/ipv6/route.c 2011-01-05 22:30:43.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/net/ipv6/route.c 2011-01-05 22:30:43.000000000 +0100
@@ -2290,7 +2290,8 @@ static int rt6_fill_node(struct net *net
struct inet6_dev *idev = ip6_dst_idev(&rt->dst);
struct in6_addr saddr_buf;
NLA_PUT(skb, RTA_PREFSRC, 16, &saddr_buf);
}
-diff -NurpP --minimal linux-2.6.37/net/ipv6/tcp_ipv6.c linux-2.6.37-vs2.3.0.37-rc1/net/ipv6/tcp_ipv6.c
+diff -NurpP --minimal linux-2.6.37/net/ipv6/tcp_ipv6.c linux-2.6.37-vs2.3.0.37-rc2/net/ipv6/tcp_ipv6.c
--- linux-2.6.37/net/ipv6/tcp_ipv6.c 2011-01-05 21:50:42.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/net/ipv6/tcp_ipv6.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/net/ipv6/tcp_ipv6.c 2010-11-23 02:09:41.000000000 +0100
@@ -69,6 +69,7 @@
#include <linux/crypto.h>
addr_type = ipv6_addr_type(&usin->sin6_addr);
-diff -NurpP --minimal linux-2.6.37/net/ipv6/udp.c linux-2.6.37-vs2.3.0.37-rc1/net/ipv6/udp.c
+diff -NurpP --minimal linux-2.6.37/net/ipv6/udp.c linux-2.6.37-vs2.3.0.37-rc2/net/ipv6/udp.c
--- linux-2.6.37/net/ipv6/udp.c 2011-01-05 21:50:42.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/net/ipv6/udp.c 2011-01-05 22:30:43.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/net/ipv6/udp.c 2011-01-05 22:30:43.000000000 +0100
@@ -48,13 +48,14 @@
#include <linux/proc_fs.h>
}
if (!ipv6_addr_any(&np->daddr)) {
if (!ipv6_addr_equal(&np->daddr, saddr))
-diff -NurpP --minimal linux-2.6.37/net/ipv6/xfrm6_policy.c linux-2.6.37-vs2.3.0.37-rc1/net/ipv6/xfrm6_policy.c
+diff -NurpP --minimal linux-2.6.37/net/ipv6/xfrm6_policy.c linux-2.6.37-vs2.3.0.37-rc2/net/ipv6/xfrm6_policy.c
--- linux-2.6.37/net/ipv6/xfrm6_policy.c 2011-01-05 21:50:42.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/net/ipv6/xfrm6_policy.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/net/ipv6/xfrm6_policy.c 2010-11-23 02:09:41.000000000 +0100
@@ -62,7 +62,7 @@ static int xfrm6_get_saddr(struct net *n
dev = ip6_dst_idev(dst)->dev;
ipv6_dev_get_saddr(dev_net(dev), dev,
dst_release(dst);
return 0;
}
-diff -NurpP --minimal linux-2.6.37/net/netfilter/ipvs/ip_vs_xmit.c linux-2.6.37-vs2.3.0.37-rc1/net/netfilter/ipvs/ip_vs_xmit.c
+diff -NurpP --minimal linux-2.6.37/net/netfilter/ipvs/ip_vs_xmit.c linux-2.6.37-vs2.3.0.37-rc2/net/netfilter/ipvs/ip_vs_xmit.c
--- linux-2.6.37/net/netfilter/ipvs/ip_vs_xmit.c 2011-01-05 21:50:43.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/net/netfilter/ipvs/ip_vs_xmit.c 2011-01-06 00:35:16.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/net/netfilter/ipvs/ip_vs_xmit.c 2011-01-06 00:35:16.000000000 +0100
@@ -231,7 +231,7 @@ __ip_vs_route_output_v6(struct net *net,
return dst;
if (ipv6_addr_any(&fl.fl6_src) &&
goto out_err;
if (do_xfrm && xfrm_lookup(net, &dst, &fl, NULL, 0) < 0)
goto out_err;
-diff -NurpP --minimal linux-2.6.37/net/netlink/af_netlink.c linux-2.6.37-vs2.3.0.37-rc1/net/netlink/af_netlink.c
+diff -NurpP --minimal linux-2.6.37/net/netlink/af_netlink.c linux-2.6.37-vs2.3.0.37-rc2/net/netlink/af_netlink.c
--- linux-2.6.37/net/netlink/af_netlink.c 2011-01-05 21:50:43.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/net/netlink/af_netlink.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/net/netlink/af_netlink.c 2010-11-23 02:09:41.000000000 +0100
@@ -55,6 +55,9 @@
#include <linux/types.h>
#include <linux/audit.h>
s = sk_next(s);
if (s) {
iter->link = i;
-diff -NurpP --minimal linux-2.6.37/net/sctp/ipv6.c linux-2.6.37-vs2.3.0.37-rc1/net/sctp/ipv6.c
+diff -NurpP --minimal linux-2.6.37/net/sctp/ipv6.c linux-2.6.37-vs2.3.0.37-rc2/net/sctp/ipv6.c
--- linux-2.6.37/net/sctp/ipv6.c 2011-01-05 21:50:45.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/net/sctp/ipv6.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/net/sctp/ipv6.c 2010-11-23 02:09:41.000000000 +0100
@@ -306,7 +306,8 @@ static void sctp_v6_get_saddr(struct sct
dst ? ip6_dst_idev(dst)->dev : NULL,
&daddr->v6.sin6_addr,
SCTP_DEBUG_PRINTK("saddr from ipv6_get_saddr: %pI6\n",
&saddr->v6.sin6_addr);
return;
-diff -NurpP --minimal linux-2.6.37/net/socket.c linux-2.6.37-vs2.3.0.37-rc1/net/socket.c
+diff -NurpP --minimal linux-2.6.37/net/socket.c linux-2.6.37-vs2.3.0.37-rc2/net/socket.c
--- linux-2.6.37/net/socket.c 2011-01-05 21:50:45.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/net/socket.c 2011-01-05 22:30:44.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/net/socket.c 2011-01-05 22:30:44.000000000 +0100
@@ -98,6 +98,10 @@
#include <net/sock.h>
err = sock1->ops->socketpair(sock1, sock2);
if (err < 0)
-diff -NurpP --minimal linux-2.6.37/net/sunrpc/auth.c linux-2.6.37-vs2.3.0.37-rc1/net/sunrpc/auth.c
+diff -NurpP --minimal linux-2.6.37/net/sunrpc/auth.c linux-2.6.37-vs2.3.0.37-rc2/net/sunrpc/auth.c
--- linux-2.6.37/net/sunrpc/auth.c 2011-01-05 21:50:45.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/net/sunrpc/auth.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/net/sunrpc/auth.c 2010-11-23 02:09:41.000000000 +0100
@@ -14,6 +14,7 @@
#include <linux/hash.h>
#include <linux/sunrpc/clnt.h>
};
dprintk("RPC: %5u looking up %s cred\n",
-diff -NurpP --minimal linux-2.6.37/net/sunrpc/auth_unix.c linux-2.6.37-vs2.3.0.37-rc1/net/sunrpc/auth_unix.c
+diff -NurpP --minimal linux-2.6.37/net/sunrpc/auth_unix.c linux-2.6.37-vs2.3.0.37-rc2/net/sunrpc/auth_unix.c
--- linux-2.6.37/net/sunrpc/auth_unix.c 2010-10-21 13:08:01.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/net/sunrpc/auth_unix.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/net/sunrpc/auth_unix.c 2010-11-23 02:09:41.000000000 +0100
@@ -12,12 +12,14 @@
#include <linux/module.h>
#include <linux/sunrpc/clnt.h>
hold = p++;
for (i = 0; i < 16 && cred->uc_gids[i] != (gid_t) NOGROUP; i++)
*p++ = htonl((u32) cred->uc_gids[i]);
-diff -NurpP --minimal linux-2.6.37/net/sunrpc/clnt.c linux-2.6.37-vs2.3.0.37-rc1/net/sunrpc/clnt.c
+diff -NurpP --minimal linux-2.6.37/net/sunrpc/clnt.c linux-2.6.37-vs2.3.0.37-rc2/net/sunrpc/clnt.c
--- linux-2.6.37/net/sunrpc/clnt.c 2011-01-05 21:50:45.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/net/sunrpc/clnt.c 2011-01-05 22:30:44.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/net/sunrpc/clnt.c 2011-01-05 22:30:44.000000000 +0100
@@ -33,6 +33,7 @@
#include <linux/utsname.h>
#include <linux/workqueue.h>
return clnt;
}
EXPORT_SYMBOL_GPL(rpc_create);
-diff -NurpP --minimal linux-2.6.37/net/unix/af_unix.c linux-2.6.37-vs2.3.0.37-rc1/net/unix/af_unix.c
+diff -NurpP --minimal linux-2.6.37/net/unix/af_unix.c linux-2.6.37-vs2.3.0.37-rc2/net/unix/af_unix.c
--- linux-2.6.37/net/unix/af_unix.c 2011-01-05 21:50:46.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/net/unix/af_unix.c 2011-01-05 22:30:44.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/net/unix/af_unix.c 2011-01-05 22:30:44.000000000 +0100
@@ -114,6 +114,8 @@
#include <linux/mount.h>
#include <net/checksum.h>
sk = next_unix_socket(&iter->i, sk);
return sk;
}
-diff -NurpP --minimal linux-2.6.37/scripts/checksyscalls.sh linux-2.6.37-vs2.3.0.37-rc1/scripts/checksyscalls.sh
+diff -NurpP --minimal linux-2.6.37/scripts/checksyscalls.sh linux-2.6.37-vs2.3.0.37-rc2/scripts/checksyscalls.sh
--- linux-2.6.37/scripts/checksyscalls.sh 2010-10-21 13:08:01.000000000 +0200
-+++ linux-2.6.37-vs2.3.0.37-rc1/scripts/checksyscalls.sh 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/scripts/checksyscalls.sh 2010-11-23 02:09:41.000000000 +0100
@@ -193,7 +193,6 @@ cat << EOF
#define __IGNORE_afs_syscall
#define __IGNORE_getpmsg
EOF
}
-diff -NurpP --minimal linux-2.6.37/security/commoncap.c linux-2.6.37-vs2.3.0.37-rc1/security/commoncap.c
+diff -NurpP --minimal linux-2.6.37/security/commoncap.c linux-2.6.37-vs2.3.0.37-rc2/security/commoncap.c
--- linux-2.6.37/security/commoncap.c 2011-01-05 21:50:47.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/security/commoncap.c 2010-11-23 02:21:20.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/security/commoncap.c 2010-11-23 02:21:20.000000000 +0100
@@ -27,6 +27,7 @@
#include <linux/sched.h>
#include <linux/prctl.h>
return ret;
}
+
-diff -NurpP --minimal linux-2.6.37/security/selinux/hooks.c linux-2.6.37-vs2.3.0.37-rc1/security/selinux/hooks.c
+diff -NurpP --minimal linux-2.6.37/security/selinux/hooks.c linux-2.6.37-vs2.3.0.37-rc2/security/selinux/hooks.c
--- linux-2.6.37/security/selinux/hooks.c 2011-01-05 21:50:47.000000000 +0100
-+++ linux-2.6.37-vs2.3.0.37-rc1/security/selinux/hooks.c 2010-11-23 02:09:41.000000000 +0100
++++ linux-2.6.37-vs2.3.0.37-rc2/security/selinux/hooks.c 2010-11-23 02:09:41.000000000 +0100
@@ -64,7 +64,6 @@
#include <linux/dccp.h>
#include <linux/quota.h>
projects / packages / kernel.git / commitdiff