From: Arkadiusz Miśkiewicz Date: Tue, 3 Apr 2012 07:02:38 +0000 (+0000) Subject: - up to 3.3.1; updated vserver patch to vs2.3.3.2; drop scsi workaround X-Git-Tag: auto/th/kernel-3_3_1-1 X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;h=6a605112866fa83712832b98d4b7fdcc19055dac;p=packages%2Fkernel.git - up to 3.3.1; updated vserver patch to vs2.3.3.2; drop scsi workaround Changed files: kernel-small_fixes.patch -> 1.60 kernel-vserver-2.3.patch -> 1.94 kernel.spec -> 1.1037 --- diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch index 0b547251..be01afc4 100644 --- a/kernel-small_fixes.patch +++ b/kernel-small_fixes.patch @@ -11,103 +11,6 @@ /* Some toolchains use a `_' prefix for all user symbols. */ -From: Stephen Hemminger - -Some BIOS's don't setup power management correctly (what else is -new) and don't allow use of PCI Express power control. Add a special -exception module parameter to allow working around this issue. -Based on slightly different patch by Knut Petersen. - -Reported-by: Arkadiusz Miskiewicz -Signed-off-by: Stephen Hemminger ---- -Patch against -net (ie. 3.3.0) - ---- a/drivers/net/ethernet/marvell/sky2.c 2012-01-10 10:56:56.855156017 -0800 -+++ b/drivers/net/ethernet/marvell/sky2.c 2012-03-21 08:25:52.400929532 -0700 -@@ -95,6 +95,10 @@ static int disable_msi = 0; - module_param(disable_msi, int, 0); - MODULE_PARM_DESC(disable_msi, "Disable Message Signaled Interrupt (MSI)"); - -+static int legacy_pme = 0; -+module_param(legacy_pme, int, 0); -+MODULE_PARM_DESC(legacy_pme, "Legacy power management"); -+ - static DEFINE_PCI_DEVICE_TABLE(sky2_id_table) = { - { PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, 0x9000) }, /* SK-9Sxx */ - { PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, 0x9E00) }, /* SK-9Exx */ -@@ -867,6 +871,13 @@ static void sky2_wol_init(struct sky2_po - /* Disable PiG firmware */ - sky2_write16(hw, B0_CTST, Y2_HW_WOL_OFF); - -+ /* Needed by some broken BIOSes, use PCI rather than PCI-e for WOL */ -+ if (legacy_pme) { -+ u32 reg1 = sky2_pci_read32(hw, PCI_DEV_REG1); -+ reg1 |= PCI_Y2_PME_LEGACY; -+ sky2_pci_write32(hw, PCI_DEV_REG1, reg1); -+ } -+ - /* block receiver */ - sky2_write8(hw, SK_REG(port, RX_GMF_CTRL_T), GMF_RST_SET); - sky2_read32(hw, B0_CTST); - - -The RCU problem is likely to be a separate issue. It might even be a -result of the use-after-free problem with the elevator. - -At any rate, it's clear that the crash in the refcounting log you -posted occurred because scsi_setup_blk_pc_cmnd() called -scsi_prep_state_check(), which tried to dereference the NULL pointer. - -Would you like to try this patch to see if it fixes the problem? As I -said before, I'm not certain it's the best thing to do, but it worked -on my system. - -Alan Stern - - -Index: usb-3.0/drivers/scsi/scsi_lib.c -=================================================================== ---- usb-3.0.orig/drivers/scsi/scsi_lib.c -+++ usb-3.0/drivers/scsi/scsi_lib.c -@@ -1247,6 +1247,8 @@ int scsi_prep_fn(struct request_queue *q - struct scsi_device *sdev = q->queuedata; - int ret = BLKPREP_KILL; - -+ if (!sdev) -+ return ret; - if (req->cmd_type == REQ_TYPE_BLOCK_PC) - ret = scsi_setup_blk_pc_cmnd(sdev, req); - return scsi_prep_return(q, req, ret); -Index: usb-3.0/drivers/scsi/scsi_sysfs.c -=================================================================== ---- usb-3.0.orig/drivers/scsi/scsi_sysfs.c -+++ usb-3.0/drivers/scsi/scsi_sysfs.c -@@ -322,6 +322,8 @@ static void scsi_device_dev_release_user - kfree(evt); - } - -+ /* Freeing the queue signals to block that we're done */ -+ scsi_free_queue(sdev->request_queue); - blk_put_queue(sdev->request_queue); - /* NULL queue means the device can't be used */ - sdev->request_queue = NULL; -@@ -936,8 +938,6 @@ void __scsi_remove_device(struct scsi_de - /* cause the request function to reject all I/O requests */ - sdev->request_queue->queuedata = NULL; - -- /* Freeing the queue signals to block that we're done */ -- scsi_free_queue(sdev->request_queue); - put_device(dev); - } - - - --- -To unsubscribe from this list: send the line "unsubscribe linux-kernel" in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html -Please read the FAQ at http://www.tux.org/lkml/ --- linux-3.0/scripts/kconfig/lxdialog/check-lxdialog.sh~ 2011-07-22 04:17:23.000000000 +0200 +++ linux-3.0/scripts/kconfig/lxdialog/check-lxdialog.sh 2011-08-25 21:26:04.799150642 +0200 @@ -9,6 +9,12 @@ @@ -189,4 +92,4 @@ index 7a0c800..ec5ebbb 100644 -- 1.7.7.3 - \ No newline at end of file + diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch index 9236ac85..70ae18f3 100644 --- a/kernel-vserver-2.3.patch +++ b/kernel-vserver-2.3.patch @@ -1,6 +1,6 @@ -diff -NurpP --minimal linux-3.3/Documentation/vserver/debug.txt linux-3.3-vs2.3.3.1/Documentation/vserver/debug.txt ---- linux-3.3/Documentation/vserver/debug.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/Documentation/vserver/debug.txt 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/Documentation/vserver/debug.txt linux-3.3.1-vs2.3.3.2/Documentation/vserver/debug.txt +--- linux-3.3.1/Documentation/vserver/debug.txt 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/Documentation/vserver/debug.txt 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,154 @@ + +debug_cvirt: @@ -156,9 +156,9 @@ diff -NurpP --minimal linux-3.3/Documentation/vserver/debug.txt linux-3.3-vs2.3. + 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-3.3/arch/alpha/Kconfig linux-3.3-vs2.3.3.1/arch/alpha/Kconfig ---- linux-3.3/arch/alpha/Kconfig 2012-03-19 19:46:27.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/arch/alpha/Kconfig 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/arch/alpha/Kconfig linux-3.3.1-vs2.3.3.2/arch/alpha/Kconfig +--- linux-3.3.1/arch/alpha/Kconfig 2012-03-19 19:46:27.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/arch/alpha/Kconfig 2012-02-24 03:55:06.000000000 +0100 @@ -662,6 +662,8 @@ config DUMMY_CONSOLE depends on VGA_HOSE default y @@ -168,9 +168,9 @@ diff -NurpP --minimal linux-3.3/arch/alpha/Kconfig linux-3.3-vs2.3.3.1/arch/alph source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.3/arch/alpha/kernel/entry.S linux-3.3-vs2.3.3.1/arch/alpha/kernel/entry.S ---- linux-3.3/arch/alpha/kernel/entry.S 2010-10-21 13:06:45.000000000 +0200 -+++ linux-3.3-vs2.3.3.1/arch/alpha/kernel/entry.S 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/arch/alpha/kernel/entry.S linux-3.3.1-vs2.3.3.2/arch/alpha/kernel/entry.S +--- linux-3.3.1/arch/alpha/kernel/entry.S 2010-10-21 13:06:45.000000000 +0200 ++++ linux-3.3.1-vs2.3.3.2/arch/alpha/kernel/entry.S 2012-02-24 03:55:06.000000000 +0100 @@ -860,24 +860,15 @@ sys_getxgid: .globl sys_getxpid .ent sys_getxpid @@ -203,9 +203,9 @@ diff -NurpP --minimal linux-3.3/arch/alpha/kernel/entry.S linux-3.3-vs2.3.3.1/ar ret .end sys_getxpid -diff -NurpP --minimal linux-3.3/arch/alpha/kernel/ptrace.c linux-3.3-vs2.3.3.1/arch/alpha/kernel/ptrace.c ---- linux-3.3/arch/alpha/kernel/ptrace.c 2011-01-05 21:48:40.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/arch/alpha/kernel/ptrace.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/arch/alpha/kernel/ptrace.c linux-3.3.1-vs2.3.3.2/arch/alpha/kernel/ptrace.c +--- linux-3.3.1/arch/alpha/kernel/ptrace.c 2011-01-05 21:48:40.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/arch/alpha/kernel/ptrace.c 2012-02-24 03:55:06.000000000 +0100 @@ -13,6 +13,7 @@ #include #include @@ -214,9 +214,9 @@ diff -NurpP --minimal linux-3.3/arch/alpha/kernel/ptrace.c linux-3.3-vs2.3.3.1/a #include #include -diff -NurpP --minimal linux-3.3/arch/alpha/kernel/systbls.S linux-3.3-vs2.3.3.1/arch/alpha/kernel/systbls.S ---- linux-3.3/arch/alpha/kernel/systbls.S 2012-01-09 16:13:54.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/arch/alpha/kernel/systbls.S 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/arch/alpha/kernel/systbls.S linux-3.3.1-vs2.3.3.2/arch/alpha/kernel/systbls.S +--- linux-3.3.1/arch/alpha/kernel/systbls.S 2012-01-09 16:13:54.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/arch/alpha/kernel/systbls.S 2012-02-24 03:55:06.000000000 +0100 @@ -446,7 +446,7 @@ sys_call_table: .quad sys_stat64 /* 425 */ .quad sys_lstat64 @@ -226,9 +226,9 @@ diff -NurpP --minimal linux-3.3/arch/alpha/kernel/systbls.S linux-3.3-vs2.3.3.1/ .quad sys_ni_syscall /* sys_mbind */ .quad sys_ni_syscall /* sys_get_mempolicy */ .quad sys_ni_syscall /* sys_set_mempolicy */ -diff -NurpP --minimal linux-3.3/arch/alpha/kernel/traps.c linux-3.3-vs2.3.3.1/arch/alpha/kernel/traps.c ---- linux-3.3/arch/alpha/kernel/traps.c 2010-10-21 13:06:46.000000000 +0200 -+++ linux-3.3-vs2.3.3.1/arch/alpha/kernel/traps.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/arch/alpha/kernel/traps.c linux-3.3.1-vs2.3.3.2/arch/alpha/kernel/traps.c +--- linux-3.3.1/arch/alpha/kernel/traps.c 2010-10-21 13:06:46.000000000 +0200 ++++ linux-3.3.1-vs2.3.3.2/arch/alpha/kernel/traps.c 2012-02-24 03:55:06.000000000 +0100 @@ -183,7 +183,8 @@ die_if_kernel(char * str, struct pt_regs #ifdef CONFIG_SMP printk("CPU %d ", hard_smp_processor_id()); @@ -239,9 +239,9 @@ diff -NurpP --minimal linux-3.3/arch/alpha/kernel/traps.c linux-3.3-vs2.3.3.1/ar dik_show_regs(regs, r9_15); add_taint(TAINT_DIE); dik_show_trace((unsigned long *)(regs+1)); -diff -NurpP --minimal linux-3.3/arch/arm/Kconfig linux-3.3-vs2.3.3.1/arch/arm/Kconfig ---- linux-3.3/arch/arm/Kconfig 2012-03-19 19:46:27.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/arch/arm/Kconfig 2012-03-19 20:52:09.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/arch/arm/Kconfig linux-3.3.1-vs2.3.3.2/arch/arm/Kconfig +--- linux-3.3.1/arch/arm/Kconfig 2012-03-19 19:46:27.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/arch/arm/Kconfig 2012-03-19 20:52:09.000000000 +0100 @@ -2266,6 +2266,8 @@ source "fs/Kconfig" source "arch/arm/Kconfig.debug" @@ -251,9 +251,9 @@ diff -NurpP --minimal linux-3.3/arch/arm/Kconfig linux-3.3-vs2.3.3.1/arch/arm/Kc source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.3/arch/arm/kernel/calls.S linux-3.3-vs2.3.3.1/arch/arm/kernel/calls.S ---- linux-3.3/arch/arm/kernel/calls.S 2012-01-09 16:13:54.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/arch/arm/kernel/calls.S 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/arch/arm/kernel/calls.S linux-3.3.1-vs2.3.3.2/arch/arm/kernel/calls.S +--- linux-3.3.1/arch/arm/kernel/calls.S 2012-01-09 16:13:54.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/arch/arm/kernel/calls.S 2012-02-24 03:55:06.000000000 +0100 @@ -322,7 +322,7 @@ /* 310 */ CALL(sys_request_key) CALL(sys_keyctl) @@ -263,9 +263,9 @@ diff -NurpP --minimal linux-3.3/arch/arm/kernel/calls.S linux-3.3-vs2.3.3.1/arch CALL(sys_ioprio_set) /* 315 */ CALL(sys_ioprio_get) CALL(sys_inotify_init) -diff -NurpP --minimal linux-3.3/arch/arm/kernel/process.c linux-3.3-vs2.3.3.1/arch/arm/kernel/process.c ---- linux-3.3/arch/arm/kernel/process.c 2012-03-19 19:46:28.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/arch/arm/kernel/process.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/arch/arm/kernel/process.c linux-3.3.1-vs2.3.3.2/arch/arm/kernel/process.c +--- linux-3.3.1/arch/arm/kernel/process.c 2012-03-19 19:46:28.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/arch/arm/kernel/process.c 2012-02-24 03:55:06.000000000 +0100 @@ -353,7 +353,8 @@ void __show_regs(struct pt_regs *regs) void show_regs(struct pt_regs * regs) { @@ -276,9 +276,9 @@ diff -NurpP --minimal linux-3.3/arch/arm/kernel/process.c linux-3.3-vs2.3.3.1/ar __show_regs(regs); dump_stack(); } -diff -NurpP --minimal linux-3.3/arch/arm/kernel/traps.c linux-3.3-vs2.3.3.1/arch/arm/kernel/traps.c ---- linux-3.3/arch/arm/kernel/traps.c 2012-03-19 19:46:28.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/arch/arm/kernel/traps.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/arch/arm/kernel/traps.c linux-3.3.1-vs2.3.3.2/arch/arm/kernel/traps.c +--- linux-3.3.1/arch/arm/kernel/traps.c 2012-03-19 19:46:28.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/arch/arm/kernel/traps.c 2012-02-24 03:55:06.000000000 +0100 @@ -244,8 +244,8 @@ static int __die(const char *str, int er print_modules(); @@ -290,9 +290,9 @@ diff -NurpP --minimal linux-3.3/arch/arm/kernel/traps.c linux-3.3-vs2.3.3.1/arch if (!user_mode(regs) || in_interrupt()) { dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp, -diff -NurpP --minimal linux-3.3/arch/cris/Kconfig linux-3.3-vs2.3.3.1/arch/cris/Kconfig ---- linux-3.3/arch/cris/Kconfig 2012-03-19 19:46:39.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/arch/cris/Kconfig 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/arch/cris/Kconfig linux-3.3.1-vs2.3.3.2/arch/cris/Kconfig +--- linux-3.3.1/arch/cris/Kconfig 2012-03-19 19:46:39.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/arch/cris/Kconfig 2012-02-24 03:55:06.000000000 +0100 @@ -675,6 +675,8 @@ source "drivers/staging/Kconfig" source "arch/cris/Kconfig.debug" @@ -302,9 +302,9 @@ diff -NurpP --minimal linux-3.3/arch/cris/Kconfig linux-3.3-vs2.3.3.1/arch/cris/ source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.3/arch/frv/kernel/kernel_thread.S linux-3.3-vs2.3.3.1/arch/frv/kernel/kernel_thread.S ---- linux-3.3/arch/frv/kernel/kernel_thread.S 2008-12-25 00:26:37.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/arch/frv/kernel/kernel_thread.S 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/arch/frv/kernel/kernel_thread.S linux-3.3.1-vs2.3.3.2/arch/frv/kernel/kernel_thread.S +--- linux-3.3.1/arch/frv/kernel/kernel_thread.S 2008-12-25 00:26:37.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/arch/frv/kernel/kernel_thread.S 2012-02-24 03:55:06.000000000 +0100 @@ -37,7 +37,7 @@ kernel_thread: # start by forking the current process, but with shared VM @@ -314,9 +314,9 @@ diff -NurpP --minimal linux-3.3/arch/frv/kernel/kernel_thread.S linux-3.3-vs2.3. sethi.p #0xe4e4,gr9 ; second syscall arg [newsp] setlo #0xe4e4,gr9 setlos.p #0,gr10 ; third syscall arg [parent_tidptr] -diff -NurpP --minimal linux-3.3/arch/h8300/Kconfig linux-3.3-vs2.3.3.1/arch/h8300/Kconfig ---- linux-3.3/arch/h8300/Kconfig 2012-03-19 19:46:39.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/arch/h8300/Kconfig 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/arch/h8300/Kconfig linux-3.3.1-vs2.3.3.2/arch/h8300/Kconfig +--- linux-3.3.1/arch/h8300/Kconfig 2012-03-19 19:46:39.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/arch/h8300/Kconfig 2012-02-24 03:55:06.000000000 +0100 @@ -214,6 +214,8 @@ source "fs/Kconfig" source "arch/h8300/Kconfig.debug" @@ -326,9 +326,9 @@ diff -NurpP --minimal linux-3.3/arch/h8300/Kconfig linux-3.3-vs2.3.3.1/arch/h830 source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.3/arch/ia64/Kconfig linux-3.3-vs2.3.3.1/arch/ia64/Kconfig ---- linux-3.3/arch/ia64/Kconfig 2012-03-19 19:46:39.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/arch/ia64/Kconfig 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/arch/ia64/Kconfig linux-3.3.1-vs2.3.3.2/arch/ia64/Kconfig +--- linux-3.3.1/arch/ia64/Kconfig 2012-03-19 19:46:39.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/arch/ia64/Kconfig 2012-02-24 03:55:06.000000000 +0100 @@ -654,6 +654,8 @@ source "fs/Kconfig" source "arch/ia64/Kconfig.debug" @@ -338,9 +338,9 @@ diff -NurpP --minimal linux-3.3/arch/ia64/Kconfig linux-3.3-vs2.3.3.1/arch/ia64/ source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.3/arch/ia64/kernel/entry.S linux-3.3-vs2.3.3.1/arch/ia64/kernel/entry.S ---- linux-3.3/arch/ia64/kernel/entry.S 2012-03-19 19:46:40.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/arch/ia64/kernel/entry.S 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/arch/ia64/kernel/entry.S linux-3.3.1-vs2.3.3.2/arch/ia64/kernel/entry.S +--- linux-3.3.1/arch/ia64/kernel/entry.S 2012-03-19 19:46:40.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/arch/ia64/kernel/entry.S 2012-02-24 03:55:06.000000000 +0100 @@ -1714,7 +1714,7 @@ sys_call_table: data8 sys_mq_notify data8 sys_mq_getsetattr @@ -350,9 +350,9 @@ diff -NurpP --minimal linux-3.3/arch/ia64/kernel/entry.S linux-3.3-vs2.3.3.1/arc data8 sys_waitid // 1270 data8 sys_add_key data8 sys_request_key -diff -NurpP --minimal linux-3.3/arch/ia64/kernel/process.c linux-3.3-vs2.3.3.1/arch/ia64/kernel/process.c ---- linux-3.3/arch/ia64/kernel/process.c 2011-03-15 18:06:39.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/arch/ia64/kernel/process.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/arch/ia64/kernel/process.c linux-3.3.1-vs2.3.3.2/arch/ia64/kernel/process.c +--- linux-3.3.1/arch/ia64/kernel/process.c 2011-03-15 18:06:39.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/arch/ia64/kernel/process.c 2012-02-24 03:55:06.000000000 +0100 @@ -109,8 +109,8 @@ show_regs (struct pt_regs *regs) unsigned long ip = regs->cr_iip + ia64_psr(regs)->ri; @@ -364,9 +364,9 @@ diff -NurpP --minimal linux-3.3/arch/ia64/kernel/process.c linux-3.3-vs2.3.3.1/a 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-3.3/arch/ia64/kernel/ptrace.c linux-3.3-vs2.3.3.1/arch/ia64/kernel/ptrace.c ---- linux-3.3/arch/ia64/kernel/ptrace.c 2012-03-19 19:46:40.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/arch/ia64/kernel/ptrace.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/arch/ia64/kernel/ptrace.c linux-3.3.1-vs2.3.3.2/arch/ia64/kernel/ptrace.c +--- linux-3.3.1/arch/ia64/kernel/ptrace.c 2012-03-19 19:46:40.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/arch/ia64/kernel/ptrace.c 2012-02-24 03:55:06.000000000 +0100 @@ -21,6 +21,7 @@ #include #include @@ -375,9 +375,9 @@ diff -NurpP --minimal linux-3.3/arch/ia64/kernel/ptrace.c linux-3.3-vs2.3.3.1/ar #include #include -diff -NurpP --minimal linux-3.3/arch/ia64/kernel/traps.c linux-3.3-vs2.3.3.1/arch/ia64/kernel/traps.c ---- linux-3.3/arch/ia64/kernel/traps.c 2010-07-07 18:31:01.000000000 +0200 -+++ linux-3.3-vs2.3.3.1/arch/ia64/kernel/traps.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/arch/ia64/kernel/traps.c linux-3.3.1-vs2.3.3.2/arch/ia64/kernel/traps.c +--- linux-3.3.1/arch/ia64/kernel/traps.c 2010-07-07 18:31:01.000000000 +0200 ++++ linux-3.3.1-vs2.3.3.2/arch/ia64/kernel/traps.c 2012-02-24 03:55:06.000000000 +0100 @@ -59,8 +59,9 @@ die (const char *str, struct pt_regs *re put_cpu(); @@ -402,9 +402,9 @@ diff -NurpP --minimal linux-3.3/arch/ia64/kernel/traps.c linux-3.3-vs2.3.3.1/arc } } } -diff -NurpP --minimal linux-3.3/arch/m32r/kernel/traps.c linux-3.3-vs2.3.3.1/arch/m32r/kernel/traps.c ---- linux-3.3/arch/m32r/kernel/traps.c 2011-10-24 18:44:58.000000000 +0200 -+++ linux-3.3-vs2.3.3.1/arch/m32r/kernel/traps.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/arch/m32r/kernel/traps.c linux-3.3.1-vs2.3.3.2/arch/m32r/kernel/traps.c +--- linux-3.3.1/arch/m32r/kernel/traps.c 2011-10-24 18:44:58.000000000 +0200 ++++ linux-3.3.1-vs2.3.3.2/arch/m32r/kernel/traps.c 2012-02-24 03:55:06.000000000 +0100 @@ -196,8 +196,9 @@ static void show_registers(struct pt_reg } else { printk("SPI: %08lx\n", sp); @@ -417,9 +417,9 @@ diff -NurpP --minimal linux-3.3/arch/m32r/kernel/traps.c linux-3.3-vs2.3.3.1/arc /* * When in-kernel, we also print out the stack and code at the -diff -NurpP --minimal linux-3.3/arch/m68k/Kconfig linux-3.3-vs2.3.3.1/arch/m68k/Kconfig ---- linux-3.3/arch/m68k/Kconfig 2012-03-19 19:46:40.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/arch/m68k/Kconfig 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/arch/m68k/Kconfig linux-3.3.1-vs2.3.3.2/arch/m68k/Kconfig +--- linux-3.3.1/arch/m68k/Kconfig 2012-03-19 19:46:40.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/arch/m68k/Kconfig 2012-02-24 03:55:06.000000000 +0100 @@ -145,6 +145,8 @@ source "fs/Kconfig" source "arch/m68k/Kconfig.debug" @@ -429,9 +429,9 @@ diff -NurpP --minimal linux-3.3/arch/m68k/Kconfig linux-3.3-vs2.3.3.1/arch/m68k/ source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.3/arch/mips/Kconfig linux-3.3-vs2.3.3.1/arch/mips/Kconfig ---- linux-3.3/arch/mips/Kconfig 2012-03-19 19:46:41.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/arch/mips/Kconfig 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/arch/mips/Kconfig linux-3.3.1-vs2.3.3.2/arch/mips/Kconfig +--- linux-3.3.1/arch/mips/Kconfig 2012-03-19 19:46:41.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/arch/mips/Kconfig 2012-02-24 03:55:06.000000000 +0100 @@ -2514,6 +2514,8 @@ source "fs/Kconfig" source "arch/mips/Kconfig.debug" @@ -441,9 +441,9 @@ diff -NurpP --minimal linux-3.3/arch/mips/Kconfig linux-3.3-vs2.3.3.1/arch/mips/ source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.3/arch/mips/kernel/ptrace.c linux-3.3-vs2.3.3.1/arch/mips/kernel/ptrace.c ---- linux-3.3/arch/mips/kernel/ptrace.c 2012-03-19 19:46:43.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/arch/mips/kernel/ptrace.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/arch/mips/kernel/ptrace.c linux-3.3.1-vs2.3.3.2/arch/mips/kernel/ptrace.c +--- linux-3.3.1/arch/mips/kernel/ptrace.c 2012-03-19 19:46:43.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/arch/mips/kernel/ptrace.c 2012-02-24 03:55:06.000000000 +0100 @@ -25,6 +25,7 @@ #include #include @@ -462,9 +462,9 @@ diff -NurpP --minimal linux-3.3/arch/mips/kernel/ptrace.c linux-3.3-vs2.3.3.1/ar 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-3.3/arch/mips/kernel/scall32-o32.S linux-3.3-vs2.3.3.1/arch/mips/kernel/scall32-o32.S ---- linux-3.3/arch/mips/kernel/scall32-o32.S 2012-01-09 16:14:05.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/arch/mips/kernel/scall32-o32.S 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/arch/mips/kernel/scall32-o32.S linux-3.3.1-vs2.3.3.2/arch/mips/kernel/scall32-o32.S +--- linux-3.3.1/arch/mips/kernel/scall32-o32.S 2012-01-09 16:14:05.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/arch/mips/kernel/scall32-o32.S 2012-02-24 03:55:06.000000000 +0100 @@ -523,7 +523,7 @@ einval: li v0, -ENOSYS sys sys_mq_timedreceive 5 sys sys_mq_notify 2 /* 4275 */ @@ -474,9 +474,9 @@ diff -NurpP --minimal linux-3.3/arch/mips/kernel/scall32-o32.S linux-3.3-vs2.3.3 sys sys_waitid 5 sys sys_ni_syscall 0 /* available, was setaltroot */ sys sys_add_key 5 /* 4280 */ -diff -NurpP --minimal linux-3.3/arch/mips/kernel/scall64-64.S linux-3.3-vs2.3.3.1/arch/mips/kernel/scall64-64.S ---- linux-3.3/arch/mips/kernel/scall64-64.S 2012-01-09 16:14:05.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/arch/mips/kernel/scall64-64.S 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/arch/mips/kernel/scall64-64.S linux-3.3.1-vs2.3.3.2/arch/mips/kernel/scall64-64.S +--- linux-3.3.1/arch/mips/kernel/scall64-64.S 2012-01-09 16:14:05.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/arch/mips/kernel/scall64-64.S 2012-02-24 03:55:06.000000000 +0100 @@ -362,7 +362,7 @@ sys_call_table: PTR sys_mq_timedreceive PTR sys_mq_notify @@ -486,9 +486,9 @@ diff -NurpP --minimal linux-3.3/arch/mips/kernel/scall64-64.S linux-3.3-vs2.3.3. PTR sys_waitid PTR sys_ni_syscall /* available, was setaltroot */ PTR sys_add_key -diff -NurpP --minimal linux-3.3/arch/mips/kernel/scall64-n32.S linux-3.3-vs2.3.3.1/arch/mips/kernel/scall64-n32.S ---- linux-3.3/arch/mips/kernel/scall64-n32.S 2012-01-09 16:14:05.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/arch/mips/kernel/scall64-n32.S 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/arch/mips/kernel/scall64-n32.S linux-3.3.1-vs2.3.3.2/arch/mips/kernel/scall64-n32.S +--- linux-3.3.1/arch/mips/kernel/scall64-n32.S 2012-01-09 16:14:05.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/arch/mips/kernel/scall64-n32.S 2012-02-24 03:55:06.000000000 +0100 @@ -361,7 +361,7 @@ EXPORT(sysn32_call_table) PTR compat_sys_mq_timedreceive PTR compat_sys_mq_notify @@ -498,9 +498,9 @@ diff -NurpP --minimal linux-3.3/arch/mips/kernel/scall64-n32.S linux-3.3-vs2.3.3 PTR compat_sys_waitid PTR sys_ni_syscall /* available, was setaltroot */ PTR sys_add_key -diff -NurpP --minimal linux-3.3/arch/mips/kernel/scall64-o32.S linux-3.3-vs2.3.3.1/arch/mips/kernel/scall64-o32.S ---- linux-3.3/arch/mips/kernel/scall64-o32.S 2012-01-09 16:14:05.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/arch/mips/kernel/scall64-o32.S 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/arch/mips/kernel/scall64-o32.S linux-3.3.1-vs2.3.3.2/arch/mips/kernel/scall64-o32.S +--- linux-3.3.1/arch/mips/kernel/scall64-o32.S 2012-01-09 16:14:05.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/arch/mips/kernel/scall64-o32.S 2012-02-24 03:55:06.000000000 +0100 @@ -480,7 +480,7 @@ sys_call_table: PTR compat_sys_mq_timedreceive PTR compat_sys_mq_notify /* 4275 */ @@ -510,9 +510,9 @@ diff -NurpP --minimal linux-3.3/arch/mips/kernel/scall64-o32.S linux-3.3-vs2.3.3 PTR sys_32_waitid PTR sys_ni_syscall /* available, was setaltroot */ PTR sys_add_key /* 4280 */ -diff -NurpP --minimal linux-3.3/arch/mips/kernel/traps.c linux-3.3-vs2.3.3.1/arch/mips/kernel/traps.c ---- linux-3.3/arch/mips/kernel/traps.c 2012-03-19 19:46:43.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/arch/mips/kernel/traps.c 2012-03-19 20:52:09.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/arch/mips/kernel/traps.c linux-3.3.1-vs2.3.3.2/arch/mips/kernel/traps.c +--- linux-3.3.1/arch/mips/kernel/traps.c 2012-03-19 19:46:43.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/arch/mips/kernel/traps.c 2012-03-19 20:52:09.000000000 +0100 @@ -344,9 +344,10 @@ void show_registers(struct pt_regs *regs __show_regs(regs); @@ -527,9 +527,9 @@ diff -NurpP --minimal linux-3.3/arch/mips/kernel/traps.c linux-3.3-vs2.3.3.1/arc if (cpu_has_userlocal) { unsigned long tls; -diff -NurpP --minimal linux-3.3/arch/parisc/Kconfig linux-3.3-vs2.3.3.1/arch/parisc/Kconfig ---- linux-3.3/arch/parisc/Kconfig 2012-03-19 19:46:44.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/arch/parisc/Kconfig 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/arch/parisc/Kconfig linux-3.3.1-vs2.3.3.2/arch/parisc/Kconfig +--- linux-3.3.1/arch/parisc/Kconfig 2012-03-19 19:46:44.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/arch/parisc/Kconfig 2012-02-24 03:55:06.000000000 +0100 @@ -279,6 +279,8 @@ source "fs/Kconfig" source "arch/parisc/Kconfig.debug" @@ -539,9 +539,9 @@ diff -NurpP --minimal linux-3.3/arch/parisc/Kconfig linux-3.3-vs2.3.3.1/arch/par source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.3/arch/parisc/kernel/syscall_table.S linux-3.3-vs2.3.3.1/arch/parisc/kernel/syscall_table.S ---- linux-3.3/arch/parisc/kernel/syscall_table.S 2011-10-24 18:45:00.000000000 +0200 -+++ linux-3.3-vs2.3.3.1/arch/parisc/kernel/syscall_table.S 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/arch/parisc/kernel/syscall_table.S linux-3.3.1-vs2.3.3.2/arch/parisc/kernel/syscall_table.S +--- linux-3.3.1/arch/parisc/kernel/syscall_table.S 2011-10-24 18:45:00.000000000 +0200 ++++ linux-3.3.1-vs2.3.3.2/arch/parisc/kernel/syscall_table.S 2012-02-24 03:55:06.000000000 +0100 @@ -361,7 +361,7 @@ ENTRY_COMP(mbind) /* 260 */ ENTRY_COMP(get_mempolicy) @@ -551,9 +551,9 @@ diff -NurpP --minimal linux-3.3/arch/parisc/kernel/syscall_table.S linux-3.3-vs2 ENTRY_SAME(add_key) ENTRY_SAME(request_key) /* 265 */ ENTRY_SAME(keyctl) -diff -NurpP --minimal linux-3.3/arch/parisc/kernel/traps.c linux-3.3-vs2.3.3.1/arch/parisc/kernel/traps.c ---- linux-3.3/arch/parisc/kernel/traps.c 2011-10-24 18:45:00.000000000 +0200 -+++ linux-3.3-vs2.3.3.1/arch/parisc/kernel/traps.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/arch/parisc/kernel/traps.c linux-3.3.1-vs2.3.3.2/arch/parisc/kernel/traps.c +--- linux-3.3.1/arch/parisc/kernel/traps.c 2011-10-24 18:45:00.000000000 +0200 ++++ linux-3.3.1-vs2.3.3.2/arch/parisc/kernel/traps.c 2012-02-24 03:55:06.000000000 +0100 @@ -236,8 +236,9 @@ void die_if_kernel(char *str, struct pt_ if (err == 0) return; /* STFU */ @@ -577,9 +577,9 @@ diff -NurpP --minimal linux-3.3/arch/parisc/kernel/traps.c linux-3.3-vs2.3.3.1/a /* Wot's wrong wif bein' racy? */ if (current->thread.flags & PARISC_KERNEL_DEATH) { -diff -NurpP --minimal linux-3.3/arch/parisc/mm/fault.c linux-3.3-vs2.3.3.1/arch/parisc/mm/fault.c ---- linux-3.3/arch/parisc/mm/fault.c 2010-08-02 16:52:06.000000000 +0200 -+++ linux-3.3-vs2.3.3.1/arch/parisc/mm/fault.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/arch/parisc/mm/fault.c linux-3.3.1-vs2.3.3.2/arch/parisc/mm/fault.c +--- linux-3.3.1/arch/parisc/mm/fault.c 2010-08-02 16:52:06.000000000 +0200 ++++ linux-3.3.1-vs2.3.3.2/arch/parisc/mm/fault.c 2012-02-24 03:55:06.000000000 +0100 @@ -237,8 +237,9 @@ bad_area: #ifdef PRINT_USER_FAULTS @@ -592,9 +592,9 @@ diff -NurpP --minimal linux-3.3/arch/parisc/mm/fault.c linux-3.3-vs2.3.3.1/arch/ if (vma) { printk(KERN_DEBUG "vm_start = 0x%08lx, vm_end = 0x%08lx\n", vma->vm_start, vma->vm_end); -diff -NurpP --minimal linux-3.3/arch/powerpc/Kconfig linux-3.3-vs2.3.3.1/arch/powerpc/Kconfig ---- linux-3.3/arch/powerpc/Kconfig 2012-03-19 19:46:44.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/arch/powerpc/Kconfig 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/arch/powerpc/Kconfig linux-3.3.1-vs2.3.3.2/arch/powerpc/Kconfig +--- linux-3.3.1/arch/powerpc/Kconfig 2012-03-19 19:46:44.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/arch/powerpc/Kconfig 2012-02-24 03:55:06.000000000 +0100 @@ -997,6 +997,8 @@ source "lib/Kconfig" source "arch/powerpc/Kconfig.debug" @@ -604,9 +604,9 @@ diff -NurpP --minimal linux-3.3/arch/powerpc/Kconfig linux-3.3-vs2.3.3.1/arch/po source "security/Kconfig" config KEYS_COMPAT -diff -NurpP --minimal linux-3.3/arch/powerpc/include/asm/unistd.h linux-3.3-vs2.3.3.1/arch/powerpc/include/asm/unistd.h ---- linux-3.3/arch/powerpc/include/asm/unistd.h 2012-01-09 16:14:05.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/arch/powerpc/include/asm/unistd.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/arch/powerpc/include/asm/unistd.h linux-3.3.1-vs2.3.3.2/arch/powerpc/include/asm/unistd.h +--- linux-3.3.1/arch/powerpc/include/asm/unistd.h 2012-01-09 16:14:05.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/arch/powerpc/include/asm/unistd.h 2012-02-24 03:55:06.000000000 +0100 @@ -275,7 +275,7 @@ #endif #define __NR_rtas 255 @@ -616,9 +616,9 @@ diff -NurpP --minimal linux-3.3/arch/powerpc/include/asm/unistd.h linux-3.3-vs2. #define __NR_migrate_pages 258 #define __NR_mbind 259 #define __NR_get_mempolicy 260 -diff -NurpP --minimal linux-3.3/arch/powerpc/kernel/process.c linux-3.3-vs2.3.3.1/arch/powerpc/kernel/process.c ---- linux-3.3/arch/powerpc/kernel/process.c 2012-03-19 19:46:45.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/arch/powerpc/kernel/process.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/arch/powerpc/kernel/process.c linux-3.3.1-vs2.3.3.2/arch/powerpc/kernel/process.c +--- linux-3.3.1/arch/powerpc/kernel/process.c 2012-03-19 19:46:45.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/arch/powerpc/kernel/process.c 2012-02-24 03:55:06.000000000 +0100 @@ -656,8 +656,9 @@ void show_regs(struct pt_regs * regs) #else printk("DAR: "REG", DSISR: %08lx\n", regs->dar, regs->dsisr); @@ -631,9 +631,9 @@ diff -NurpP --minimal linux-3.3/arch/powerpc/kernel/process.c linux-3.3-vs2.3.3. #ifdef CONFIG_SMP printk(" CPU: %d", raw_smp_processor_id()); -diff -NurpP --minimal linux-3.3/arch/powerpc/kernel/traps.c linux-3.3-vs2.3.3.1/arch/powerpc/kernel/traps.c ---- linux-3.3/arch/powerpc/kernel/traps.c 2012-03-19 19:46:45.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/arch/powerpc/kernel/traps.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/arch/powerpc/kernel/traps.c linux-3.3.1-vs2.3.3.2/arch/powerpc/kernel/traps.c +--- linux-3.3.1/arch/powerpc/kernel/traps.c 2012-03-19 19:46:45.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/arch/powerpc/kernel/traps.c 2012-02-24 03:55:06.000000000 +0100 @@ -1105,8 +1105,9 @@ void nonrecoverable_exception(struct pt_ void trace_syscall(struct pt_regs *regs) @@ -646,9 +646,9 @@ diff -NurpP --minimal linux-3.3/arch/powerpc/kernel/traps.c linux-3.3-vs2.3.3.1/ regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted()); } -diff -NurpP --minimal linux-3.3/arch/s390/Kconfig linux-3.3-vs2.3.3.1/arch/s390/Kconfig ---- linux-3.3/arch/s390/Kconfig 2012-03-19 19:46:48.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/arch/s390/Kconfig 2012-03-19 20:52:09.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/arch/s390/Kconfig linux-3.3.1-vs2.3.3.2/arch/s390/Kconfig +--- linux-3.3.1/arch/s390/Kconfig 2012-03-19 19:46:48.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/arch/s390/Kconfig 2012-03-19 20:52:09.000000000 +0100 @@ -638,6 +638,8 @@ source "fs/Kconfig" source "arch/s390/Kconfig.debug" @@ -658,9 +658,9 @@ diff -NurpP --minimal linux-3.3/arch/s390/Kconfig linux-3.3-vs2.3.3.1/arch/s390/ source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.3/arch/s390/include/asm/tlb.h linux-3.3-vs2.3.3.1/arch/s390/include/asm/tlb.h ---- linux-3.3/arch/s390/include/asm/tlb.h 2011-07-22 11:17:41.000000000 +0200 -+++ linux-3.3-vs2.3.3.1/arch/s390/include/asm/tlb.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/arch/s390/include/asm/tlb.h linux-3.3.1-vs2.3.3.2/arch/s390/include/asm/tlb.h +--- linux-3.3.1/arch/s390/include/asm/tlb.h 2011-07-22 11:17:41.000000000 +0200 ++++ linux-3.3.1-vs2.3.3.2/arch/s390/include/asm/tlb.h 2012-02-24 03:55:06.000000000 +0100 @@ -24,6 +24,7 @@ #include #include @@ -669,9 +669,9 @@ diff -NurpP --minimal linux-3.3/arch/s390/include/asm/tlb.h linux-3.3-vs2.3.3.1/ #include #include #include -diff -NurpP --minimal linux-3.3/arch/s390/include/asm/unistd.h linux-3.3-vs2.3.3.1/arch/s390/include/asm/unistd.h ---- linux-3.3/arch/s390/include/asm/unistd.h 2012-03-19 19:46:48.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/arch/s390/include/asm/unistd.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/arch/s390/include/asm/unistd.h linux-3.3.1-vs2.3.3.2/arch/s390/include/asm/unistd.h +--- linux-3.3.1/arch/s390/include/asm/unistd.h 2012-03-19 19:46:48.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/arch/s390/include/asm/unistd.h 2012-02-24 03:55:06.000000000 +0100 @@ -202,7 +202,7 @@ #define __NR_clock_gettime (__NR_timer_create+6) #define __NR_clock_getres (__NR_timer_create+7) @@ -681,9 +681,9 @@ diff -NurpP --minimal linux-3.3/arch/s390/include/asm/unistd.h linux-3.3-vs2.3.3 #define __NR_statfs64 265 #define __NR_fstatfs64 266 #define __NR_remap_file_pages 267 -diff -NurpP --minimal linux-3.3/arch/s390/kernel/ptrace.c linux-3.3-vs2.3.3.1/arch/s390/kernel/ptrace.c ---- linux-3.3/arch/s390/kernel/ptrace.c 2012-03-19 19:46:48.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/arch/s390/kernel/ptrace.c 2012-03-19 20:53:54.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/arch/s390/kernel/ptrace.c linux-3.3.1-vs2.3.3.2/arch/s390/kernel/ptrace.c +--- linux-3.3.1/arch/s390/kernel/ptrace.c 2012-03-19 19:46:48.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/arch/s390/kernel/ptrace.c 2012-03-19 20:53:54.000000000 +0100 @@ -21,6 +21,7 @@ #include #include @@ -692,9 +692,9 @@ diff -NurpP --minimal linux-3.3/arch/s390/kernel/ptrace.c linux-3.3-vs2.3.3.1/ar #include #include #include -diff -NurpP --minimal linux-3.3/arch/s390/kernel/syscalls.S linux-3.3-vs2.3.3.1/arch/s390/kernel/syscalls.S ---- linux-3.3/arch/s390/kernel/syscalls.S 2012-01-09 16:14:06.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/arch/s390/kernel/syscalls.S 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/arch/s390/kernel/syscalls.S linux-3.3.1-vs2.3.3.2/arch/s390/kernel/syscalls.S +--- linux-3.3.1/arch/s390/kernel/syscalls.S 2012-01-09 16:14:06.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/arch/s390/kernel/syscalls.S 2012-02-24 03:55:06.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) @@ -704,9 +704,9 @@ diff -NurpP --minimal linux-3.3/arch/s390/kernel/syscalls.S linux-3.3-vs2.3.3.1/ 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-3.3/arch/sh/Kconfig linux-3.3-vs2.3.3.1/arch/sh/Kconfig ---- linux-3.3/arch/sh/Kconfig 2012-03-19 19:46:49.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/arch/sh/Kconfig 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/arch/sh/Kconfig linux-3.3.1-vs2.3.3.2/arch/sh/Kconfig +--- linux-3.3.1/arch/sh/Kconfig 2012-03-19 19:46:49.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/arch/sh/Kconfig 2012-02-24 03:55:06.000000000 +0100 @@ -901,6 +901,8 @@ source "fs/Kconfig" source "arch/sh/Kconfig.debug" @@ -716,9 +716,9 @@ diff -NurpP --minimal linux-3.3/arch/sh/Kconfig linux-3.3-vs2.3.3.1/arch/sh/Kcon source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.3/arch/sh/kernel/irq.c linux-3.3-vs2.3.3.1/arch/sh/kernel/irq.c ---- linux-3.3/arch/sh/kernel/irq.c 2011-07-22 11:17:41.000000000 +0200 -+++ linux-3.3-vs2.3.3.1/arch/sh/kernel/irq.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/arch/sh/kernel/irq.c linux-3.3.1-vs2.3.3.2/arch/sh/kernel/irq.c +--- linux-3.3.1/arch/sh/kernel/irq.c 2011-07-22 11:17:41.000000000 +0200 ++++ linux-3.3.1-vs2.3.3.2/arch/sh/kernel/irq.c 2012-02-24 03:55:06.000000000 +0100 @@ -14,6 +14,7 @@ #include #include @@ -727,9 +727,9 @@ diff -NurpP --minimal linux-3.3/arch/sh/kernel/irq.c linux-3.3-vs2.3.3.1/arch/sh #include #include #include -diff -NurpP --minimal linux-3.3/arch/sparc/Kconfig linux-3.3-vs2.3.3.1/arch/sparc/Kconfig ---- linux-3.3/arch/sparc/Kconfig 2012-03-19 19:46:49.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/arch/sparc/Kconfig 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/arch/sparc/Kconfig linux-3.3.1-vs2.3.3.2/arch/sparc/Kconfig +--- linux-3.3.1/arch/sparc/Kconfig 2012-03-19 19:46:49.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/arch/sparc/Kconfig 2012-02-24 03:55:06.000000000 +0100 @@ -594,6 +594,8 @@ source "fs/Kconfig" source "arch/sparc/Kconfig.debug" @@ -739,9 +739,9 @@ diff -NurpP --minimal linux-3.3/arch/sparc/Kconfig linux-3.3-vs2.3.3.1/arch/spar source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.3/arch/sparc/include/asm/unistd.h linux-3.3-vs2.3.3.1/arch/sparc/include/asm/unistd.h ---- linux-3.3/arch/sparc/include/asm/unistd.h 2012-01-09 16:14:07.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/arch/sparc/include/asm/unistd.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/arch/sparc/include/asm/unistd.h linux-3.3.1-vs2.3.3.2/arch/sparc/include/asm/unistd.h +--- linux-3.3.1/arch/sparc/include/asm/unistd.h 2012-01-09 16:14:07.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/arch/sparc/include/asm/unistd.h 2012-02-24 03:55:06.000000000 +0100 @@ -335,7 +335,7 @@ #define __NR_timer_getoverrun 264 #define __NR_timer_delete 265 @@ -751,9 +751,9 @@ diff -NurpP --minimal linux-3.3/arch/sparc/include/asm/unistd.h linux-3.3-vs2.3. #define __NR_io_setup 268 #define __NR_io_destroy 269 #define __NR_io_submit 270 -diff -NurpP --minimal linux-3.3/arch/sparc/kernel/systbls_32.S linux-3.3-vs2.3.3.1/arch/sparc/kernel/systbls_32.S ---- linux-3.3/arch/sparc/kernel/systbls_32.S 2012-01-09 16:14:09.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/arch/sparc/kernel/systbls_32.S 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/arch/sparc/kernel/systbls_32.S linux-3.3.1-vs2.3.3.2/arch/sparc/kernel/systbls_32.S +--- linux-3.3.1/arch/sparc/kernel/systbls_32.S 2012-01-09 16:14:09.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/arch/sparc/kernel/systbls_32.S 2012-02-24 03:55:06.000000000 +0100 @@ -70,7 +70,7 @@ sys_call_table: /*250*/ .long sys_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_ni_syscall /*255*/ .long sys_sync_file_range, sys_clock_settime, sys_clock_gettime, sys_clock_getres, sys_clock_nanosleep @@ -763,9 +763,9 @@ diff -NurpP --minimal linux-3.3/arch/sparc/kernel/systbls_32.S linux-3.3-vs2.3.3 /*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-3.3/arch/sparc/kernel/systbls_64.S linux-3.3-vs2.3.3.1/arch/sparc/kernel/systbls_64.S ---- linux-3.3/arch/sparc/kernel/systbls_64.S 2012-01-09 16:14:09.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/arch/sparc/kernel/systbls_64.S 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/arch/sparc/kernel/systbls_64.S linux-3.3.1-vs2.3.3.2/arch/sparc/kernel/systbls_64.S +--- linux-3.3.1/arch/sparc/kernel/systbls_64.S 2012-01-09 16:14:09.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/arch/sparc/kernel/systbls_64.S 2012-02-24 03:55:06.000000000 +0100 @@ -71,7 +71,7 @@ sys_call_table32: /*250*/ .word sys_mremap, compat_sys_sysctl, sys32_getsid, sys_fdatasync, sys_nis_syscall .word sys32_sync_file_range, compat_sys_clock_settime, compat_sys_clock_gettime, compat_sys_clock_getres, sys32_clock_nanosleep @@ -784,9 +784,9 @@ diff -NurpP --minimal linux-3.3/arch/sparc/kernel/systbls_64.S linux-3.3-vs2.3.3 /*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-3.3/arch/um/Kconfig.rest linux-3.3-vs2.3.3.1/arch/um/Kconfig.rest ---- linux-3.3/arch/um/Kconfig.rest 2012-01-09 16:14:09.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/arch/um/Kconfig.rest 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/arch/um/Kconfig.rest linux-3.3.1-vs2.3.3.2/arch/um/Kconfig.rest +--- linux-3.3.1/arch/um/Kconfig.rest 2012-01-09 16:14:09.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/arch/um/Kconfig.rest 2012-02-24 03:55:06.000000000 +0100 @@ -12,6 +12,8 @@ source "arch/um/Kconfig.net" source "fs/Kconfig" @@ -796,14 +796,14 @@ diff -NurpP --minimal linux-3.3/arch/um/Kconfig.rest linux-3.3-vs2.3.3.1/arch/um source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.3/arch/um/include/shared/kern_constants.h linux-3.3-vs2.3.3.1/arch/um/include/shared/kern_constants.h ---- linux-3.3/arch/um/include/shared/kern_constants.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/arch/um/include/shared/kern_constants.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/arch/um/include/shared/kern_constants.h linux-3.3.1-vs2.3.3.2/arch/um/include/shared/kern_constants.h +--- linux-3.3.1/arch/um/include/shared/kern_constants.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/arch/um/include/shared/kern_constants.h 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../include/generated/asm-offsets.h" -diff -NurpP --minimal linux-3.3/arch/um/include/shared/user_constants.h linux-3.3-vs2.3.3.1/arch/um/include/shared/user_constants.h ---- linux-3.3/arch/um/include/shared/user_constants.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/arch/um/include/shared/user_constants.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/arch/um/include/shared/user_constants.h linux-3.3.1-vs2.3.3.2/arch/um/include/shared/user_constants.h +--- linux-3.3.1/arch/um/include/shared/user_constants.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/arch/um/include/shared/user_constants.h 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,40 @@ +/* + * DO NOT MODIFY. @@ -845,9 +845,9 @@ diff -NurpP --minimal linux-3.3/arch/um/include/shared/user_constants.h linux-3. +#define UM_PROT_WRITE 2 /* PROT_WRITE # */ +#define UM_PROT_EXEC 4 /* PROT_EXEC # */ + -diff -NurpP --minimal linux-3.3/arch/x86/Kconfig linux-3.3-vs2.3.3.1/arch/x86/Kconfig ---- linux-3.3/arch/x86/Kconfig 2012-03-19 19:46:49.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/arch/x86/Kconfig 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/arch/x86/Kconfig linux-3.3.1-vs2.3.3.2/arch/x86/Kconfig +--- linux-3.3.1/arch/x86/Kconfig 2012-03-19 19:46:49.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/arch/x86/Kconfig 2012-02-24 03:55:06.000000000 +0100 @@ -2213,6 +2213,8 @@ source "fs/Kconfig" source "arch/x86/Kconfig.debug" @@ -857,9 +857,9 @@ diff -NurpP --minimal linux-3.3/arch/x86/Kconfig linux-3.3-vs2.3.3.1/arch/x86/Kc source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.3/arch/x86/syscalls/syscall_32.tbl linux-3.3-vs2.3.3.1/arch/x86/syscalls/syscall_32.tbl ---- linux-3.3/arch/x86/syscalls/syscall_32.tbl 2012-03-19 19:46:51.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/arch/x86/syscalls/syscall_32.tbl 2012-02-24 16:28:51.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/arch/x86/syscalls/syscall_32.tbl linux-3.3.1-vs2.3.3.2/arch/x86/syscalls/syscall_32.tbl +--- linux-3.3.1/arch/x86/syscalls/syscall_32.tbl 2012-04-03 03:01:24.000000000 +0200 ++++ linux-3.3.1-vs2.3.3.2/arch/x86/syscalls/syscall_32.tbl 2012-04-03 03:02:12.000000000 +0200 @@ -279,7 +279,7 @@ 270 i386 tgkill sys_tgkill 271 i386 utimes sys_utimes compat_sys_utimes @@ -869,9 +869,9 @@ diff -NurpP --minimal linux-3.3/arch/x86/syscalls/syscall_32.tbl linux-3.3-vs2.3 274 i386 mbind sys_mbind 275 i386 get_mempolicy sys_get_mempolicy compat_sys_get_mempolicy 276 i386 set_mempolicy sys_set_mempolicy -diff -NurpP --minimal linux-3.3/arch/x86/syscalls/syscall_64.tbl linux-3.3-vs2.3.3.1/arch/x86/syscalls/syscall_64.tbl ---- linux-3.3/arch/x86/syscalls/syscall_64.tbl 2012-03-19 19:46:51.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/arch/x86/syscalls/syscall_64.tbl 2012-02-24 16:29:25.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/arch/x86/syscalls/syscall_64.tbl linux-3.3.1-vs2.3.3.2/arch/x86/syscalls/syscall_64.tbl +--- linux-3.3.1/arch/x86/syscalls/syscall_64.tbl 2012-03-19 19:46:51.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/arch/x86/syscalls/syscall_64.tbl 2012-02-24 16:29:25.000000000 +0100 @@ -242,7 +242,7 @@ 233 64 epoll_ctl sys_epoll_ctl 234 64 tgkill sys_tgkill @@ -881,9 +881,9 @@ diff -NurpP --minimal linux-3.3/arch/x86/syscalls/syscall_64.tbl linux-3.3-vs2.3 237 64 mbind sys_mbind 238 64 set_mempolicy sys_set_mempolicy 239 64 get_mempolicy sys_get_mempolicy -diff -NurpP --minimal linux-3.3/drivers/block/Kconfig linux-3.3-vs2.3.3.1/drivers/block/Kconfig ---- linux-3.3/drivers/block/Kconfig 2012-03-19 19:46:52.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/drivers/block/Kconfig 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/drivers/block/Kconfig linux-3.3.1-vs2.3.3.2/drivers/block/Kconfig +--- linux-3.3.1/drivers/block/Kconfig 2012-03-19 19:46:52.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/drivers/block/Kconfig 2012-02-24 03:55:06.000000000 +0100 @@ -290,6 +290,13 @@ config BLK_DEV_CRYPTOLOOP source "drivers/block/drbd/Kconfig" @@ -898,9 +898,9 @@ diff -NurpP --minimal linux-3.3/drivers/block/Kconfig linux-3.3-vs2.3.3.1/driver config BLK_DEV_NBD tristate "Network block device support" depends on NET -diff -NurpP --minimal linux-3.3/drivers/block/Makefile linux-3.3-vs2.3.3.1/drivers/block/Makefile ---- linux-3.3/drivers/block/Makefile 2012-03-19 19:46:52.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/drivers/block/Makefile 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/drivers/block/Makefile linux-3.3.1-vs2.3.3.2/drivers/block/Makefile +--- linux-3.3.1/drivers/block/Makefile 2012-03-19 19:46:52.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/drivers/block/Makefile 2012-02-24 03:55:06.000000000 +0100 @@ -35,6 +35,7 @@ obj-$(CONFIG_VIODASD) += viodasd.o obj-$(CONFIG_BLK_DEV_SX8) += sx8.o obj-$(CONFIG_BLK_DEV_UB) += ub.o @@ -909,9 +909,9 @@ diff -NurpP --minimal linux-3.3/drivers/block/Makefile linux-3.3-vs2.3.3.1/drive obj-$(CONFIG_XEN_BLKDEV_FRONTEND) += xen-blkfront.o obj-$(CONFIG_XEN_BLKDEV_BACKEND) += xen-blkback/ -diff -NurpP --minimal linux-3.3/drivers/block/loop.c linux-3.3-vs2.3.3.1/drivers/block/loop.c ---- linux-3.3/drivers/block/loop.c 2012-03-19 19:46:52.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/drivers/block/loop.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/drivers/block/loop.c linux-3.3.1-vs2.3.3.2/drivers/block/loop.c +--- linux-3.3.1/drivers/block/loop.c 2012-03-19 19:46:52.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/drivers/block/loop.c 2012-02-24 03:55:06.000000000 +0100 @@ -76,6 +76,7 @@ #include #include @@ -967,9 +967,9 @@ diff -NurpP --minimal linux-3.3/drivers/block/loop.c linux-3.3-vs2.3.3.1/drivers mutex_lock(&lo->lo_ctl_mutex); lo->lo_refcnt++; mutex_unlock(&lo->lo_ctl_mutex); -diff -NurpP --minimal linux-3.3/drivers/block/vroot.c linux-3.3-vs2.3.3.1/drivers/block/vroot.c ---- linux-3.3/drivers/block/vroot.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/drivers/block/vroot.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/drivers/block/vroot.c linux-3.3.1-vs2.3.3.2/drivers/block/vroot.c +--- linux-3.3.1/drivers/block/vroot.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/drivers/block/vroot.c 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,291 @@ +/* + * linux/drivers/block/vroot.c @@ -1262,9 +1262,9 @@ diff -NurpP --minimal linux-3.3/drivers/block/vroot.c linux-3.3-vs2.3.3.1/driver + +#endif + -diff -NurpP --minimal linux-3.3/drivers/infiniband/Kconfig linux-3.3-vs2.3.3.1/drivers/infiniband/Kconfig ---- linux-3.3/drivers/infiniband/Kconfig 2012-03-19 19:46:54.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/drivers/infiniband/Kconfig 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/drivers/infiniband/Kconfig linux-3.3.1-vs2.3.3.2/drivers/infiniband/Kconfig +--- linux-3.3.1/drivers/infiniband/Kconfig 2012-03-19 19:46:54.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/drivers/infiniband/Kconfig 2012-02-24 03:55:06.000000000 +0100 @@ -39,7 +39,7 @@ config INFINIBAND_USER_MEM config INFINIBAND_ADDR_TRANS bool @@ -1274,9 +1274,9 @@ diff -NurpP --minimal linux-3.3/drivers/infiniband/Kconfig linux-3.3-vs2.3.3.1/d default y source "drivers/infiniband/hw/mthca/Kconfig" -diff -NurpP --minimal linux-3.3/drivers/infiniband/core/addr.c linux-3.3-vs2.3.3.1/drivers/infiniband/core/addr.c ---- linux-3.3/drivers/infiniband/core/addr.c 2012-03-19 19:46:54.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/drivers/infiniband/core/addr.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/drivers/infiniband/core/addr.c linux-3.3.1-vs2.3.3.2/drivers/infiniband/core/addr.c +--- linux-3.3.1/drivers/infiniband/core/addr.c 2012-03-19 19:46:54.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/drivers/infiniband/core/addr.c 2012-02-24 03:55:06.000000000 +0100 @@ -259,7 +259,7 @@ static int addr6_resolve(struct sockaddr if (ipv6_addr_any(&fl6.saddr)) { @@ -1286,9 +1286,9 @@ diff -NurpP --minimal linux-3.3/drivers/infiniband/core/addr.c linux-3.3-vs2.3.3 if (ret) goto put; -diff -NurpP --minimal linux-3.3/drivers/md/dm-ioctl.c linux-3.3-vs2.3.3.1/drivers/md/dm-ioctl.c ---- linux-3.3/drivers/md/dm-ioctl.c 2012-03-19 19:46:59.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/drivers/md/dm-ioctl.c 2012-03-19 20:52:10.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/drivers/md/dm-ioctl.c linux-3.3.1-vs2.3.3.2/drivers/md/dm-ioctl.c +--- linux-3.3.1/drivers/md/dm-ioctl.c 2012-03-19 19:46:59.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/drivers/md/dm-ioctl.c 2012-03-19 20:52:10.000000000 +0100 @@ -16,6 +16,7 @@ #include #include @@ -1374,9 +1374,9 @@ diff -NurpP --minimal linux-3.3/drivers/md/dm-ioctl.c linux-3.3-vs2.3.3.1/driver return -EACCES; if (_IOC_TYPE(command) != DM_IOCTL) -diff -NurpP --minimal linux-3.3/drivers/md/dm.c linux-3.3-vs2.3.3.1/drivers/md/dm.c ---- linux-3.3/drivers/md/dm.c 2012-03-19 19:46:59.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/drivers/md/dm.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/drivers/md/dm.c linux-3.3.1-vs2.3.3.2/drivers/md/dm.c +--- linux-3.3.1/drivers/md/dm.c 2012-03-19 19:46:59.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/drivers/md/dm.c 2012-02-24 03:55:06.000000000 +0100 @@ -19,6 +19,7 @@ #include #include @@ -1450,9 +1450,9 @@ diff -NurpP --minimal linux-3.3/drivers/md/dm.c linux-3.3-vs2.3.3.1/drivers/md/d md->queue = blk_alloc_queue(GFP_KERNEL); if (!md->queue) goto bad_queue; -diff -NurpP --minimal linux-3.3/drivers/md/dm.h linux-3.3-vs2.3.3.1/drivers/md/dm.h ---- linux-3.3/drivers/md/dm.h 2012-01-09 16:14:21.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/drivers/md/dm.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/drivers/md/dm.h linux-3.3.1-vs2.3.3.2/drivers/md/dm.h +--- linux-3.3.1/drivers/md/dm.h 2012-01-09 16:14:21.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/drivers/md/dm.h 2012-02-24 03:55:06.000000000 +0100 @@ -41,6 +41,8 @@ struct dm_dev_internal { struct dm_table; struct dm_md_mempools; @@ -1462,9 +1462,9 @@ diff -NurpP --minimal linux-3.3/drivers/md/dm.h linux-3.3-vs2.3.3.1/drivers/md/d /*----------------------------------------------------------------- * Internal table functions. *---------------------------------------------------------------*/ -diff -NurpP --minimal linux-3.3/drivers/net/tun.c linux-3.3-vs2.3.3.1/drivers/net/tun.c ---- linux-3.3/drivers/net/tun.c 2012-03-19 19:47:08.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/drivers/net/tun.c 2012-03-19 20:52:10.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/drivers/net/tun.c linux-3.3.1-vs2.3.3.2/drivers/net/tun.c +--- linux-3.3.1/drivers/net/tun.c 2012-03-19 19:47:08.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/drivers/net/tun.c 2012-03-19 20:52:10.000000000 +0100 @@ -64,6 +64,7 @@ #include #include @@ -1534,9 +1534,9 @@ diff -NurpP --minimal linux-3.3/drivers/net/tun.c linux-3.3-vs2.3.3.1/drivers/ne case TUNSETLINK: /* Only allow setting the type when the interface is down */ if (tun->dev->flags & IFF_UP) { -diff -NurpP --minimal linux-3.3/drivers/tty/sysrq.c linux-3.3-vs2.3.3.1/drivers/tty/sysrq.c ---- linux-3.3/drivers/tty/sysrq.c 2012-03-19 19:47:19.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/drivers/tty/sysrq.c 2012-02-24 04:03:15.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/drivers/tty/sysrq.c linux-3.3.1-vs2.3.3.2/drivers/tty/sysrq.c +--- linux-3.3.1/drivers/tty/sysrq.c 2012-03-19 19:47:19.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/drivers/tty/sysrq.c 2012-02-24 04:03:15.000000000 +0100 @@ -41,6 +41,7 @@ #include #include @@ -1588,9 +1588,9 @@ diff -NurpP --minimal linux-3.3/drivers/tty/sysrq.c linux-3.3-vs2.3.3.1/drivers/ else retval = -1; return retval; -diff -NurpP --minimal linux-3.3/drivers/tty/tty_io.c linux-3.3-vs2.3.3.1/drivers/tty/tty_io.c ---- linux-3.3/drivers/tty/tty_io.c 2012-03-19 19:47:19.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/drivers/tty/tty_io.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/drivers/tty/tty_io.c linux-3.3.1-vs2.3.3.2/drivers/tty/tty_io.c +--- linux-3.3.1/drivers/tty/tty_io.c 2012-03-19 19:47:19.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/drivers/tty/tty_io.c 2012-02-24 03:55:06.000000000 +0100 @@ -105,6 +105,7 @@ #include @@ -1617,9 +1617,9 @@ diff -NurpP --minimal linux-3.3/drivers/tty/tty_io.c linux-3.3-vs2.3.3.1/drivers if (pgrp_nr < 0) return -EINVAL; rcu_read_lock(); -diff -NurpP --minimal linux-3.3/fs/attr.c linux-3.3-vs2.3.3.1/fs/attr.c ---- linux-3.3/fs/attr.c 2012-03-19 19:47:24.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/attr.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/attr.c linux-3.3.1-vs2.3.3.2/fs/attr.c +--- linux-3.3.1/fs/attr.c 2012-03-19 19:47:24.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/attr.c 2012-02-24 03:55:06.000000000 +0100 @@ -14,6 +14,9 @@ #include #include @@ -1660,9 +1660,9 @@ diff -NurpP --minimal linux-3.3/fs/attr.c linux-3.3-vs2.3.3.1/fs/attr.c if (IS_IMMUTABLE(inode) || IS_APPEND(inode)) return -EPERM; } -diff -NurpP --minimal linux-3.3/fs/block_dev.c linux-3.3-vs2.3.3.1/fs/block_dev.c ---- linux-3.3/fs/block_dev.c 2012-03-19 19:47:24.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/block_dev.c 2012-03-19 20:52:10.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/block_dev.c linux-3.3.1-vs2.3.3.2/fs/block_dev.c +--- linux-3.3.1/fs/block_dev.c 2012-03-19 19:47:24.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/block_dev.c 2012-03-19 20:52:10.000000000 +0100 @@ -26,6 +26,7 @@ #include #include @@ -1700,9 +1700,9 @@ diff -NurpP --minimal linux-3.3/fs/block_dev.c linux-3.3-vs2.3.3.1/fs/block_dev. if (bdev) { spin_lock(&bdev_lock); if (!inode->i_bdev) { -diff -NurpP --minimal linux-3.3/fs/btrfs/ctree.h linux-3.3-vs2.3.3.1/fs/btrfs/ctree.h ---- linux-3.3/fs/btrfs/ctree.h 2012-03-19 19:47:24.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/btrfs/ctree.h 2012-03-19 20:52:10.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/btrfs/ctree.h linux-3.3.1-vs2.3.3.2/fs/btrfs/ctree.h +--- linux-3.3.1/fs/btrfs/ctree.h 2012-03-19 19:47:24.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/btrfs/ctree.h 2012-03-19 20:52:10.000000000 +0100 @@ -646,11 +646,14 @@ struct btrfs_inode_item { /* modification sequence number for NFS */ __le64 sequence; @@ -1755,9 +1755,9 @@ diff -NurpP --minimal linux-3.3/fs/btrfs/ctree.h linux-3.3-vs2.3.3.1/fs/btrfs/ct int btrfs_defrag_file(struct inode *inode, struct file *file, struct btrfs_ioctl_defrag_range_args *range, u64 newer_than, unsigned long max_pages); -diff -NurpP --minimal linux-3.3/fs/btrfs/disk-io.c linux-3.3-vs2.3.3.1/fs/btrfs/disk-io.c ---- linux-3.3/fs/btrfs/disk-io.c 2012-03-19 19:47:24.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/btrfs/disk-io.c 2012-03-19 20:52:10.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/btrfs/disk-io.c linux-3.3.1-vs2.3.3.2/fs/btrfs/disk-io.c +--- linux-3.3.1/fs/btrfs/disk-io.c 2012-03-19 19:47:24.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/btrfs/disk-io.c 2012-03-19 20:52:10.000000000 +0100 @@ -2125,6 +2125,9 @@ int open_ctree(struct super_block *sb, goto fail_alloc; } @@ -1768,9 +1768,9 @@ diff -NurpP --minimal linux-3.3/fs/btrfs/disk-io.c linux-3.3-vs2.3.3.1/fs/btrfs/ features = btrfs_super_incompat_flags(disk_super) & ~BTRFS_FEATURE_INCOMPAT_SUPP; if (features) { -diff -NurpP --minimal linux-3.3/fs/btrfs/inode.c linux-3.3-vs2.3.3.1/fs/btrfs/inode.c ---- linux-3.3/fs/btrfs/inode.c 2012-03-19 19:47:24.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/btrfs/inode.c 2012-03-19 20:52:10.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/btrfs/inode.c linux-3.3.1-vs2.3.3.2/fs/btrfs/inode.c +--- linux-3.3.1/fs/btrfs/inode.c 2012-03-19 19:47:24.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/btrfs/inode.c 2012-03-19 20:52:10.000000000 +0100 @@ -39,6 +39,7 @@ #include #include @@ -1835,9 +1835,9 @@ diff -NurpP --minimal linux-3.3/fs/btrfs/inode.c linux-3.3-vs2.3.3.1/fs/btrfs/in .get_acl = btrfs_get_acl, }; -diff -NurpP --minimal linux-3.3/fs/btrfs/ioctl.c linux-3.3-vs2.3.3.1/fs/btrfs/ioctl.c ---- linux-3.3/fs/btrfs/ioctl.c 2012-03-19 19:47:24.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/btrfs/ioctl.c 2012-03-19 20:52:10.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/btrfs/ioctl.c linux-3.3.1-vs2.3.3.2/fs/btrfs/ioctl.c +--- linux-3.3.1/fs/btrfs/ioctl.c 2012-03-19 19:47:24.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/btrfs/ioctl.c 2012-03-19 20:52:10.000000000 +0100 @@ -71,10 +71,13 @@ static unsigned int btrfs_flags_to_ioctl { unsigned int iflags = 0; @@ -2010,9 +2010,9 @@ diff -NurpP --minimal linux-3.3/fs/btrfs/ioctl.c linux-3.3-vs2.3.3.1/fs/btrfs/io if (flags & FS_APPEND_FL) ip->flags |= BTRFS_INODE_APPEND; else -diff -NurpP --minimal linux-3.3/fs/btrfs/super.c linux-3.3-vs2.3.3.1/fs/btrfs/super.c ---- linux-3.3/fs/btrfs/super.c 2012-03-19 19:47:24.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/btrfs/super.c 2012-02-24 04:42:16.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/btrfs/super.c linux-3.3.1-vs2.3.3.2/fs/btrfs/super.c +--- linux-3.3.1/fs/btrfs/super.c 2012-03-19 19:47:24.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/btrfs/super.c 2012-02-24 04:42:16.000000000 +0100 @@ -167,7 +167,7 @@ enum { Opt_no_space_cache, Opt_recovery, Opt_skip_balance, Opt_check_integrity, Opt_check_integrity_including_extent_data, @@ -2068,9 +2068,9 @@ diff -NurpP --minimal linux-3.3/fs/btrfs/super.c linux-3.3-vs2.3.3.1/fs/btrfs/su if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY)) return 0; -diff -NurpP --minimal linux-3.3/fs/char_dev.c linux-3.3-vs2.3.3.1/fs/char_dev.c ---- linux-3.3/fs/char_dev.c 2012-03-19 19:47:25.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/char_dev.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/char_dev.c linux-3.3.1-vs2.3.3.2/fs/char_dev.c +--- linux-3.3.1/fs/char_dev.c 2012-03-19 19:47:25.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/char_dev.c 2012-02-24 03:55:06.000000000 +0100 @@ -21,6 +21,8 @@ #include #include @@ -2103,9 +2103,9 @@ diff -NurpP --minimal linux-3.3/fs/char_dev.c linux-3.3-vs2.3.3.1/fs/char_dev.c if (!kobj) return -ENXIO; new = container_of(kobj, struct cdev, kobj); -diff -NurpP --minimal linux-3.3/fs/dcache.c linux-3.3-vs2.3.3.1/fs/dcache.c ---- linux-3.3/fs/dcache.c 2012-03-19 19:47:25.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/dcache.c 2012-03-19 20:52:10.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/dcache.c linux-3.3.1-vs2.3.3.2/fs/dcache.c +--- linux-3.3.1/fs/dcache.c 2012-04-03 03:01:26.000000000 +0200 ++++ linux-3.3.1-vs2.3.3.2/fs/dcache.c 2012-04-03 03:02:12.000000000 +0200 @@ -37,6 +37,7 @@ #include #include @@ -2157,9 +2157,9 @@ diff -NurpP --minimal linux-3.3/fs/dcache.c linux-3.3-vs2.3.3.1/fs/dcache.c found = dentry; spin_unlock(&dentry->d_lock); break; -diff -NurpP --minimal linux-3.3/fs/devpts/inode.c linux-3.3-vs2.3.3.1/fs/devpts/inode.c ---- linux-3.3/fs/devpts/inode.c 2012-03-19 19:47:25.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/devpts/inode.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/devpts/inode.c linux-3.3.1-vs2.3.3.2/fs/devpts/inode.c +--- linux-3.3.1/fs/devpts/inode.c 2012-03-19 19:47:25.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/devpts/inode.c 2012-02-24 03:55:06.000000000 +0100 @@ -25,6 +25,7 @@ #include #include @@ -2246,9 +2246,9 @@ diff -NurpP --minimal linux-3.3/fs/devpts/inode.c linux-3.3-vs2.3.3.1/fs/devpts/ inode->i_private = tty; tty->driver_data = inode; -diff -NurpP --minimal linux-3.3/fs/ext2/balloc.c linux-3.3-vs2.3.3.1/fs/ext2/balloc.c ---- linux-3.3/fs/ext2/balloc.c 2012-01-09 16:14:54.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/ext2/balloc.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/ext2/balloc.c linux-3.3.1-vs2.3.3.2/fs/ext2/balloc.c +--- linux-3.3.1/fs/ext2/balloc.c 2012-01-09 16:14:54.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/ext2/balloc.c 2012-02-24 03:55:06.000000000 +0100 @@ -701,7 +701,6 @@ ext2_try_to_allocate(struct super_block start = 0; end = EXT2_BLOCKS_PER_GROUP(sb); @@ -2257,9 +2257,9 @@ diff -NurpP --minimal linux-3.3/fs/ext2/balloc.c linux-3.3-vs2.3.3.1/fs/ext2/bal BUG_ON(start > EXT2_BLOCKS_PER_GROUP(sb)); repeat: -diff -NurpP --minimal linux-3.3/fs/ext2/ext2.h linux-3.3-vs2.3.3.1/fs/ext2/ext2.h ---- linux-3.3/fs/ext2/ext2.h 2012-03-19 19:47:25.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/ext2/ext2.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/ext2/ext2.h linux-3.3.1-vs2.3.3.2/fs/ext2/ext2.h +--- linux-3.3.1/fs/ext2/ext2.h 2012-03-19 19:47:25.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/ext2/ext2.h 2012-02-24 03:55:06.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, @@ -2268,18 +2268,18 @@ diff -NurpP --minimal linux-3.3/fs/ext2/ext2.h linux-3.3-vs2.3.3.1/fs/ext2/ext2. /* ioctl.c */ extern long ext2_ioctl(struct file *, unsigned int, unsigned long); -diff -NurpP --minimal linux-3.3/fs/ext2/file.c linux-3.3-vs2.3.3.1/fs/ext2/file.c ---- linux-3.3/fs/ext2/file.c 2011-10-24 18:45:27.000000000 +0200 -+++ linux-3.3-vs2.3.3.1/fs/ext2/file.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/ext2/file.c linux-3.3.1-vs2.3.3.2/fs/ext2/file.c +--- linux-3.3.1/fs/ext2/file.c 2011-10-24 18:45:27.000000000 +0200 ++++ linux-3.3.1-vs2.3.3.2/fs/ext2/file.c 2012-02-24 03:55:06.000000000 +0100 @@ -104,4 +104,5 @@ const struct inode_operations ext2_file_ .setattr = ext2_setattr, .get_acl = ext2_get_acl, .fiemap = ext2_fiemap, + .sync_flags = ext2_sync_flags, }; -diff -NurpP --minimal linux-3.3/fs/ext2/ialloc.c linux-3.3-vs2.3.3.1/fs/ext2/ialloc.c ---- linux-3.3/fs/ext2/ialloc.c 2012-03-19 19:47:25.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/ext2/ialloc.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/ext2/ialloc.c linux-3.3.1-vs2.3.3.2/fs/ext2/ialloc.c +--- linux-3.3.1/fs/ext2/ialloc.c 2012-03-19 19:47:25.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/ext2/ialloc.c 2012-02-24 03:55:06.000000000 +0100 @@ -17,6 +17,7 @@ #include #include @@ -2296,9 +2296,9 @@ diff -NurpP --minimal linux-3.3/fs/ext2/ialloc.c linux-3.3-vs2.3.3.1/fs/ext2/ial } else inode_init_owner(inode, dir, mode); -diff -NurpP --minimal linux-3.3/fs/ext2/inode.c linux-3.3-vs2.3.3.1/fs/ext2/inode.c ---- linux-3.3/fs/ext2/inode.c 2012-03-19 19:47:25.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/ext2/inode.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/ext2/inode.c linux-3.3.1-vs2.3.3.2/fs/ext2/inode.c +--- linux-3.3.1/fs/ext2/inode.c 2012-03-19 19:47:25.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/ext2/inode.c 2012-02-24 03:55:06.000000000 +0100 @@ -31,6 +31,7 @@ #include #include @@ -2446,9 +2446,9 @@ diff -NurpP --minimal linux-3.3/fs/ext2/inode.c linux-3.3-vs2.3.3.1/fs/ext2/inod error = dquot_transfer(inode, iattr); if (error) return error; -diff -NurpP --minimal linux-3.3/fs/ext2/ioctl.c linux-3.3-vs2.3.3.1/fs/ext2/ioctl.c ---- linux-3.3/fs/ext2/ioctl.c 2012-03-19 19:47:25.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/ext2/ioctl.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/ext2/ioctl.c linux-3.3.1-vs2.3.3.2/fs/ext2/ioctl.c +--- linux-3.3.1/fs/ext2/ioctl.c 2012-03-19 19:47:25.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/ext2/ioctl.c 2012-02-24 03:55:06.000000000 +0100 @@ -17,6 +17,16 @@ #include @@ -2498,9 +2498,9 @@ diff -NurpP --minimal linux-3.3/fs/ext2/ioctl.c linux-3.3-vs2.3.3.1/fs/ext2/ioct flags |= oldflags & ~EXT2_FL_USER_MODIFIABLE; ei->i_flags = flags; -diff -NurpP --minimal linux-3.3/fs/ext2/namei.c linux-3.3-vs2.3.3.1/fs/ext2/namei.c ---- linux-3.3/fs/ext2/namei.c 2012-03-19 19:47:25.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/ext2/namei.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/ext2/namei.c linux-3.3.1-vs2.3.3.2/fs/ext2/namei.c +--- linux-3.3.1/fs/ext2/namei.c 2012-03-19 19:47:25.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/ext2/namei.c 2012-02-24 03:55:06.000000000 +0100 @@ -32,6 +32,7 @@ #include @@ -2525,9 +2525,9 @@ diff -NurpP --minimal linux-3.3/fs/ext2/namei.c linux-3.3-vs2.3.3.1/fs/ext2/name .get_acl = ext2_get_acl, }; -diff -NurpP --minimal linux-3.3/fs/ext2/super.c linux-3.3-vs2.3.3.1/fs/ext2/super.c ---- linux-3.3/fs/ext2/super.c 2012-03-19 19:47:25.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/ext2/super.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/ext2/super.c linux-3.3.1-vs2.3.3.2/fs/ext2/super.c +--- linux-3.3.1/fs/ext2/super.c 2012-03-19 19:47:25.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/ext2/super.c 2012-02-24 03:55:06.000000000 +0100 @@ -393,7 +393,8 @@ enum { Opt_err_ro, Opt_nouid32, Opt_nocheck, Opt_debug, Opt_oldalloc, Opt_orlov, Opt_nobh, Opt_user_xattr, Opt_nouser_xattr, @@ -2593,9 +2593,9 @@ diff -NurpP --minimal linux-3.3/fs/ext2/super.c linux-3.3-vs2.3.3.1/fs/ext2/supe sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | ((sbi->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0); -diff -NurpP --minimal linux-3.3/fs/ext3/file.c linux-3.3-vs2.3.3.1/fs/ext3/file.c ---- linux-3.3/fs/ext3/file.c 2011-10-24 18:45:27.000000000 +0200 -+++ linux-3.3-vs2.3.3.1/fs/ext3/file.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/ext3/file.c linux-3.3.1-vs2.3.3.2/fs/ext3/file.c +--- linux-3.3.1/fs/ext3/file.c 2011-10-24 18:45:27.000000000 +0200 ++++ linux-3.3.1-vs2.3.3.2/fs/ext3/file.c 2012-02-24 03:55:06.000000000 +0100 @@ -80,5 +80,6 @@ const struct inode_operations ext3_file_ #endif .get_acl = ext3_get_acl, @@ -2603,9 +2603,9 @@ diff -NurpP --minimal linux-3.3/fs/ext3/file.c linux-3.3-vs2.3.3.1/fs/ext3/file. + .sync_flags = ext3_sync_flags, }; -diff -NurpP --minimal linux-3.3/fs/ext3/ialloc.c linux-3.3-vs2.3.3.1/fs/ext3/ialloc.c ---- linux-3.3/fs/ext3/ialloc.c 2012-03-19 19:47:25.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/ext3/ialloc.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/ext3/ialloc.c linux-3.3.1-vs2.3.3.2/fs/ext3/ialloc.c +--- linux-3.3.1/fs/ext3/ialloc.c 2012-03-19 19:47:25.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/ext3/ialloc.c 2012-02-24 03:55:06.000000000 +0100 @@ -23,6 +23,7 @@ #include #include @@ -2622,9 +2622,9 @@ diff -NurpP --minimal linux-3.3/fs/ext3/ialloc.c linux-3.3-vs2.3.3.1/fs/ext3/ial } else inode_init_owner(inode, dir, mode); -diff -NurpP --minimal linux-3.3/fs/ext3/inode.c linux-3.3-vs2.3.3.1/fs/ext3/inode.c ---- linux-3.3/fs/ext3/inode.c 2012-03-19 19:47:25.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/ext3/inode.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/ext3/inode.c linux-3.3.1-vs2.3.3.2/fs/ext3/inode.c +--- linux-3.3.1/fs/ext3/inode.c 2012-03-19 19:47:25.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/ext3/inode.c 2012-02-24 03:55:06.000000000 +0100 @@ -37,6 +37,7 @@ #include #include @@ -2798,9 +2798,9 @@ diff -NurpP --minimal linux-3.3/fs/ext3/inode.c linux-3.3-vs2.3.3.1/fs/ext3/inod error = ext3_mark_inode_dirty(handle, inode); ext3_journal_stop(handle); } -diff -NurpP --minimal linux-3.3/fs/ext3/ioctl.c linux-3.3-vs2.3.3.1/fs/ext3/ioctl.c ---- linux-3.3/fs/ext3/ioctl.c 2012-03-19 19:47:25.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/ext3/ioctl.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/ext3/ioctl.c linux-3.3.1-vs2.3.3.2/fs/ext3/ioctl.c +--- linux-3.3.1/fs/ext3/ioctl.c 2012-03-19 19:47:25.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/ext3/ioctl.c 2012-02-24 03:55:06.000000000 +0100 @@ -8,6 +8,7 @@ */ @@ -2876,9 +2876,9 @@ diff -NurpP --minimal linux-3.3/fs/ext3/ioctl.c linux-3.3-vs2.3.3.1/fs/ext3/ioct flags |= oldflags & ~EXT3_FL_USER_MODIFIABLE; ei->i_flags = flags; -diff -NurpP --minimal linux-3.3/fs/ext3/namei.c linux-3.3-vs2.3.3.1/fs/ext3/namei.c ---- linux-3.3/fs/ext3/namei.c 2012-03-19 19:47:25.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/ext3/namei.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/ext3/namei.c linux-3.3.1-vs2.3.3.2/fs/ext3/namei.c +--- linux-3.3.1/fs/ext3/namei.c 2012-03-19 19:47:25.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/ext3/namei.c 2012-02-24 03:55:06.000000000 +0100 @@ -36,6 +36,7 @@ #include #include @@ -2903,9 +2903,9 @@ diff -NurpP --minimal linux-3.3/fs/ext3/namei.c linux-3.3-vs2.3.3.1/fs/ext3/name .get_acl = ext3_get_acl, }; -diff -NurpP --minimal linux-3.3/fs/ext3/super.c linux-3.3-vs2.3.3.1/fs/ext3/super.c ---- linux-3.3/fs/ext3/super.c 2012-03-19 19:47:25.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/ext3/super.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/ext3/super.c linux-3.3.1-vs2.3.3.2/fs/ext3/super.c +--- linux-3.3.1/fs/ext3/super.c 2012-03-19 19:47:25.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/ext3/super.c 2012-02-24 03:55:06.000000000 +0100 @@ -830,7 +830,8 @@ enum { Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota, Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_jqfmt_vfsv1, Opt_quota, @@ -2972,10 +2972,10 @@ diff -NurpP --minimal linux-3.3/fs/ext3/super.c linux-3.3-vs2.3.3.1/fs/ext3/supe sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0); -diff -NurpP --minimal linux-3.3/fs/ext4/ext4.h linux-3.3-vs2.3.3.1/fs/ext4/ext4.h ---- linux-3.3/fs/ext4/ext4.h 2012-03-19 19:47:25.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/ext4/ext4.h 2012-02-24 03:55:06.000000000 +0100 -@@ -371,8 +371,12 @@ struct flex_groups { +diff -NurpP --minimal linux-3.3.1/fs/ext4/ext4.h linux-3.3.1-vs2.3.3.2/fs/ext4/ext4.h +--- linux-3.3.1/fs/ext4/ext4.h 2012-04-03 03:01:26.000000000 +0200 ++++ linux-3.3.1-vs2.3.3.2/fs/ext4/ext4.h 2012-04-03 03:02:12.000000000 +0200 +@@ -373,8 +373,12 @@ struct flex_groups { #define EXT4_EXTENTS_FL 0x00080000 /* Inode uses extents */ #define EXT4_EA_INODE_FL 0x00200000 /* Inode used for large EA */ #define EXT4_EOFBLOCKS_FL 0x00400000 /* Blocks allocated beyond EOF */ @@ -2988,7 +2988,7 @@ diff -NurpP --minimal linux-3.3/fs/ext4/ext4.h linux-3.3-vs2.3.3.1/fs/ext4/ext4. #define EXT4_FL_USER_VISIBLE 0x004BDFFF /* User visible flags */ #define EXT4_FL_USER_MODIFIABLE 0x004B80FF /* User modifiable flags */ -@@ -641,7 +645,8 @@ struct ext4_inode { +@@ -643,7 +647,8 @@ struct ext4_inode { __le16 l_i_file_acl_high; __le16 l_i_uid_high; /* these 2 fields */ __le16 l_i_gid_high; /* were reserved2[0] */ @@ -2998,7 +2998,7 @@ diff -NurpP --minimal linux-3.3/fs/ext4/ext4.h linux-3.3-vs2.3.3.1/fs/ext4/ext4. } linux2; struct { __le16 h_i_reserved1; /* Obsoleted fragment number/size which are removed in ext4 */ -@@ -759,6 +764,7 @@ do { \ +@@ -761,6 +766,7 @@ do { \ #define i_gid_low i_gid #define i_uid_high osd2.linux2.l_i_uid_high #define i_gid_high osd2.linux2.l_i_gid_high @@ -3006,7 +3006,7 @@ diff -NurpP --minimal linux-3.3/fs/ext4/ext4.h linux-3.3-vs2.3.3.1/fs/ext4/ext4. #define i_reserved2 osd2.linux2.l_i_reserved2 #elif defined(__GNU__) -@@ -935,6 +941,7 @@ struct ext4_inode_info { +@@ -937,6 +943,7 @@ struct ext4_inode_info { #define EXT4_MOUNT_POSIX_ACL 0x08000 /* POSIX Access Control Lists */ #define EXT4_MOUNT_NO_AUTO_DA_ALLOC 0x10000 /* No auto delalloc mapping */ #define EXT4_MOUNT_BARRIER 0x20000 /* Use block barriers */ @@ -3014,7 +3014,7 @@ diff -NurpP --minimal linux-3.3/fs/ext4/ext4.h linux-3.3-vs2.3.3.1/fs/ext4/ext4. #define EXT4_MOUNT_QUOTA 0x80000 /* Some quota option set */ #define EXT4_MOUNT_USRQUOTA 0x100000 /* "old" user quota */ #define EXT4_MOUNT_GRPQUOTA 0x200000 /* "old" group quota */ -@@ -2275,6 +2282,7 @@ extern int ext4_map_blocks(handle_t *han +@@ -2277,6 +2284,7 @@ extern int ext4_map_blocks(handle_t *han struct ext4_map_blocks *map, int flags); extern int ext4_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, __u64 start, __u64 len); @@ -3022,9 +3022,9 @@ diff -NurpP --minimal linux-3.3/fs/ext4/ext4.h linux-3.3-vs2.3.3.1/fs/ext4/ext4. /* 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-3.3/fs/ext4/file.c linux-3.3-vs2.3.3.1/fs/ext4/file.c ---- linux-3.3/fs/ext4/file.c 2012-01-09 16:14:54.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/ext4/file.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/ext4/file.c linux-3.3.1-vs2.3.3.2/fs/ext4/file.c +--- linux-3.3.1/fs/ext4/file.c 2012-01-09 16:14:54.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/ext4/file.c 2012-02-24 03:55:06.000000000 +0100 @@ -258,5 +258,6 @@ const struct inode_operations ext4_file_ #endif .get_acl = ext4_get_acl, @@ -3032,9 +3032,9 @@ diff -NurpP --minimal linux-3.3/fs/ext4/file.c linux-3.3-vs2.3.3.1/fs/ext4/file. + .sync_flags = ext4_sync_flags, }; -diff -NurpP --minimal linux-3.3/fs/ext4/ialloc.c linux-3.3-vs2.3.3.1/fs/ext4/ialloc.c ---- linux-3.3/fs/ext4/ialloc.c 2012-03-19 19:47:25.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/ext4/ialloc.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/ext4/ialloc.c linux-3.3.1-vs2.3.3.2/fs/ext4/ialloc.c +--- linux-3.3.1/fs/ext4/ialloc.c 2012-03-19 19:47:25.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/ext4/ialloc.c 2012-02-24 03:55:06.000000000 +0100 @@ -22,6 +22,7 @@ #include #include @@ -3051,9 +3051,9 @@ diff -NurpP --minimal linux-3.3/fs/ext4/ialloc.c linux-3.3-vs2.3.3.1/fs/ext4/ial } else inode_init_owner(inode, dir, mode); -diff -NurpP --minimal linux-3.3/fs/ext4/inode.c linux-3.3-vs2.3.3.1/fs/ext4/inode.c ---- linux-3.3/fs/ext4/inode.c 2012-03-19 19:47:25.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/ext4/inode.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/ext4/inode.c linux-3.3.1-vs2.3.3.2/fs/ext4/inode.c +--- linux-3.3.1/fs/ext4/inode.c 2012-04-03 03:01:26.000000000 +0200 ++++ linux-3.3.1-vs2.3.3.2/fs/ext4/inode.c 2012-04-03 03:02:12.000000000 +0200 @@ -37,6 +37,7 @@ #include #include @@ -3062,7 +3062,7 @@ diff -NurpP --minimal linux-3.3/fs/ext4/inode.c linux-3.3-vs2.3.3.1/fs/ext4/inod #include "ext4_jbd2.h" #include "xattr.h" -@@ -3549,41 +3550,64 @@ void ext4_set_inode_flags(struct inode * +@@ -3557,41 +3558,64 @@ void ext4_set_inode_flags(struct inode * { unsigned int flags = EXT4_I(inode)->i_flags; @@ -3134,7 +3134,7 @@ diff -NurpP --minimal linux-3.3/fs/ext4/inode.c linux-3.3-vs2.3.3.1/fs/ext4/inod } while (cmpxchg(&ei->i_flags, old_fl, new_fl) != old_fl); } -@@ -3619,6 +3643,8 @@ struct inode *ext4_iget(struct super_blo +@@ -3627,6 +3651,8 @@ struct inode *ext4_iget(struct super_blo journal_t *journal = EXT4_SB(sb)->s_journal; long ret; int block; @@ -3143,7 +3143,7 @@ diff -NurpP --minimal linux-3.3/fs/ext4/inode.c linux-3.3-vs2.3.3.1/fs/ext4/inod inode = iget_locked(sb, ino); if (!inode) -@@ -3634,12 +3660,16 @@ struct inode *ext4_iget(struct super_blo +@@ -3642,12 +3668,16 @@ struct inode *ext4_iget(struct super_blo goto bad_inode; raw_inode = ext4_raw_inode(&iloc); inode->i_mode = le16_to_cpu(raw_inode->i_mode); @@ -3164,7 +3164,7 @@ diff -NurpP --minimal linux-3.3/fs/ext4/inode.c linux-3.3-vs2.3.3.1/fs/ext4/inod set_nlink(inode, le16_to_cpu(raw_inode->i_links_count)); ext4_clear_state_flags(ei); /* Only relevant on 32-bit archs */ -@@ -3858,6 +3888,8 @@ static int ext4_do_update_inode(handle_t +@@ -3866,6 +3896,8 @@ static int ext4_do_update_inode(handle_t struct ext4_inode *raw_inode = ext4_raw_inode(iloc); struct ext4_inode_info *ei = EXT4_I(inode); struct buffer_head *bh = iloc->bh; @@ -3173,7 +3173,7 @@ diff -NurpP --minimal linux-3.3/fs/ext4/inode.c linux-3.3-vs2.3.3.1/fs/ext4/inod int err = 0, rc, block; /* For fields not not tracking in the in-memory inode, -@@ -3868,29 +3900,32 @@ static int ext4_do_update_inode(handle_t +@@ -3876,29 +3908,32 @@ static int ext4_do_update_inode(handle_t ext4_get_inode_flags(ei); raw_inode->i_mode = cpu_to_le16(inode->i_mode); if (!(test_opt(inode->i_sb, NO_UID32))) { @@ -3212,7 +3212,7 @@ diff -NurpP --minimal linux-3.3/fs/ext4/inode.c linux-3.3-vs2.3.3.1/fs/ext4/inod raw_inode->i_links_count = cpu_to_le16(inode->i_nlink); EXT4_INODE_SET_XTIME(i_ctime, inode, raw_inode); -@@ -4076,7 +4111,8 @@ int ext4_setattr(struct dentry *dentry, +@@ -4084,7 +4119,8 @@ int ext4_setattr(struct dentry *dentry, if (is_quota_modification(inode, attr)) dquot_initialize(inode); if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) || @@ -3222,7 +3222,7 @@ diff -NurpP --minimal linux-3.3/fs/ext4/inode.c linux-3.3-vs2.3.3.1/fs/ext4/inod handle_t *handle; /* (user+group)*(old+new) structure, inode write (sb, -@@ -4098,6 +4134,8 @@ int ext4_setattr(struct dentry *dentry, +@@ -4106,6 +4142,8 @@ int ext4_setattr(struct dentry *dentry, inode->i_uid = attr->ia_uid; if (attr->ia_valid & ATTR_GID) inode->i_gid = attr->ia_gid; @@ -3231,9 +3231,9 @@ diff -NurpP --minimal linux-3.3/fs/ext4/inode.c linux-3.3-vs2.3.3.1/fs/ext4/inod error = ext4_mark_inode_dirty(handle, inode); ext4_journal_stop(handle); } -diff -NurpP --minimal linux-3.3/fs/ext4/ioctl.c linux-3.3-vs2.3.3.1/fs/ext4/ioctl.c ---- linux-3.3/fs/ext4/ioctl.c 2012-03-19 19:47:25.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/ext4/ioctl.c 2012-02-24 04:29:04.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/ext4/ioctl.c linux-3.3.1-vs2.3.3.2/fs/ext4/ioctl.c +--- linux-3.3.1/fs/ext4/ioctl.c 2012-03-19 19:47:25.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/ext4/ioctl.c 2012-02-24 04:29:04.000000000 +0100 @@ -14,12 +14,40 @@ #include #include @@ -3298,9 +3298,9 @@ diff -NurpP --minimal linux-3.3/fs/ext4/ioctl.c linux-3.3-vs2.3.3.1/fs/ext4/ioct if (!capable(CAP_LINUX_IMMUTABLE)) goto flags_out; } -diff -NurpP --minimal linux-3.3/fs/ext4/namei.c linux-3.3-vs2.3.3.1/fs/ext4/namei.c ---- linux-3.3/fs/ext4/namei.c 2012-03-19 19:47:25.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/ext4/namei.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/ext4/namei.c linux-3.3.1-vs2.3.3.2/fs/ext4/namei.c +--- linux-3.3.1/fs/ext4/namei.c 2012-03-19 19:47:25.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/ext4/namei.c 2012-02-24 03:55:06.000000000 +0100 @@ -34,6 +34,7 @@ #include #include @@ -3325,9 +3325,9 @@ diff -NurpP --minimal linux-3.3/fs/ext4/namei.c linux-3.3-vs2.3.3.1/fs/ext4/name }; const struct inode_operations ext4_special_inode_operations = { -diff -NurpP --minimal linux-3.3/fs/ext4/super.c linux-3.3-vs2.3.3.1/fs/ext4/super.c ---- linux-3.3/fs/ext4/super.c 2012-03-19 19:47:25.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/ext4/super.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/ext4/super.c linux-3.3.1-vs2.3.3.2/fs/ext4/super.c +--- linux-3.3.1/fs/ext4/super.c 2012-03-19 19:47:25.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/ext4/super.c 2012-02-24 03:55:06.000000000 +0100 @@ -1333,6 +1333,7 @@ enum { Opt_inode_readahead_blks, Opt_journal_ioprio, Opt_dioread_nolock, Opt_dioread_lock, @@ -3392,9 +3392,9 @@ diff -NurpP --minimal linux-3.3/fs/ext4/super.c linux-3.3-vs2.3.3.1/fs/ext4/supe sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0); -diff -NurpP --minimal linux-3.3/fs/fcntl.c linux-3.3-vs2.3.3.1/fs/fcntl.c ---- linux-3.3/fs/fcntl.c 2011-05-22 16:17:52.000000000 +0200 -+++ linux-3.3-vs2.3.3.1/fs/fcntl.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/fcntl.c linux-3.3.1-vs2.3.3.2/fs/fcntl.c +--- linux-3.3.1/fs/fcntl.c 2011-05-22 16:17:52.000000000 +0200 ++++ linux-3.3.1-vs2.3.3.2/fs/fcntl.c 2012-02-24 03:55:06.000000000 +0100 @@ -20,6 +20,7 @@ #include #include @@ -3421,9 +3421,9 @@ diff -NurpP --minimal linux-3.3/fs/fcntl.c linux-3.3-vs2.3.3.1/fs/fcntl.c if (unlikely(filp->f_mode & FMODE_PATH)) { if (!check_fcntl_cmd(cmd)) { -diff -NurpP --minimal linux-3.3/fs/file.c linux-3.3-vs2.3.3.1/fs/file.c ---- linux-3.3/fs/file.c 2011-05-22 16:17:52.000000000 +0200 -+++ linux-3.3-vs2.3.3.1/fs/file.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/file.c linux-3.3.1-vs2.3.3.2/fs/file.c +--- linux-3.3.1/fs/file.c 2011-05-22 16:17:52.000000000 +0200 ++++ linux-3.3.1-vs2.3.3.2/fs/file.c 2012-02-24 03:55:06.000000000 +0100 @@ -21,6 +21,7 @@ #include #include @@ -3449,9 +3449,9 @@ diff -NurpP --minimal linux-3.3/fs/file.c linux-3.3-vs2.3.3.1/fs/file.c #if 1 /* Sanity check */ if (rcu_dereference_raw(fdt->fd[fd]) != NULL) { -diff -NurpP --minimal linux-3.3/fs/file_table.c linux-3.3-vs2.3.3.1/fs/file_table.c ---- linux-3.3/fs/file_table.c 2012-03-19 19:47:25.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/file_table.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/file_table.c linux-3.3.1-vs2.3.3.2/fs/file_table.c +--- linux-3.3.1/fs/file_table.c 2012-03-19 19:47:25.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/file_table.c 2012-02-24 03:55:06.000000000 +0100 @@ -24,6 +24,8 @@ #include #include @@ -3488,9 +3488,9 @@ diff -NurpP --minimal linux-3.3/fs/file_table.c linux-3.3-vs2.3.3.1/fs/file_tabl file_sb_list_del(file); file_free(file); } -diff -NurpP --minimal linux-3.3/fs/fs_struct.c linux-3.3-vs2.3.3.1/fs/fs_struct.c ---- linux-3.3/fs/fs_struct.c 2011-03-15 18:07:31.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/fs_struct.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/fs_struct.c linux-3.3.1-vs2.3.3.2/fs/fs_struct.c +--- linux-3.3.1/fs/fs_struct.c 2011-03-15 18:07:31.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/fs_struct.c 2012-02-24 03:55:06.000000000 +0100 @@ -4,6 +4,7 @@ #include #include @@ -3515,9 +3515,9 @@ diff -NurpP --minimal linux-3.3/fs/fs_struct.c linux-3.3-vs2.3.3.1/fs/fs_struct. } return fs; } -diff -NurpP --minimal linux-3.3/fs/gfs2/file.c linux-3.3-vs2.3.3.1/fs/gfs2/file.c ---- linux-3.3/fs/gfs2/file.c 2012-03-19 19:47:25.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/gfs2/file.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/gfs2/file.c linux-3.3.1-vs2.3.3.2/fs/gfs2/file.c +--- linux-3.3.1/fs/gfs2/file.c 2012-03-19 19:47:25.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/gfs2/file.c 2012-02-24 03:55:06.000000000 +0100 @@ -143,6 +143,9 @@ static const u32 fsflags_to_gfs2[32] = { [7] = GFS2_DIF_NOATIME, [12] = GFS2_DIF_EXHASH, @@ -3640,9 +3640,9 @@ diff -NurpP --minimal linux-3.3/fs/gfs2/file.c linux-3.3-vs2.3.3.1/fs/gfs2/file. static long gfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) { switch(cmd) { -diff -NurpP --minimal linux-3.3/fs/gfs2/inode.h linux-3.3-vs2.3.3.1/fs/gfs2/inode.h ---- linux-3.3/fs/gfs2/inode.h 2012-01-09 16:14:54.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/gfs2/inode.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/gfs2/inode.h linux-3.3.1-vs2.3.3.2/fs/gfs2/inode.h +--- linux-3.3.1/fs/gfs2/inode.h 2012-01-09 16:14:54.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/gfs2/inode.h 2012-02-24 03:55:06.000000000 +0100 @@ -120,6 +120,7 @@ extern const struct file_operations gfs2 extern const struct file_operations gfs2_dir_fops_nolock; @@ -3651,9 +3651,9 @@ diff -NurpP --minimal linux-3.3/fs/gfs2/inode.h linux-3.3-vs2.3.3.1/fs/gfs2/inod #ifdef CONFIG_GFS2_FS_LOCKING_DLM extern const struct file_operations gfs2_file_fops; -diff -NurpP --minimal linux-3.3/fs/inode.c linux-3.3-vs2.3.3.1/fs/inode.c ---- linux-3.3/fs/inode.c 2012-03-19 19:47:25.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/inode.c 2012-03-19 20:52:10.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/inode.c linux-3.3.1-vs2.3.3.2/fs/inode.c +--- linux-3.3.1/fs/inode.c 2012-03-19 19:47:25.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/inode.c 2012-03-19 20:52:10.000000000 +0100 @@ -27,6 +27,7 @@ #include #include /* for inode_has_buffers */ @@ -3709,9 +3709,9 @@ diff -NurpP --minimal linux-3.3/fs/inode.c linux-3.3-vs2.3.3.1/fs/inode.c } EXPORT_SYMBOL(inode_init_owner); -diff -NurpP --minimal linux-3.3/fs/ioctl.c linux-3.3-vs2.3.3.1/fs/ioctl.c ---- linux-3.3/fs/ioctl.c 2012-03-19 19:47:25.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/ioctl.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/ioctl.c linux-3.3.1-vs2.3.3.2/fs/ioctl.c +--- linux-3.3.1/fs/ioctl.c 2012-03-19 19:47:25.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/ioctl.c 2012-02-24 03:55:06.000000000 +0100 @@ -15,6 +15,9 @@ #include #include @@ -3722,9 +3722,9 @@ diff -NurpP --minimal linux-3.3/fs/ioctl.c linux-3.3-vs2.3.3.1/fs/ioctl.c #include -diff -NurpP --minimal linux-3.3/fs/ioprio.c linux-3.3-vs2.3.3.1/fs/ioprio.c ---- linux-3.3/fs/ioprio.c 2012-03-19 19:47:25.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/ioprio.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/ioprio.c linux-3.3.1-vs2.3.3.2/fs/ioprio.c +--- linux-3.3.1/fs/ioprio.c 2012-03-19 19:47:25.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/ioprio.c 2012-02-24 03:55:06.000000000 +0100 @@ -28,6 +28,7 @@ #include #include @@ -3751,9 +3751,9 @@ diff -NurpP --minimal linux-3.3/fs/ioprio.c linux-3.3-vs2.3.3.1/fs/ioprio.c tmpio = get_task_ioprio(p); if (tmpio < 0) continue; -diff -NurpP --minimal linux-3.3/fs/jfs/file.c linux-3.3-vs2.3.3.1/fs/jfs/file.c ---- linux-3.3/fs/jfs/file.c 2011-10-24 18:45:27.000000000 +0200 -+++ linux-3.3-vs2.3.3.1/fs/jfs/file.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/jfs/file.c linux-3.3.1-vs2.3.3.2/fs/jfs/file.c +--- linux-3.3.1/fs/jfs/file.c 2011-10-24 18:45:27.000000000 +0200 ++++ linux-3.3.1-vs2.3.3.2/fs/jfs/file.c 2012-02-24 03:55:06.000000000 +0100 @@ -109,7 +109,8 @@ int jfs_setattr(struct dentry *dentry, s if (is_quota_modification(inode, iattr)) dquot_initialize(inode); @@ -3772,9 +3772,9 @@ diff -NurpP --minimal linux-3.3/fs/jfs/file.c linux-3.3-vs2.3.3.1/fs/jfs/file.c }; const struct file_operations jfs_file_operations = { -diff -NurpP --minimal linux-3.3/fs/jfs/ioctl.c linux-3.3-vs2.3.3.1/fs/jfs/ioctl.c ---- linux-3.3/fs/jfs/ioctl.c 2012-03-19 19:47:25.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/jfs/ioctl.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/jfs/ioctl.c linux-3.3.1-vs2.3.3.2/fs/jfs/ioctl.c +--- linux-3.3.1/fs/jfs/ioctl.c 2012-03-19 19:47:25.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/jfs/ioctl.c 2012-02-24 03:55:06.000000000 +0100 @@ -11,6 +11,7 @@ #include #include @@ -3832,9 +3832,9 @@ diff -NurpP --minimal linux-3.3/fs/jfs/ioctl.c linux-3.3-vs2.3.3.1/fs/jfs/ioctl. flags |= oldflags & ~JFS_FL_USER_MODIFIABLE; jfs_inode->mode2 = flags; -diff -NurpP --minimal linux-3.3/fs/jfs/jfs_dinode.h linux-3.3-vs2.3.3.1/fs/jfs/jfs_dinode.h ---- linux-3.3/fs/jfs/jfs_dinode.h 2008-12-25 00:26:37.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/jfs/jfs_dinode.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/jfs/jfs_dinode.h linux-3.3.1-vs2.3.3.2/fs/jfs/jfs_dinode.h +--- linux-3.3.1/fs/jfs/jfs_dinode.h 2008-12-25 00:26:37.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/jfs/jfs_dinode.h 2012-02-24 03:55:06.000000000 +0100 @@ -161,9 +161,13 @@ struct dinode { #define JFS_APPEND_FL 0x01000000 /* writes to file may only append */ @@ -3851,9 +3851,9 @@ diff -NurpP --minimal linux-3.3/fs/jfs/jfs_dinode.h linux-3.3-vs2.3.3.1/fs/jfs/j #define JFS_FL_INHERIT 0x03C80000 /* These are identical to EXT[23]_IOC_GETFLAGS/SETFLAGS */ -diff -NurpP --minimal linux-3.3/fs/jfs/jfs_filsys.h linux-3.3-vs2.3.3.1/fs/jfs/jfs_filsys.h ---- linux-3.3/fs/jfs/jfs_filsys.h 2008-12-25 00:26:37.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/jfs/jfs_filsys.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/jfs/jfs_filsys.h linux-3.3.1-vs2.3.3.2/fs/jfs/jfs_filsys.h +--- linux-3.3.1/fs/jfs/jfs_filsys.h 2008-12-25 00:26:37.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/jfs/jfs_filsys.h 2012-02-24 03:55:06.000000000 +0100 @@ -263,6 +263,7 @@ #define JFS_NAME_MAX 255 #define JFS_PATH_MAX BPSIZE @@ -3862,9 +3862,9 @@ diff -NurpP --minimal linux-3.3/fs/jfs/jfs_filsys.h linux-3.3-vs2.3.3.1/fs/jfs/j /* * file system state (superblock state) -diff -NurpP --minimal linux-3.3/fs/jfs/jfs_imap.c linux-3.3-vs2.3.3.1/fs/jfs/jfs_imap.c ---- linux-3.3/fs/jfs/jfs_imap.c 2012-01-09 16:14:54.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/jfs/jfs_imap.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/jfs/jfs_imap.c linux-3.3.1-vs2.3.3.2/fs/jfs/jfs_imap.c +--- linux-3.3.1/fs/jfs/jfs_imap.c 2012-01-09 16:14:54.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/jfs/jfs_imap.c 2012-02-24 03:55:06.000000000 +0100 @@ -46,6 +46,7 @@ #include #include @@ -3924,9 +3924,9 @@ diff -NurpP --minimal linux-3.3/fs/jfs/jfs_imap.c linux-3.3-vs2.3.3.1/fs/jfs/jfs jfs_get_inode_flags(jfs_ip); /* * mode2 is only needed for storing the higher order bits. -diff -NurpP --minimal linux-3.3/fs/jfs/jfs_inode.c linux-3.3-vs2.3.3.1/fs/jfs/jfs_inode.c ---- linux-3.3/fs/jfs/jfs_inode.c 2012-01-09 16:14:54.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/jfs/jfs_inode.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/jfs/jfs_inode.c linux-3.3.1-vs2.3.3.2/fs/jfs/jfs_inode.c +--- linux-3.3.1/fs/jfs/jfs_inode.c 2012-01-09 16:14:54.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/jfs/jfs_inode.c 2012-02-24 03:55:06.000000000 +0100 @@ -18,6 +18,7 @@ #include @@ -4000,9 +4000,9 @@ diff -NurpP --minimal linux-3.3/fs/jfs/jfs_inode.c linux-3.3-vs2.3.3.1/fs/jfs/jf } /* -diff -NurpP --minimal linux-3.3/fs/jfs/jfs_inode.h linux-3.3-vs2.3.3.1/fs/jfs/jfs_inode.h ---- linux-3.3/fs/jfs/jfs_inode.h 2011-10-24 18:45:27.000000000 +0200 -+++ linux-3.3-vs2.3.3.1/fs/jfs/jfs_inode.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/jfs/jfs_inode.h linux-3.3.1-vs2.3.3.2/fs/jfs/jfs_inode.h +--- linux-3.3.1/fs/jfs/jfs_inode.h 2011-10-24 18:45:27.000000000 +0200 ++++ linux-3.3.1-vs2.3.3.2/fs/jfs/jfs_inode.h 2012-02-24 03:55:06.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); @@ -4011,9 +4011,9 @@ diff -NurpP --minimal linux-3.3/fs/jfs/jfs_inode.h linux-3.3-vs2.3.3.1/fs/jfs/jf 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-3.3/fs/jfs/namei.c linux-3.3-vs2.3.3.1/fs/jfs/namei.c ---- linux-3.3/fs/jfs/namei.c 2012-03-19 19:47:25.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/jfs/namei.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/jfs/namei.c linux-3.3.1-vs2.3.3.2/fs/jfs/namei.c +--- linux-3.3.1/fs/jfs/namei.c 2012-03-19 19:47:25.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/jfs/namei.c 2012-02-24 03:55:06.000000000 +0100 @@ -22,6 +22,7 @@ #include #include @@ -4038,9 +4038,9 @@ diff -NurpP --minimal linux-3.3/fs/jfs/namei.c linux-3.3-vs2.3.3.1/fs/jfs/namei. }; const struct file_operations jfs_dir_operations = { -diff -NurpP --minimal linux-3.3/fs/jfs/super.c linux-3.3-vs2.3.3.1/fs/jfs/super.c ---- linux-3.3/fs/jfs/super.c 2012-03-19 19:47:25.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/jfs/super.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/jfs/super.c linux-3.3.1-vs2.3.3.2/fs/jfs/super.c +--- linux-3.3.1/fs/jfs/super.c 2012-03-19 19:47:25.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/jfs/super.c 2012-02-24 03:55:06.000000000 +0100 @@ -197,7 +197,8 @@ static void jfs_put_super(struct super_b enum { Opt_integrity, Opt_nointegrity, Opt_iocharset, Opt_resize, @@ -4106,9 +4106,9 @@ diff -NurpP --minimal linux-3.3/fs/jfs/super.c linux-3.3-vs2.3.3.1/fs/jfs/super. if (newLVSize) { printk(KERN_ERR "resize option for remount only\n"); -diff -NurpP --minimal linux-3.3/fs/libfs.c linux-3.3-vs2.3.3.1/fs/libfs.c ---- linux-3.3/fs/libfs.c 2012-03-19 19:47:26.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/libfs.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/libfs.c linux-3.3.1-vs2.3.3.2/fs/libfs.c +--- linux-3.3.1/fs/libfs.c 2012-03-19 19:47:26.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/libfs.c 2012-02-24 03:55:06.000000000 +0100 @@ -135,7 +135,8 @@ static inline unsigned char dt_type(stru * both impossible due to the lock on directory. */ @@ -4154,9 +4154,9 @@ diff -NurpP --minimal linux-3.3/fs/libfs.c linux-3.3-vs2.3.3.1/fs/libfs.c EXPORT_SYMBOL(generic_read_dir); EXPORT_SYMBOL(mount_pseudo); EXPORT_SYMBOL(simple_write_begin); -diff -NurpP --minimal linux-3.3/fs/locks.c linux-3.3-vs2.3.3.1/fs/locks.c ---- linux-3.3/fs/locks.c 2012-01-09 16:14:54.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/locks.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/locks.c linux-3.3.1-vs2.3.3.2/fs/locks.c +--- linux-3.3.1/fs/locks.c 2012-01-09 16:14:54.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/locks.c 2012-03-23 18:52:48.000000000 +0100 @@ -126,6 +126,8 @@ #include #include @@ -4354,9 +4354,9 @@ diff -NurpP --minimal linux-3.3/fs/locks.c linux-3.3-vs2.3.3.1/fs/locks.c return 0; } -diff -NurpP --minimal linux-3.3/fs/mount.h linux-3.3-vs2.3.3.1/fs/mount.h ---- linux-3.3/fs/mount.h 2012-03-19 19:47:26.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/mount.h 2012-02-24 17:29:48.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/mount.h linux-3.3.1-vs2.3.3.2/fs/mount.h +--- linux-3.3.1/fs/mount.h 2012-03-19 19:47:26.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/mount.h 2012-02-24 17:29:48.000000000 +0100 @@ -47,6 +47,7 @@ struct mount { int mnt_expiry_mark; /* true if marked for expiry */ int mnt_pinned; @@ -4365,9 +4365,9 @@ diff -NurpP --minimal linux-3.3/fs/mount.h linux-3.3-vs2.3.3.1/fs/mount.h }; static inline struct mount *real_mount(struct vfsmount *mnt) -diff -NurpP --minimal linux-3.3/fs/namei.c linux-3.3-vs2.3.3.1/fs/namei.c ---- linux-3.3/fs/namei.c 2012-03-19 19:47:26.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/namei.c 2012-03-19 20:52:10.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/namei.c linux-3.3.1-vs2.3.3.2/fs/namei.c +--- linux-3.3.1/fs/namei.c 2012-03-19 19:47:26.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/namei.c 2012-03-19 20:52:10.000000000 +0100 @@ -33,6 +33,14 @@ #include #include @@ -4863,9 +4863,9 @@ diff -NurpP --minimal linux-3.3/fs/namei.c linux-3.3-vs2.3.3.1/fs/namei.c /* get the link contents into pagecache */ static char *page_getlink(struct dentry * dentry, struct page **ppage) { -diff -NurpP --minimal linux-3.3/fs/namespace.c linux-3.3-vs2.3.3.1/fs/namespace.c ---- linux-3.3/fs/namespace.c 2012-03-19 19:47:26.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/namespace.c 2012-02-24 17:38:42.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/namespace.c linux-3.3.1-vs2.3.3.2/fs/namespace.c +--- linux-3.3.1/fs/namespace.c 2012-03-19 19:47:26.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/namespace.c 2012-02-24 17:38:42.000000000 +0100 @@ -20,6 +20,11 @@ #include /* get_fs_root et.al. */ #include /* fsnotify_vfsmount_delete */ @@ -5052,9 +5052,9 @@ diff -NurpP --minimal linux-3.3/fs/namespace.c linux-3.3-vs2.3.3.1/fs/namespace. kfree(ns); } -diff -NurpP --minimal linux-3.3/fs/nfs/client.c linux-3.3-vs2.3.3.1/fs/nfs/client.c ---- linux-3.3/fs/nfs/client.c 2012-03-19 19:47:26.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/nfs/client.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/nfs/client.c linux-3.3.1-vs2.3.3.2/fs/nfs/client.c +--- linux-3.3.1/fs/nfs/client.c 2012-03-19 19:47:26.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/nfs/client.c 2012-02-24 03:55:06.000000000 +0100 @@ -784,6 +784,9 @@ static int nfs_init_server_rpcclient(str if (server->flags & NFS_MOUNT_SOFT) server->client->cl_softrtry = 1; @@ -5076,9 +5076,9 @@ diff -NurpP --minimal linux-3.3/fs/nfs/client.c linux-3.3-vs2.3.3.1/fs/nfs/clien server->maxfilesize = fsinfo->maxfilesize; server->time_delta = fsinfo->time_delta; -diff -NurpP --minimal linux-3.3/fs/nfs/dir.c linux-3.3-vs2.3.3.1/fs/nfs/dir.c ---- linux-3.3/fs/nfs/dir.c 2012-03-19 19:47:26.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/nfs/dir.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/nfs/dir.c linux-3.3.1-vs2.3.3.2/fs/nfs/dir.c +--- linux-3.3.1/fs/nfs/dir.c 2012-03-19 19:47:26.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/nfs/dir.c 2012-02-24 03:55:06.000000000 +0100 @@ -35,6 +35,7 @@ #include #include @@ -5095,9 +5095,9 @@ diff -NurpP --minimal linux-3.3/fs/nfs/dir.c linux-3.3-vs2.3.3.1/fs/nfs/dir.c no_entry: res = d_materialise_unique(dentry, inode); if (res != NULL) { -diff -NurpP --minimal linux-3.3/fs/nfs/inode.c linux-3.3-vs2.3.3.1/fs/nfs/inode.c ---- linux-3.3/fs/nfs/inode.c 2012-03-19 19:47:26.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/nfs/inode.c 2012-02-24 04:40:22.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/nfs/inode.c linux-3.3.1-vs2.3.3.2/fs/nfs/inode.c +--- linux-3.3.1/fs/nfs/inode.c 2012-03-19 19:47:26.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/nfs/inode.c 2012-02-24 04:40:22.000000000 +0100 @@ -39,6 +39,7 @@ #include #include @@ -5249,9 +5249,9 @@ diff -NurpP --minimal linux-3.3/fs/nfs/inode.c linux-3.3-vs2.3.3.1/fs/nfs/inode. if (fattr->valid & NFS_ATTR_FATTR_NLINK) { if (inode->i_nlink != fattr->nlink) { invalid |= NFS_INO_INVALID_ATTR; -diff -NurpP --minimal linux-3.3/fs/nfs/nfs3xdr.c linux-3.3-vs2.3.3.1/fs/nfs/nfs3xdr.c ---- linux-3.3/fs/nfs/nfs3xdr.c 2011-03-15 18:07:32.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/nfs/nfs3xdr.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/nfs/nfs3xdr.c linux-3.3.1-vs2.3.3.2/fs/nfs/nfs3xdr.c +--- linux-3.3.1/fs/nfs/nfs3xdr.c 2011-03-15 18:07:32.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/nfs/nfs3xdr.c 2012-02-24 03:55:06.000000000 +0100 @@ -20,6 +20,7 @@ #include #include @@ -5397,9 +5397,9 @@ diff -NurpP --minimal linux-3.3/fs/nfs/nfs3xdr.c linux-3.3-vs2.3.3.1/fs/nfs/nfs3 } /* -diff -NurpP --minimal linux-3.3/fs/nfs/super.c linux-3.3-vs2.3.3.1/fs/nfs/super.c ---- linux-3.3/fs/nfs/super.c 2012-03-19 19:47:26.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/nfs/super.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/nfs/super.c linux-3.3.1-vs2.3.3.2/fs/nfs/super.c +--- linux-3.3.1/fs/nfs/super.c 2012-03-19 19:47:26.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/nfs/super.c 2012-02-24 03:55:06.000000000 +0100 @@ -52,6 +52,7 @@ #include #include @@ -5471,9 +5471,9 @@ diff -NurpP --minimal linux-3.3/fs/nfs/super.c linux-3.3-vs2.3.3.1/fs/nfs/super. /* * options that take text values -diff -NurpP --minimal linux-3.3/fs/nfsd/auth.c linux-3.3-vs2.3.3.1/fs/nfsd/auth.c ---- linux-3.3/fs/nfsd/auth.c 2010-02-25 11:52:05.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/nfsd/auth.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/nfsd/auth.c linux-3.3.1-vs2.3.3.2/fs/nfsd/auth.c +--- linux-3.3.1/fs/nfsd/auth.c 2010-02-25 11:52:05.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/nfsd/auth.c 2012-02-24 03:55:06.000000000 +0100 @@ -1,6 +1,7 @@ /* Copyright (C) 1995, 1996 Olaf Kirch */ @@ -5492,9 +5492,9 @@ diff -NurpP --minimal linux-3.3/fs/nfsd/auth.c linux-3.3-vs2.3.3.1/fs/nfsd/auth. rqgi = rqstp->rq_cred.cr_group_info; -diff -NurpP --minimal linux-3.3/fs/nfsd/nfs3xdr.c linux-3.3-vs2.3.3.1/fs/nfsd/nfs3xdr.c ---- linux-3.3/fs/nfsd/nfs3xdr.c 2011-07-22 11:18:05.000000000 +0200 -+++ linux-3.3-vs2.3.3.1/fs/nfsd/nfs3xdr.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/nfsd/nfs3xdr.c linux-3.3.1-vs2.3.3.2/fs/nfsd/nfs3xdr.c +--- linux-3.3.1/fs/nfsd/nfs3xdr.c 2011-07-22 11:18:05.000000000 +0200 ++++ linux-3.3.1-vs2.3.3.2/fs/nfsd/nfs3xdr.c 2012-02-24 03:55:06.000000000 +0100 @@ -7,6 +7,7 @@ */ @@ -5545,9 +5545,9 @@ diff -NurpP --minimal linux-3.3/fs/nfsd/nfs3xdr.c linux-3.3-vs2.3.3.1/fs/nfsd/nf if (S_ISLNK(stat->mode) && stat->size > NFS3_MAXPATHLEN) { p = xdr_encode_hyper(p, (u64) NFS3_MAXPATHLEN); } else { -diff -NurpP --minimal linux-3.3/fs/nfsd/nfs4xdr.c linux-3.3-vs2.3.3.1/fs/nfsd/nfs4xdr.c ---- linux-3.3/fs/nfsd/nfs4xdr.c 2012-03-19 19:47:26.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/nfsd/nfs4xdr.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/nfsd/nfs4xdr.c linux-3.3.1-vs2.3.3.2/fs/nfsd/nfs4xdr.c +--- linux-3.3.1/fs/nfsd/nfs4xdr.c 2012-03-19 19:47:26.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/nfsd/nfs4xdr.c 2012-02-24 03:55:06.000000000 +0100 @@ -46,6 +46,7 @@ #include #include @@ -5577,9 +5577,9 @@ diff -NurpP --minimal linux-3.3/fs/nfsd/nfs4xdr.c linux-3.3-vs2.3.3.1/fs/nfsd/nf if (status == nfserr_resource) goto out_resource; if (status) -diff -NurpP --minimal linux-3.3/fs/nfsd/nfsxdr.c linux-3.3-vs2.3.3.1/fs/nfsd/nfsxdr.c ---- linux-3.3/fs/nfsd/nfsxdr.c 2011-05-22 16:17:53.000000000 +0200 -+++ linux-3.3-vs2.3.3.1/fs/nfsd/nfsxdr.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/nfsd/nfsxdr.c linux-3.3.1-vs2.3.3.2/fs/nfsd/nfsxdr.c +--- linux-3.3.1/fs/nfsd/nfsxdr.c 2011-05-22 16:17:53.000000000 +0200 ++++ linux-3.3.1-vs2.3.3.2/fs/nfsd/nfsxdr.c 2012-02-24 03:55:06.000000000 +0100 @@ -6,6 +6,7 @@ #include "xdr.h" @@ -5628,9 +5628,9 @@ diff -NurpP --minimal linux-3.3/fs/nfsd/nfsxdr.c linux-3.3-vs2.3.3.1/fs/nfsd/nfs if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) { *p++ = htonl(NFS_MAXPATHLEN); -diff -NurpP --minimal linux-3.3/fs/ocfs2/dlmglue.c linux-3.3-vs2.3.3.1/fs/ocfs2/dlmglue.c ---- linux-3.3/fs/ocfs2/dlmglue.c 2012-01-09 16:14:55.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/ocfs2/dlmglue.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/ocfs2/dlmglue.c linux-3.3.1-vs2.3.3.2/fs/ocfs2/dlmglue.c +--- linux-3.3.1/fs/ocfs2/dlmglue.c 2012-01-09 16:14:55.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/ocfs2/dlmglue.c 2012-02-24 03:55:06.000000000 +0100 @@ -2047,6 +2047,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); @@ -5647,9 +5647,9 @@ diff -NurpP --minimal linux-3.3/fs/ocfs2/dlmglue.c linux-3.3-vs2.3.3.1/fs/ocfs2/ inode->i_mode = be16_to_cpu(lvb->lvb_imode); set_nlink(inode, be16_to_cpu(lvb->lvb_inlink)); ocfs2_unpack_timespec(&inode->i_atime, -diff -NurpP --minimal linux-3.3/fs/ocfs2/dlmglue.h linux-3.3-vs2.3.3.1/fs/ocfs2/dlmglue.h ---- linux-3.3/fs/ocfs2/dlmglue.h 2010-10-21 13:07:50.000000000 +0200 -+++ linux-3.3-vs2.3.3.1/fs/ocfs2/dlmglue.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/ocfs2/dlmglue.h linux-3.3.1-vs2.3.3.2/fs/ocfs2/dlmglue.h +--- linux-3.3.1/fs/ocfs2/dlmglue.h 2010-10-21 13:07:50.000000000 +0200 ++++ linux-3.3.1-vs2.3.3.2/fs/ocfs2/dlmglue.h 2012-02-24 03:55:06.000000000 +0100 @@ -46,7 +46,8 @@ struct ocfs2_meta_lvb { __be16 lvb_inlink; __be32 lvb_iattr; @@ -5660,9 +5660,9 @@ diff -NurpP --minimal linux-3.3/fs/ocfs2/dlmglue.h linux-3.3-vs2.3.3.1/fs/ocfs2/ }; #define OCFS2_QINFO_LVB_VERSION 1 -diff -NurpP --minimal linux-3.3/fs/ocfs2/file.c linux-3.3-vs2.3.3.1/fs/ocfs2/file.c ---- linux-3.3/fs/ocfs2/file.c 2012-03-19 19:47:26.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/ocfs2/file.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/ocfs2/file.c linux-3.3.1-vs2.3.3.2/fs/ocfs2/file.c +--- linux-3.3.1/fs/ocfs2/file.c 2012-03-19 19:47:26.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/ocfs2/file.c 2012-02-24 03:55:06.000000000 +0100 @@ -1123,7 +1123,7 @@ int ocfs2_setattr(struct dentry *dentry, attr->ia_valid &= ~ATTR_SIZE; @@ -5672,9 +5672,9 @@ diff -NurpP --minimal linux-3.3/fs/ocfs2/file.c linux-3.3-vs2.3.3.1/fs/ocfs2/fil if (!(attr->ia_valid & OCFS2_VALID_ATTRS)) return 0; -diff -NurpP --minimal linux-3.3/fs/ocfs2/inode.c linux-3.3-vs2.3.3.1/fs/ocfs2/inode.c ---- linux-3.3/fs/ocfs2/inode.c 2012-01-09 16:14:55.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/ocfs2/inode.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/ocfs2/inode.c linux-3.3.1-vs2.3.3.2/fs/ocfs2/inode.c +--- linux-3.3.1/fs/ocfs2/inode.c 2012-01-09 16:14:55.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/ocfs2/inode.c 2012-02-24 03:55:06.000000000 +0100 @@ -28,6 +28,7 @@ #include #include @@ -5771,9 +5771,9 @@ diff -NurpP --minimal linux-3.3/fs/ocfs2/inode.c linux-3.3-vs2.3.3.1/fs/ocfs2/in /* Fast symlinks will have i_size but no allocated clusters. */ if (S_ISLNK(inode->i_mode) && !fe->i_clusters) -diff -NurpP --minimal linux-3.3/fs/ocfs2/inode.h linux-3.3-vs2.3.3.1/fs/ocfs2/inode.h ---- linux-3.3/fs/ocfs2/inode.h 2012-01-09 16:14:55.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/ocfs2/inode.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/ocfs2/inode.h linux-3.3.1-vs2.3.3.2/fs/ocfs2/inode.h +--- linux-3.3.1/fs/ocfs2/inode.h 2012-01-09 16:14:55.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/ocfs2/inode.h 2012-02-24 03:55:06.000000000 +0100 @@ -154,6 +154,7 @@ struct buffer_head *ocfs2_bread(struct i void ocfs2_set_inode_flags(struct inode *inode); @@ -5782,9 +5782,9 @@ diff -NurpP --minimal linux-3.3/fs/ocfs2/inode.h linux-3.3-vs2.3.3.1/fs/ocfs2/in static inline blkcnt_t ocfs2_inode_sector_count(struct inode *inode) { -diff -NurpP --minimal linux-3.3/fs/ocfs2/ioctl.c linux-3.3-vs2.3.3.1/fs/ocfs2/ioctl.c ---- linux-3.3/fs/ocfs2/ioctl.c 2012-03-19 19:47:26.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/ocfs2/ioctl.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/ocfs2/ioctl.c linux-3.3.1-vs2.3.3.2/fs/ocfs2/ioctl.c +--- linux-3.3.1/fs/ocfs2/ioctl.c 2012-03-19 19:47:26.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/ocfs2/ioctl.c 2012-02-24 03:55:06.000000000 +0100 @@ -78,7 +78,41 @@ static int ocfs2_get_inode_attr(struct i return status; } @@ -5848,9 +5848,9 @@ diff -NurpP --minimal linux-3.3/fs/ocfs2/ioctl.c linux-3.3-vs2.3.3.1/fs/ocfs2/io 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-3.3/fs/ocfs2/namei.c linux-3.3-vs2.3.3.1/fs/ocfs2/namei.c ---- linux-3.3/fs/ocfs2/namei.c 2012-03-19 19:47:26.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/ocfs2/namei.c 2012-03-19 20:52:10.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/ocfs2/namei.c linux-3.3.1-vs2.3.3.2/fs/ocfs2/namei.c +--- linux-3.3.1/fs/ocfs2/namei.c 2012-03-19 19:47:26.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/ocfs2/namei.c 2012-03-19 20:52:10.000000000 +0100 @@ -41,6 +41,7 @@ #include #include @@ -5881,9 +5881,9 @@ diff -NurpP --minimal linux-3.3/fs/ocfs2/namei.c linux-3.3-vs2.3.3.1/fs/ocfs2/na 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-3.3/fs/ocfs2/ocfs2.h linux-3.3-vs2.3.3.1/fs/ocfs2/ocfs2.h ---- linux-3.3/fs/ocfs2/ocfs2.h 2012-01-09 16:14:55.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/ocfs2/ocfs2.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/ocfs2/ocfs2.h linux-3.3.1-vs2.3.3.2/fs/ocfs2/ocfs2.h +--- linux-3.3.1/fs/ocfs2/ocfs2.h 2012-01-09 16:14:55.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/ocfs2/ocfs2.h 2012-02-24 03:55:06.000000000 +0100 @@ -272,6 +272,7 @@ enum ocfs2_mount_options writes */ OCFS2_MOUNT_HB_NONE = 1 << 13, /* No heartbeat */ @@ -5892,9 +5892,9 @@ diff -NurpP --minimal linux-3.3/fs/ocfs2/ocfs2.h linux-3.3-vs2.3.3.1/fs/ocfs2/oc }; #define OCFS2_OSB_SOFT_RO 0x0001 -diff -NurpP --minimal linux-3.3/fs/ocfs2/ocfs2_fs.h linux-3.3-vs2.3.3.1/fs/ocfs2/ocfs2_fs.h ---- linux-3.3/fs/ocfs2/ocfs2_fs.h 2011-05-22 16:17:53.000000000 +0200 -+++ linux-3.3-vs2.3.3.1/fs/ocfs2/ocfs2_fs.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/ocfs2/ocfs2_fs.h linux-3.3.1-vs2.3.3.2/fs/ocfs2/ocfs2_fs.h +--- linux-3.3.1/fs/ocfs2/ocfs2_fs.h 2011-05-22 16:17:53.000000000 +0200 ++++ linux-3.3.1-vs2.3.3.2/fs/ocfs2/ocfs2_fs.h 2012-02-24 03:55:06.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 */ @@ -5907,9 +5907,9 @@ diff -NurpP --minimal linux-3.3/fs/ocfs2/ocfs2_fs.h linux-3.3-vs2.3.3.1/fs/ocfs2 #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-3.3/fs/ocfs2/super.c linux-3.3-vs2.3.3.1/fs/ocfs2/super.c ---- linux-3.3/fs/ocfs2/super.c 2012-03-19 19:47:26.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/ocfs2/super.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/ocfs2/super.c linux-3.3.1-vs2.3.3.2/fs/ocfs2/super.c +--- linux-3.3.1/fs/ocfs2/super.c 2012-03-19 19:47:26.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/ocfs2/super.c 2012-02-24 03:55:06.000000000 +0100 @@ -185,6 +185,7 @@ enum { Opt_coherency_full, Opt_resv_level, @@ -5973,9 +5973,9 @@ diff -NurpP --minimal linux-3.3/fs/ocfs2/super.c linux-3.3-vs2.3.3.1/fs/ocfs2/su default: mlog(ML_ERROR, "Unrecognized mount option \"%s\" " -diff -NurpP --minimal linux-3.3/fs/open.c linux-3.3-vs2.3.3.1/fs/open.c ---- linux-3.3/fs/open.c 2012-03-19 19:47:26.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/open.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/open.c linux-3.3.1-vs2.3.3.2/fs/open.c +--- linux-3.3.1/fs/open.c 2012-03-19 19:47:26.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/open.c 2012-02-24 03:55:06.000000000 +0100 @@ -30,6 +30,11 @@ #include #include @@ -6067,9 +6067,9 @@ diff -NurpP --minimal linux-3.3/fs/open.c linux-3.3-vs2.3.3.1/fs/open.c } void put_unused_fd(unsigned int fd) -diff -NurpP --minimal linux-3.3/fs/proc/array.c linux-3.3-vs2.3.3.1/fs/proc/array.c ---- linux-3.3/fs/proc/array.c 2012-03-19 19:47:26.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/proc/array.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/proc/array.c linux-3.3.1-vs2.3.3.2/fs/proc/array.c +--- linux-3.3.1/fs/proc/array.c 2012-03-19 19:47:26.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/proc/array.c 2012-02-24 03:55:06.000000000 +0100 @@ -81,6 +81,8 @@ #include #include @@ -6183,9 +6183,9 @@ diff -NurpP --minimal linux-3.3/fs/proc/array.c linux-3.3-vs2.3.3.1/fs/proc/arra 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 %lu %lu %lu\n", -diff -NurpP --minimal linux-3.3/fs/proc/base.c linux-3.3-vs2.3.3.1/fs/proc/base.c ---- linux-3.3/fs/proc/base.c 2012-03-19 19:47:26.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/proc/base.c 2012-02-24 04:45:58.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/proc/base.c linux-3.3.1-vs2.3.3.2/fs/proc/base.c +--- linux-3.3.1/fs/proc/base.c 2012-03-19 19:47:26.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/proc/base.c 2012-02-24 04:45:58.000000000 +0100 @@ -84,6 +84,8 @@ #include #include @@ -6347,9 +6347,9 @@ diff -NurpP --minimal linux-3.3/fs/proc/base.c linux-3.3-vs2.3.3.1/fs/proc/base. ns = dentry->d_sb->s_fs_info; rcu_read_lock(); -diff -NurpP --minimal linux-3.3/fs/proc/generic.c linux-3.3-vs2.3.3.1/fs/proc/generic.c ---- linux-3.3/fs/proc/generic.c 2012-03-19 19:47:26.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/proc/generic.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/proc/generic.c linux-3.3.1-vs2.3.3.2/fs/proc/generic.c +--- linux-3.3.1/fs/proc/generic.c 2012-03-19 19:47:26.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/proc/generic.c 2012-02-24 03:55:06.000000000 +0100 @@ -22,6 +22,7 @@ #include #include @@ -6409,9 +6409,9 @@ diff -NurpP --minimal linux-3.3/fs/proc/generic.c linux-3.3-vs2.3.3.1/fs/proc/ge } else { kfree(ent); ent = NULL; -diff -NurpP --minimal linux-3.3/fs/proc/inode.c linux-3.3-vs2.3.3.1/fs/proc/inode.c ---- linux-3.3/fs/proc/inode.c 2012-03-19 19:47:26.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/proc/inode.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/proc/inode.c linux-3.3.1-vs2.3.3.2/fs/proc/inode.c +--- linux-3.3.1/fs/proc/inode.c 2012-03-19 19:47:26.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/proc/inode.c 2012-02-24 03:55:06.000000000 +0100 @@ -459,6 +459,8 @@ struct inode *proc_get_inode(struct supe inode->i_uid = de->uid; inode->i_gid = de->gid; @@ -6421,9 +6421,9 @@ diff -NurpP --minimal linux-3.3/fs/proc/inode.c linux-3.3-vs2.3.3.1/fs/proc/inod if (de->size) inode->i_size = de->size; if (de->nlink) -diff -NurpP --minimal linux-3.3/fs/proc/internal.h linux-3.3-vs2.3.3.1/fs/proc/internal.h ---- linux-3.3/fs/proc/internal.h 2012-03-19 19:47:26.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/proc/internal.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/proc/internal.h linux-3.3.1-vs2.3.3.2/fs/proc/internal.h +--- linux-3.3.1/fs/proc/internal.h 2012-03-19 19:47:26.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/proc/internal.h 2012-02-24 03:55:06.000000000 +0100 @@ -10,6 +10,7 @@ */ @@ -6460,9 +6460,9 @@ diff -NurpP --minimal linux-3.3/fs/proc/internal.h linux-3.3-vs2.3.3.1/fs/proc/i static inline int proc_fd(struct inode *inode) { return PROC_I(inode)->fd; -diff -NurpP --minimal linux-3.3/fs/proc/loadavg.c linux-3.3-vs2.3.3.1/fs/proc/loadavg.c ---- linux-3.3/fs/proc/loadavg.c 2009-09-10 15:26:23.000000000 +0200 -+++ linux-3.3-vs2.3.3.1/fs/proc/loadavg.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/proc/loadavg.c linux-3.3.1-vs2.3.3.2/fs/proc/loadavg.c +--- linux-3.3.1/fs/proc/loadavg.c 2009-09-10 15:26:23.000000000 +0200 ++++ linux-3.3.1-vs2.3.3.2/fs/proc/loadavg.c 2012-02-24 03:55:06.000000000 +0100 @@ -12,15 +12,27 @@ static int loadavg_proc_show(struct seq_file *m, void *v) @@ -6492,9 +6492,9 @@ diff -NurpP --minimal linux-3.3/fs/proc/loadavg.c linux-3.3-vs2.3.3.1/fs/proc/lo task_active_pid_ns(current)->last_pid); return 0; } -diff -NurpP --minimal linux-3.3/fs/proc/meminfo.c linux-3.3-vs2.3.3.1/fs/proc/meminfo.c ---- linux-3.3/fs/proc/meminfo.c 2012-01-09 16:14:55.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/proc/meminfo.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/proc/meminfo.c linux-3.3.1-vs2.3.3.2/fs/proc/meminfo.c +--- linux-3.3.1/fs/proc/meminfo.c 2012-01-09 16:14:55.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/proc/meminfo.c 2012-02-24 03:55:06.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; @@ -6505,9 +6505,9 @@ diff -NurpP --minimal linux-3.3/fs/proc/meminfo.c linux-3.3-vs2.3.3.1/fs/proc/me total_swapcache_pages - i.bufferram; if (cached < 0) cached = 0; -diff -NurpP --minimal linux-3.3/fs/proc/root.c linux-3.3-vs2.3.3.1/fs/proc/root.c ---- linux-3.3/fs/proc/root.c 2012-03-19 19:47:26.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/proc/root.c 2012-02-24 04:46:50.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/proc/root.c linux-3.3.1-vs2.3.3.2/fs/proc/root.c +--- linux-3.3.1/fs/proc/root.c 2012-03-19 19:47:26.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/proc/root.c 2012-02-24 04:46:50.000000000 +0100 @@ -19,9 +19,14 @@ #include #include @@ -6539,9 +6539,9 @@ diff -NurpP --minimal linux-3.3/fs/proc/root.c linux-3.3-vs2.3.3.1/fs/proc/root. .name = "/proc", }; -diff -NurpP --minimal linux-3.3/fs/proc/uptime.c linux-3.3-vs2.3.3.1/fs/proc/uptime.c ---- linux-3.3/fs/proc/uptime.c 2012-03-19 19:47:26.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/proc/uptime.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/proc/uptime.c linux-3.3.1-vs2.3.3.2/fs/proc/uptime.c +--- linux-3.3.1/fs/proc/uptime.c 2012-03-19 19:47:26.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/proc/uptime.c 2012-02-24 03:55:06.000000000 +0100 @@ -5,6 +5,7 @@ #include #include @@ -6561,9 +6561,9 @@ diff -NurpP --minimal linux-3.3/fs/proc/uptime.c linux-3.3-vs2.3.3.1/fs/proc/upt seq_printf(m, "%lu.%02lu %lu.%02lu\n", (unsigned long) uptime.tv_sec, (uptime.tv_nsec / (NSEC_PER_SEC / 100)), -diff -NurpP --minimal linux-3.3/fs/proc_namespace.c linux-3.3-vs2.3.3.1/fs/proc_namespace.c ---- linux-3.3/fs/proc_namespace.c 2012-03-19 19:47:26.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/proc_namespace.c 2012-02-24 17:41:22.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/proc_namespace.c linux-3.3.1-vs2.3.3.2/fs/proc_namespace.c +--- linux-3.3.1/fs/proc_namespace.c 2012-03-19 19:47:26.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/proc_namespace.c 2012-02-24 17:41:22.000000000 +0100 @@ -44,6 +44,8 @@ static int show_sb_opts(struct seq_file { MS_SYNCHRONOUS, ",sync" }, { MS_DIRSYNC, ",dirsync" }, @@ -6673,9 +6673,9 @@ diff -NurpP --minimal linux-3.3/fs/proc_namespace.c linux-3.3-vs2.3.3.1/fs/proc_ /* file system type */ seq_puts(m, "with fstype "); show_type(m, sb); -diff -NurpP --minimal linux-3.3/fs/quota/dquot.c linux-3.3-vs2.3.3.1/fs/quota/dquot.c ---- linux-3.3/fs/quota/dquot.c 2012-03-19 19:47:26.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/quota/dquot.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/quota/dquot.c linux-3.3.1-vs2.3.3.2/fs/quota/dquot.c +--- linux-3.3.1/fs/quota/dquot.c 2012-03-19 19:47:26.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/quota/dquot.c 2012-02-24 03:55:06.000000000 +0100 @@ -1547,6 +1547,9 @@ int __dquot_alloc_space(struct inode *in int reserve = flags & DQUOT_SPACE_RESERVE; int nofail = flags & DQUOT_SPACE_NOFAIL; @@ -6714,9 +6714,9 @@ diff -NurpP --minimal linux-3.3/fs/quota/dquot.c linux-3.3-vs2.3.3.1/fs/quota/dq /* 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-3.3/fs/quota/quota.c linux-3.3-vs2.3.3.1/fs/quota/quota.c ---- linux-3.3/fs/quota/quota.c 2012-03-19 19:47:26.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/quota/quota.c 2012-03-19 20:54:39.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/quota/quota.c linux-3.3.1-vs2.3.3.2/fs/quota/quota.c +--- linux-3.3.1/fs/quota/quota.c 2012-03-19 19:47:26.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/quota/quota.c 2012-03-19 20:54:39.000000000 +0100 @@ -8,6 +8,7 @@ #include #include @@ -6804,9 +6804,9 @@ diff -NurpP --minimal linux-3.3/fs/quota/quota.c linux-3.3-vs2.3.3.1/fs/quota/qu if (quotactl_cmd_write(cmd)) sb = get_super_thawed(bdev); else -diff -NurpP --minimal linux-3.3/fs/reiserfs/file.c linux-3.3-vs2.3.3.1/fs/reiserfs/file.c ---- linux-3.3/fs/reiserfs/file.c 2011-10-24 18:45:27.000000000 +0200 -+++ linux-3.3-vs2.3.3.1/fs/reiserfs/file.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/reiserfs/file.c linux-3.3.1-vs2.3.3.2/fs/reiserfs/file.c +--- linux-3.3.1/fs/reiserfs/file.c 2011-10-24 18:45:27.000000000 +0200 ++++ linux-3.3.1-vs2.3.3.2/fs/reiserfs/file.c 2012-02-24 03:55:06.000000000 +0100 @@ -319,5 +319,6 @@ const struct inode_operations reiserfs_f .listxattr = reiserfs_listxattr, .removexattr = reiserfs_removexattr, @@ -6814,9 +6814,9 @@ diff -NurpP --minimal linux-3.3/fs/reiserfs/file.c linux-3.3-vs2.3.3.1/fs/reiser + .sync_flags = reiserfs_sync_flags, .get_acl = reiserfs_get_acl, }; -diff -NurpP --minimal linux-3.3/fs/reiserfs/inode.c linux-3.3-vs2.3.3.1/fs/reiserfs/inode.c ---- linux-3.3/fs/reiserfs/inode.c 2012-03-19 19:47:26.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/reiserfs/inode.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/reiserfs/inode.c linux-3.3.1-vs2.3.3.2/fs/reiserfs/inode.c +--- linux-3.3.1/fs/reiserfs/inode.c 2012-03-19 19:47:26.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/reiserfs/inode.c 2012-02-24 03:55:06.000000000 +0100 @@ -18,6 +18,7 @@ #include #include @@ -6982,9 +6982,9 @@ diff -NurpP --minimal linux-3.3/fs/reiserfs/inode.c linux-3.3-vs2.3.3.1/fs/reise mark_inode_dirty(inode); error = journal_end(&th, inode->i_sb, jbegin_count); if (error) -diff -NurpP --minimal linux-3.3/fs/reiserfs/ioctl.c linux-3.3-vs2.3.3.1/fs/reiserfs/ioctl.c ---- linux-3.3/fs/reiserfs/ioctl.c 2012-03-19 19:47:26.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/reiserfs/ioctl.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/reiserfs/ioctl.c linux-3.3.1-vs2.3.3.2/fs/reiserfs/ioctl.c +--- linux-3.3.1/fs/reiserfs/ioctl.c 2012-03-19 19:47:26.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/reiserfs/ioctl.c 2012-02-24 03:55:06.000000000 +0100 @@ -11,6 +11,21 @@ #include #include @@ -7046,9 +7046,9 @@ diff -NurpP --minimal linux-3.3/fs/reiserfs/ioctl.c linux-3.3-vs2.3.3.1/fs/reise sd_attrs_to_i_attrs(flags, inode); REISERFS_I(inode)->i_attrs = flags; inode->i_ctime = CURRENT_TIME_SEC; -diff -NurpP --minimal linux-3.3/fs/reiserfs/namei.c linux-3.3-vs2.3.3.1/fs/reiserfs/namei.c ---- linux-3.3/fs/reiserfs/namei.c 2012-03-19 19:47:26.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/reiserfs/namei.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/reiserfs/namei.c linux-3.3.1-vs2.3.3.2/fs/reiserfs/namei.c +--- linux-3.3.1/fs/reiserfs/namei.c 2012-03-19 19:47:26.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/reiserfs/namei.c 2012-02-24 03:55:06.000000000 +0100 @@ -18,6 +18,7 @@ #include #include @@ -7065,9 +7065,9 @@ diff -NurpP --minimal linux-3.3/fs/reiserfs/namei.c linux-3.3-vs2.3.3.1/fs/reise return d_splice_alias(inode, dentry); } -diff -NurpP --minimal linux-3.3/fs/reiserfs/super.c linux-3.3-vs2.3.3.1/fs/reiserfs/super.c ---- linux-3.3/fs/reiserfs/super.c 2012-03-19 19:47:26.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/reiserfs/super.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/reiserfs/super.c linux-3.3.1-vs2.3.3.2/fs/reiserfs/super.c +--- linux-3.3.1/fs/reiserfs/super.c 2012-03-19 19:47:26.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/reiserfs/super.c 2012-02-24 03:55:06.000000000 +0100 @@ -980,6 +980,14 @@ static int reiserfs_parse_options(struct {"user_xattr",.setmask = 1 << REISERFS_UNSUPPORTED_OPT}, {"nouser_xattr",.clrmask = 1 << REISERFS_UNSUPPORTED_OPT}, @@ -7109,9 +7109,9 @@ diff -NurpP --minimal linux-3.3/fs/reiserfs/super.c linux-3.3-vs2.3.3.1/fs/reise 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-3.3/fs/reiserfs/xattr.c linux-3.3-vs2.3.3.1/fs/reiserfs/xattr.c ---- linux-3.3/fs/reiserfs/xattr.c 2012-03-19 19:47:26.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/reiserfs/xattr.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/reiserfs/xattr.c linux-3.3.1-vs2.3.3.2/fs/reiserfs/xattr.c +--- linux-3.3.1/fs/reiserfs/xattr.c 2012-03-19 19:47:26.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/reiserfs/xattr.c 2012-02-24 03:55:06.000000000 +0100 @@ -40,6 +40,7 @@ #include #include @@ -7120,9 +7120,9 @@ diff -NurpP --minimal linux-3.3/fs/reiserfs/xattr.c linux-3.3-vs2.3.3.1/fs/reise #include #include #include -diff -NurpP --minimal linux-3.3/fs/stat.c linux-3.3-vs2.3.3.1/fs/stat.c ---- linux-3.3/fs/stat.c 2012-01-09 16:14:55.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/stat.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/stat.c linux-3.3.1-vs2.3.3.2/fs/stat.c +--- linux-3.3.1/fs/stat.c 2012-01-09 16:14:55.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/stat.c 2012-02-24 03:55:06.000000000 +0100 @@ -26,6 +26,7 @@ void generic_fillattr(struct inode *inod stat->nlink = inode->i_nlink; stat->uid = inode->i_uid; @@ -7131,9 +7131,9 @@ diff -NurpP --minimal linux-3.3/fs/stat.c linux-3.3-vs2.3.3.1/fs/stat.c stat->rdev = inode->i_rdev; stat->size = i_size_read(inode); stat->atime = inode->i_atime; -diff -NurpP --minimal linux-3.3/fs/statfs.c linux-3.3-vs2.3.3.1/fs/statfs.c ---- linux-3.3/fs/statfs.c 2012-03-19 19:47:26.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/statfs.c 2012-02-24 04:27:47.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/statfs.c linux-3.3.1-vs2.3.3.2/fs/statfs.c +--- linux-3.3.1/fs/statfs.c 2012-03-19 19:47:26.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/statfs.c 2012-02-24 04:27:47.000000000 +0100 @@ -7,6 +7,8 @@ #include #include @@ -7152,9 +7152,9 @@ diff -NurpP --minimal linux-3.3/fs/statfs.c linux-3.3-vs2.3.3.1/fs/statfs.c return retval; } -diff -NurpP --minimal linux-3.3/fs/super.c linux-3.3-vs2.3.3.1/fs/super.c ---- linux-3.3/fs/super.c 2012-03-19 19:47:26.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/super.c 2012-03-19 20:52:10.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/super.c linux-3.3.1-vs2.3.3.2/fs/super.c +--- linux-3.3.1/fs/super.c 2012-03-19 19:47:26.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/super.c 2012-03-19 20:52:10.000000000 +0100 @@ -32,6 +32,9 @@ #include #include @@ -7179,9 +7179,9 @@ diff -NurpP --minimal linux-3.3/fs/super.c linux-3.3-vs2.3.3.1/fs/super.c error = security_sb_kern_mount(sb, flags, secdata); if (error) goto out_sb; -diff -NurpP --minimal linux-3.3/fs/sysfs/mount.c linux-3.3-vs2.3.3.1/fs/sysfs/mount.c ---- linux-3.3/fs/sysfs/mount.c 2011-07-22 11:18:06.000000000 +0200 -+++ linux-3.3-vs2.3.3.1/fs/sysfs/mount.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/sysfs/mount.c linux-3.3.1-vs2.3.3.2/fs/sysfs/mount.c +--- linux-3.3.1/fs/sysfs/mount.c 2011-07-22 11:18:06.000000000 +0200 ++++ linux-3.3.1-vs2.3.3.2/fs/sysfs/mount.c 2012-02-24 03:55:06.000000000 +0100 @@ -47,7 +47,7 @@ static int sysfs_fill_super(struct super sb->s_blocksize = PAGE_CACHE_SIZE; @@ -7191,9 +7191,9 @@ diff -NurpP --minimal linux-3.3/fs/sysfs/mount.c linux-3.3-vs2.3.3.1/fs/sysfs/mo sb->s_op = &sysfs_ops; sb->s_time_gran = 1; -diff -NurpP --minimal linux-3.3/fs/utimes.c linux-3.3-vs2.3.3.1/fs/utimes.c ---- linux-3.3/fs/utimes.c 2011-05-22 16:17:54.000000000 +0200 -+++ linux-3.3-vs2.3.3.1/fs/utimes.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/utimes.c linux-3.3.1-vs2.3.3.2/fs/utimes.c +--- linux-3.3.1/fs/utimes.c 2011-05-22 16:17:54.000000000 +0200 ++++ linux-3.3.1-vs2.3.3.2/fs/utimes.c 2012-02-24 03:55:06.000000000 +0100 @@ -8,6 +8,8 @@ #include #include @@ -7223,9 +7223,9 @@ diff -NurpP --minimal linux-3.3/fs/utimes.c linux-3.3-vs2.3.3.1/fs/utimes.c if (times && times[0].tv_nsec == UTIME_NOW && times[1].tv_nsec == UTIME_NOW) times = NULL; -diff -NurpP --minimal linux-3.3/fs/xattr.c linux-3.3-vs2.3.3.1/fs/xattr.c ---- linux-3.3/fs/xattr.c 2012-03-19 19:47:27.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/xattr.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/xattr.c linux-3.3.1-vs2.3.3.2/fs/xattr.c +--- linux-3.3.1/fs/xattr.c 2012-03-19 19:47:27.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/xattr.c 2012-02-24 03:55:06.000000000 +0100 @@ -19,6 +19,7 @@ #include #include @@ -7243,9 +7243,9 @@ diff -NurpP --minimal linux-3.3/fs/xattr.c linux-3.3-vs2.3.3.1/fs/xattr.c return (mask & MAY_WRITE) ? -EPERM : -ENODATA; return 0; } -diff -NurpP --minimal linux-3.3/fs/xfs/xfs_dinode.h linux-3.3-vs2.3.3.1/fs/xfs/xfs_dinode.h ---- linux-3.3/fs/xfs/xfs_dinode.h 2011-10-24 18:45:31.000000000 +0200 -+++ linux-3.3-vs2.3.3.1/fs/xfs/xfs_dinode.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/xfs/xfs_dinode.h linux-3.3.1-vs2.3.3.2/fs/xfs/xfs_dinode.h +--- linux-3.3.1/fs/xfs/xfs_dinode.h 2011-10-24 18:45:31.000000000 +0200 ++++ linux-3.3.1-vs2.3.3.2/fs/xfs/xfs_dinode.h 2012-02-24 03:55:06.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 */ @@ -7286,9 +7286,9 @@ diff -NurpP --minimal linux-3.3/fs/xfs/xfs_dinode.h linux-3.3-vs2.3.3.1/fs/xfs/x +#define XFS_DIVFLAG_COW 0x02 #endif /* __XFS_DINODE_H__ */ -diff -NurpP --minimal linux-3.3/fs/xfs/xfs_fs.h linux-3.3-vs2.3.3.1/fs/xfs/xfs_fs.h ---- linux-3.3/fs/xfs/xfs_fs.h 2011-10-24 18:45:31.000000000 +0200 -+++ linux-3.3-vs2.3.3.1/fs/xfs/xfs_fs.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/xfs/xfs_fs.h linux-3.3.1-vs2.3.3.2/fs/xfs/xfs_fs.h +--- linux-3.3.1/fs/xfs/xfs_fs.h 2011-10-24 18:45:31.000000000 +0200 ++++ linux-3.3.1-vs2.3.3.2/fs/xfs/xfs_fs.h 2012-02-24 03:55:06.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 */ @@ -7309,9 +7309,9 @@ diff -NurpP --minimal linux-3.3/fs/xfs/xfs_fs.h linux-3.3-vs2.3.3.1/fs/xfs/xfs_f __u32 bs_dmevmask; /* DMIG event mask */ __u16 bs_dmstate; /* DMIG state info */ __u16 bs_aextents; /* attribute number of extents */ -diff -NurpP --minimal linux-3.3/fs/xfs/xfs_ialloc.c linux-3.3-vs2.3.3.1/fs/xfs/xfs_ialloc.c ---- linux-3.3/fs/xfs/xfs_ialloc.c 2012-03-19 19:47:27.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/xfs/xfs_ialloc.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/xfs/xfs_ialloc.c linux-3.3.1-vs2.3.3.2/fs/xfs/xfs_ialloc.c +--- linux-3.3.1/fs/xfs/xfs_ialloc.c 2012-03-19 19:47:27.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/xfs/xfs_ialloc.c 2012-02-24 03:55:06.000000000 +0100 @@ -37,7 +37,6 @@ #include "xfs_error.h" #include "xfs_bmap.h" @@ -7320,9 +7320,9 @@ diff -NurpP --minimal linux-3.3/fs/xfs/xfs_ialloc.c linux-3.3-vs2.3.3.1/fs/xfs/x /* * Allocation group level functions. */ -diff -NurpP --minimal linux-3.3/fs/xfs/xfs_inode.c linux-3.3-vs2.3.3.1/fs/xfs/xfs_inode.c ---- linux-3.3/fs/xfs/xfs_inode.c 2012-03-19 19:47:27.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/xfs/xfs_inode.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/xfs/xfs_inode.c linux-3.3.1-vs2.3.3.2/fs/xfs/xfs_inode.c +--- linux-3.3.1/fs/xfs/xfs_inode.c 2012-03-19 19:47:27.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/xfs/xfs_inode.c 2012-02-24 03:55:06.000000000 +0100 @@ -236,6 +236,7 @@ xfs_inotobp( return 0; } @@ -7497,9 +7497,9 @@ diff -NurpP --minimal linux-3.3/fs/xfs/xfs_inode.c linux-3.3-vs2.3.3.1/fs/xfs/xf /* Wrap, we never let the log put out DI_MAX_FLUSH */ if (ip->i_d.di_flushiter == DI_MAX_FLUSH) -diff -NurpP --minimal linux-3.3/fs/xfs/xfs_inode.h linux-3.3-vs2.3.3.1/fs/xfs/xfs_inode.h ---- linux-3.3/fs/xfs/xfs_inode.h 2012-03-19 19:47:27.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/xfs/xfs_inode.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/xfs/xfs_inode.h linux-3.3.1-vs2.3.3.2/fs/xfs/xfs_inode.h +--- linux-3.3.1/fs/xfs/xfs_inode.h 2012-03-19 19:47:27.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/xfs/xfs_inode.h 2012-02-24 03:55:06.000000000 +0100 @@ -134,7 +134,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 */ @@ -7520,9 +7520,9 @@ diff -NurpP --minimal linux-3.3/fs/xfs/xfs_inode.h linux-3.3-vs2.3.3.1/fs/xfs/xf 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-3.3/fs/xfs/xfs_ioctl.c linux-3.3-vs2.3.3.1/fs/xfs/xfs_ioctl.c ---- linux-3.3/fs/xfs/xfs_ioctl.c 2012-03-19 19:47:27.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/xfs/xfs_ioctl.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/xfs/xfs_ioctl.c linux-3.3.1-vs2.3.3.2/fs/xfs/xfs_ioctl.c +--- linux-3.3.1/fs/xfs/xfs_ioctl.c 2012-03-19 19:47:27.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/xfs/xfs_ioctl.c 2012-02-24 03:55:06.000000000 +0100 @@ -28,7 +28,7 @@ #include "xfs_bmap_btree.h" #include "xfs_dinode.h" @@ -7591,9 +7591,9 @@ diff -NurpP --minimal linux-3.3/fs/xfs/xfs_ioctl.c linux-3.3-vs2.3.3.1/fs/xfs/xf return xfs_ioc_setxflags(ip, filp, arg); case XFS_IOC_FSSETDM: { -diff -NurpP --minimal linux-3.3/fs/xfs/xfs_ioctl.h linux-3.3-vs2.3.3.1/fs/xfs/xfs_ioctl.h ---- linux-3.3/fs/xfs/xfs_ioctl.h 2011-10-24 18:45:31.000000000 +0200 -+++ linux-3.3-vs2.3.3.1/fs/xfs/xfs_ioctl.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/xfs/xfs_ioctl.h linux-3.3.1-vs2.3.3.2/fs/xfs/xfs_ioctl.h +--- linux-3.3.1/fs/xfs/xfs_ioctl.h 2011-10-24 18:45:31.000000000 +0200 ++++ linux-3.3.1-vs2.3.3.2/fs/xfs/xfs_ioctl.h 2012-02-24 03:55:06.000000000 +0100 @@ -70,6 +70,12 @@ xfs_handle_to_dentry( void __user *uhandle, u32 hlen); @@ -7607,9 +7607,9 @@ diff -NurpP --minimal linux-3.3/fs/xfs/xfs_ioctl.h linux-3.3-vs2.3.3.1/fs/xfs/xf extern long xfs_file_ioctl( struct file *filp, -diff -NurpP --minimal linux-3.3/fs/xfs/xfs_iops.c linux-3.3-vs2.3.3.1/fs/xfs/xfs_iops.c ---- linux-3.3/fs/xfs/xfs_iops.c 2012-03-19 19:47:27.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/xfs/xfs_iops.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/xfs/xfs_iops.c linux-3.3.1-vs2.3.3.2/fs/xfs/xfs_iops.c +--- linux-3.3.1/fs/xfs/xfs_iops.c 2012-03-19 19:47:27.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/xfs/xfs_iops.c 2012-02-24 03:55:06.000000000 +0100 @@ -30,6 +30,7 @@ #include "xfs_bmap_btree.h" #include "xfs_dinode.h" @@ -7685,9 +7685,9 @@ diff -NurpP --minimal linux-3.3/fs/xfs/xfs_iops.c linux-3.3-vs2.3.3.1/fs/xfs/xfs switch (inode->i_mode & S_IFMT) { case S_IFBLK: -diff -NurpP --minimal linux-3.3/fs/xfs/xfs_itable.c linux-3.3-vs2.3.3.1/fs/xfs/xfs_itable.c ---- linux-3.3/fs/xfs/xfs_itable.c 2011-05-22 16:17:54.000000000 +0200 -+++ linux-3.3-vs2.3.3.1/fs/xfs/xfs_itable.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/xfs/xfs_itable.c linux-3.3.1-vs2.3.3.2/fs/xfs/xfs_itable.c +--- linux-3.3.1/fs/xfs/xfs_itable.c 2011-05-22 16:17:54.000000000 +0200 ++++ linux-3.3.1-vs2.3.3.2/fs/xfs/xfs_itable.c 2012-02-24 03:55:06.000000000 +0100 @@ -98,6 +98,7 @@ xfs_bulkstat_one_int( buf->bs_mode = dic->di_mode; buf->bs_uid = dic->di_uid; @@ -7696,9 +7696,9 @@ diff -NurpP --minimal linux-3.3/fs/xfs/xfs_itable.c linux-3.3-vs2.3.3.1/fs/xfs/x buf->bs_size = dic->di_size; /* -diff -NurpP --minimal linux-3.3/fs/xfs/xfs_linux.h linux-3.3-vs2.3.3.1/fs/xfs/xfs_linux.h ---- linux-3.3/fs/xfs/xfs_linux.h 2011-10-24 18:45:31.000000000 +0200 -+++ linux-3.3-vs2.3.3.1/fs/xfs/xfs_linux.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/xfs/xfs_linux.h linux-3.3.1-vs2.3.3.2/fs/xfs/xfs_linux.h +--- linux-3.3.1/fs/xfs/xfs_linux.h 2011-10-24 18:45:31.000000000 +0200 ++++ linux-3.3.1-vs2.3.3.2/fs/xfs/xfs_linux.h 2012-02-24 03:55:06.000000000 +0100 @@ -121,6 +121,7 @@ #define current_cpu() (raw_smp_processor_id()) @@ -7707,9 +7707,9 @@ diff -NurpP --minimal linux-3.3/fs/xfs/xfs_linux.h linux-3.3-vs2.3.3.1/fs/xfs/xf #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-3.3/fs/xfs/xfs_log_recover.c linux-3.3-vs2.3.3.1/fs/xfs/xfs_log_recover.c ---- linux-3.3/fs/xfs/xfs_log_recover.c 2012-03-19 19:47:27.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/xfs/xfs_log_recover.c 2012-03-19 20:52:10.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/xfs/xfs_log_recover.c linux-3.3.1-vs2.3.3.2/fs/xfs/xfs_log_recover.c +--- linux-3.3.1/fs/xfs/xfs_log_recover.c 2012-04-03 03:01:26.000000000 +0200 ++++ linux-3.3.1-vs2.3.3.2/fs/xfs/xfs_log_recover.c 2012-04-03 03:02:12.000000000 +0200 @@ -2344,7 +2344,8 @@ xlog_recover_inode_pass2( } @@ -7720,9 +7720,9 @@ diff -NurpP --minimal linux-3.3/fs/xfs/xfs_log_recover.c linux-3.3-vs2.3.3.1/fs/ /* the rest is in on-disk format */ if (item->ri_buf[1].i_len > sizeof(struct xfs_icdinode)) { -diff -NurpP --minimal linux-3.3/fs/xfs/xfs_mount.h linux-3.3-vs2.3.3.1/fs/xfs/xfs_mount.h ---- linux-3.3/fs/xfs/xfs_mount.h 2012-03-19 19:47:27.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/xfs/xfs_mount.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/xfs/xfs_mount.h linux-3.3.1-vs2.3.3.2/fs/xfs/xfs_mount.h +--- linux-3.3.1/fs/xfs/xfs_mount.h 2012-03-19 19:47:27.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/xfs/xfs_mount.h 2012-02-24 03:55:06.000000000 +0100 @@ -248,6 +248,7 @@ typedef struct xfs_mount { allocator */ #define XFS_MOUNT_NOATTR2 (1ULL << 25) /* disable use of attr2 format */ @@ -7731,9 +7731,9 @@ diff -NurpP --minimal linux-3.3/fs/xfs/xfs_mount.h linux-3.3-vs2.3.3.1/fs/xfs/xf /* * Default minimum read and write sizes. -diff -NurpP --minimal linux-3.3/fs/xfs/xfs_super.c linux-3.3-vs2.3.3.1/fs/xfs/xfs_super.c ---- linux-3.3/fs/xfs/xfs_super.c 2012-03-19 19:47:27.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/xfs/xfs_super.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/xfs/xfs_super.c linux-3.3.1-vs2.3.3.2/fs/xfs/xfs_super.c +--- linux-3.3.1/fs/xfs/xfs_super.c 2012-03-19 19:47:27.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/xfs/xfs_super.c 2012-02-24 03:55:06.000000000 +0100 @@ -113,6 +113,9 @@ mempool_t *xfs_ioend_pool; #define MNTOPT_NODELAYLOG "nodelaylog" /* Delayed logging disabled */ #define MNTOPT_DISCARD "discard" /* Discard unused blocks */ @@ -7806,9 +7806,9 @@ diff -NurpP --minimal linux-3.3/fs/xfs/xfs_super.c linux-3.3-vs2.3.3.1/fs/xfs/xf /* * we must configure the block size in the superblock before we run the * full mount process as the mount process can lookup and cache inodes. -diff -NurpP --minimal linux-3.3/fs/xfs/xfs_vnodeops.c linux-3.3-vs2.3.3.1/fs/xfs/xfs_vnodeops.c ---- linux-3.3/fs/xfs/xfs_vnodeops.c 2012-03-19 19:47:27.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/fs/xfs/xfs_vnodeops.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/fs/xfs/xfs_vnodeops.c linux-3.3.1-vs2.3.3.2/fs/xfs/xfs_vnodeops.c +--- linux-3.3.1/fs/xfs/xfs_vnodeops.c 2012-03-19 19:47:27.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/fs/xfs/xfs_vnodeops.c 2012-04-01 18:12:15.000000000 +0200 @@ -106,6 +106,77 @@ xfs_readlink_bmap( return error; } @@ -7859,7 +7859,7 @@ diff -NurpP --minimal linux-3.3/fs/xfs/xfs_vnodeops.c linux-3.3-vs2.3.3.1/fs/xfs + goto error_out; + + xfs_ilock(ip, XFS_ILOCK_EXCL); -+ xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL); ++ xfs_trans_ijoin(tp, ip, 0); + + inode->i_flags = flags; + inode->i_vflags = vflags; @@ -7887,9 +7887,9 @@ diff -NurpP --minimal linux-3.3/fs/xfs/xfs_vnodeops.c linux-3.3-vs2.3.3.1/fs/xfs int xfs_readlink( xfs_inode_t *ip, -diff -NurpP --minimal linux-3.3/include/linux/Kbuild linux-3.3-vs2.3.3.1/include/linux/Kbuild ---- linux-3.3/include/linux/Kbuild 2012-03-19 19:47:27.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/Kbuild 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/Kbuild linux-3.3.1-vs2.3.3.2/include/linux/Kbuild +--- linux-3.3.1/include/linux/Kbuild 2012-03-19 19:47:27.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/Kbuild 2012-02-24 03:55:06.000000000 +0100 @@ -17,6 +17,7 @@ header-y += netfilter_bridge/ header-y += netfilter_ipv4/ header-y += netfilter_ipv6/ @@ -7898,9 +7898,9 @@ diff -NurpP --minimal linux-3.3/include/linux/Kbuild linux-3.3-vs2.3.3.1/include header-y += wimax/ objhdr-y += version.h -diff -NurpP --minimal linux-3.3/include/linux/capability.h linux-3.3-vs2.3.3.1/include/linux/capability.h ---- linux-3.3/include/linux/capability.h 2012-03-19 19:47:27.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/capability.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/capability.h linux-3.3.1-vs2.3.3.2/include/linux/capability.h +--- linux-3.3.1/include/linux/capability.h 2012-03-19 19:47:27.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/capability.h 2012-02-24 03:55:06.000000000 +0100 @@ -280,6 +280,7 @@ struct cpu_vfs_cap_data { arbitrary SCSI commands */ /* Allow setting encryption key on loopback filesystem */ @@ -7923,9 +7923,9 @@ diff -NurpP --minimal linux-3.3/include/linux/capability.h linux-3.3-vs2.3.3.1/i /* * Bit location of each capability (used by user-space library and kernel) -diff -NurpP --minimal linux-3.3/include/linux/cred.h linux-3.3-vs2.3.3.1/include/linux/cred.h ---- linux-3.3/include/linux/cred.h 2012-03-19 19:47:27.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/cred.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/cred.h linux-3.3.1-vs2.3.3.2/include/linux/cred.h +--- linux-3.3.1/include/linux/cred.h 2012-03-19 19:47:27.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/cred.h 2012-02-24 03:55:06.000000000 +0100 @@ -156,6 +156,7 @@ extern void exit_creds(struct task_struc extern int copy_creds(struct task_struct *, unsigned long); extern const struct cred *get_task_cred(struct task_struct *); @@ -7966,18 +7966,18 @@ diff -NurpP --minimal linux-3.3/include/linux/cred.h linux-3.3-vs2.3.3.1/include /** * get_new_cred - Get a reference on a new set of credentials * @cred: The new credentials to reference -diff -NurpP --minimal linux-3.3/include/linux/devpts_fs.h linux-3.3-vs2.3.3.1/include/linux/devpts_fs.h ---- linux-3.3/include/linux/devpts_fs.h 2008-12-25 00:26:37.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/devpts_fs.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/devpts_fs.h linux-3.3.1-vs2.3.3.2/include/linux/devpts_fs.h +--- linux-3.3.1/include/linux/devpts_fs.h 2008-12-25 00:26:37.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/devpts_fs.h 2012-02-24 03:55:06.000000000 +0100 @@ -45,5 +45,4 @@ static inline void devpts_pty_kill(struc #endif - #endif /* _LINUX_DEVPTS_FS_H */ -diff -NurpP --minimal linux-3.3/include/linux/ext2_fs.h linux-3.3-vs2.3.3.1/include/linux/ext2_fs.h ---- linux-3.3/include/linux/ext2_fs.h 2012-01-09 16:14:56.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/ext2_fs.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/ext2_fs.h linux-3.3.1-vs2.3.3.2/include/linux/ext2_fs.h +--- linux-3.3.1/include/linux/ext2_fs.h 2012-01-09 16:14:56.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/ext2_fs.h 2012-02-24 03:55:06.000000000 +0100 @@ -190,8 +190,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) */ @@ -8017,9 +8017,9 @@ diff -NurpP --minimal linux-3.3/include/linux/ext2_fs.h linux-3.3-vs2.3.3.1/incl #define clear_opt(o, opt) o &= ~EXT2_MOUNT_##opt -diff -NurpP --minimal linux-3.3/include/linux/ext3_fs.h linux-3.3-vs2.3.3.1/include/linux/ext3_fs.h ---- linux-3.3/include/linux/ext3_fs.h 2012-03-19 19:47:27.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/ext3_fs.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/ext3_fs.h linux-3.3.1-vs2.3.3.2/include/linux/ext3_fs.h +--- linux-3.3.1/include/linux/ext3_fs.h 2012-03-19 19:47:27.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/ext3_fs.h 2012-02-24 03:55:06.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) */ @@ -8071,9 +8071,9 @@ diff -NurpP --minimal linux-3.3/include/linux/ext3_fs.h linux-3.3-vs2.3.3.1/incl /* ioctl.c */ extern long ext3_ioctl(struct file *, unsigned int, unsigned long); -diff -NurpP --minimal linux-3.3/include/linux/fs.h linux-3.3-vs2.3.3.1/include/linux/fs.h ---- linux-3.3/include/linux/fs.h 2012-03-19 19:47:27.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/fs.h 2012-03-19 20:52:10.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/fs.h linux-3.3.1-vs2.3.3.2/include/linux/fs.h +--- linux-3.3.1/include/linux/fs.h 2012-03-19 19:47:27.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/fs.h 2012-03-19 20:52:10.000000000 +0100 @@ -210,6 +210,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 */ @@ -8251,9 +8251,9 @@ diff -NurpP --minimal linux-3.3/include/linux/fs.h linux-3.3-vs2.3.3.1/include/l 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-3.3/include/linux/gfs2_ondisk.h linux-3.3-vs2.3.3.1/include/linux/gfs2_ondisk.h ---- linux-3.3/include/linux/gfs2_ondisk.h 2012-03-19 19:47:28.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/gfs2_ondisk.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/gfs2_ondisk.h linux-3.3.1-vs2.3.3.2/include/linux/gfs2_ondisk.h +--- linux-3.3.1/include/linux/gfs2_ondisk.h 2012-03-19 19:47:28.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/gfs2_ondisk.h 2012-02-24 03:55:06.000000000 +0100 @@ -213,6 +213,9 @@ enum { gfs2fl_NoAtime = 7, gfs2fl_Sync = 8, @@ -8274,9 +8274,9 @@ diff -NurpP --minimal linux-3.3/include/linux/gfs2_ondisk.h linux-3.3-vs2.3.3.1/ #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-3.3/include/linux/if_tun.h linux-3.3-vs2.3.3.1/include/linux/if_tun.h ---- linux-3.3/include/linux/if_tun.h 2010-08-02 16:52:54.000000000 +0200 -+++ linux-3.3-vs2.3.3.1/include/linux/if_tun.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/if_tun.h linux-3.3.1-vs2.3.3.2/include/linux/if_tun.h +--- linux-3.3.1/include/linux/if_tun.h 2010-08-02 16:52:54.000000000 +0200 ++++ linux-3.3.1-vs2.3.3.2/include/linux/if_tun.h 2012-02-24 03:55:06.000000000 +0100 @@ -53,6 +53,7 @@ #define TUNDETACHFILTER _IOW('T', 214, struct sock_fprog) #define TUNGETVNETHDRSZ _IOR('T', 215, int) @@ -8285,9 +8285,9 @@ diff -NurpP --minimal linux-3.3/include/linux/if_tun.h linux-3.3-vs2.3.3.1/inclu /* TUNSETIFF ifr flags */ #define IFF_TUN 0x0001 -diff -NurpP --minimal linux-3.3/include/linux/init_task.h linux-3.3-vs2.3.3.1/include/linux/init_task.h ---- linux-3.3/include/linux/init_task.h 2012-03-19 19:47:28.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/init_task.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/init_task.h linux-3.3.1-vs2.3.3.2/include/linux/init_task.h +--- linux-3.3.1/include/linux/init_task.h 2012-03-19 19:47:28.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/init_task.h 2012-02-24 03:55:06.000000000 +0100 @@ -192,6 +192,10 @@ extern struct cred init_cred; INIT_FTRACE_GRAPH \ INIT_TRACE_RECURSION \ @@ -8299,9 +8299,9 @@ diff -NurpP --minimal linux-3.3/include/linux/init_task.h linux-3.3-vs2.3.3.1/in } -diff -NurpP --minimal linux-3.3/include/linux/ipc.h linux-3.3-vs2.3.3.1/include/linux/ipc.h ---- linux-3.3/include/linux/ipc.h 2012-03-19 19:47:28.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/ipc.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/ipc.h linux-3.3.1-vs2.3.3.2/include/linux/ipc.h +--- linux-3.3.1/include/linux/ipc.h 2012-03-19 19:47:28.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/ipc.h 2012-02-24 03:55:06.000000000 +0100 @@ -91,6 +91,7 @@ struct kern_ipc_perm key_t key; uid_t uid; @@ -8310,9 +8310,9 @@ diff -NurpP --minimal linux-3.3/include/linux/ipc.h linux-3.3-vs2.3.3.1/include/ uid_t cuid; gid_t cgid; umode_t mode; -diff -NurpP --minimal linux-3.3/include/linux/ipc_namespace.h linux-3.3-vs2.3.3.1/include/linux/ipc_namespace.h ---- linux-3.3/include/linux/ipc_namespace.h 2011-10-24 18:45:32.000000000 +0200 -+++ linux-3.3-vs2.3.3.1/include/linux/ipc_namespace.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/ipc_namespace.h linux-3.3.1-vs2.3.3.2/include/linux/ipc_namespace.h +--- linux-3.3.1/include/linux/ipc_namespace.h 2011-10-24 18:45:32.000000000 +0200 ++++ linux-3.3.1-vs2.3.3.2/include/linux/ipc_namespace.h 2012-02-24 03:55:06.000000000 +0100 @@ -101,7 +101,8 @@ static inline int mq_init_ns(struct ipc_ #if defined(CONFIG_IPC_NS) @@ -8339,9 +8339,9 @@ diff -NurpP --minimal linux-3.3/include/linux/ipc_namespace.h linux-3.3-vs2.3.3. } static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns) -diff -NurpP --minimal linux-3.3/include/linux/loop.h linux-3.3-vs2.3.3.1/include/linux/loop.h ---- linux-3.3/include/linux/loop.h 2012-01-09 16:14:58.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/loop.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/loop.h linux-3.3.1-vs2.3.3.2/include/linux/loop.h +--- linux-3.3.1/include/linux/loop.h 2012-01-09 16:14:58.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/loop.h 2012-02-24 03:55:06.000000000 +0100 @@ -45,6 +45,7 @@ struct loop_device { struct loop_func_table *lo_encryption; __u32 lo_init[2]; @@ -8350,9 +8350,9 @@ diff -NurpP --minimal linux-3.3/include/linux/loop.h linux-3.3-vs2.3.3.1/include int (*ioctl)(struct loop_device *, int cmd, unsigned long arg); -diff -NurpP --minimal linux-3.3/include/linux/magic.h linux-3.3-vs2.3.3.1/include/linux/magic.h ---- linux-3.3/include/linux/magic.h 2012-01-09 16:14:58.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/magic.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/magic.h linux-3.3.1-vs2.3.3.2/include/linux/magic.h +--- linux-3.3.1/include/linux/magic.h 2012-01-09 16:14:58.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/magic.h 2012-02-24 03:55:06.000000000 +0100 @@ -3,7 +3,7 @@ #define ADFS_SUPER_MAGIC 0xadf5 @@ -8370,9 +8370,9 @@ diff -NurpP --minimal linux-3.3/include/linux/magic.h linux-3.3-vs2.3.3.1/includ #define QNX4_SUPER_MAGIC 0x002f /* qnx4 fs detection */ #define REISERFS_SUPER_MAGIC 0x52654973 /* used by gcc */ -diff -NurpP --minimal linux-3.3/include/linux/major.h linux-3.3-vs2.3.3.1/include/linux/major.h ---- linux-3.3/include/linux/major.h 2009-09-10 15:26:25.000000000 +0200 -+++ linux-3.3-vs2.3.3.1/include/linux/major.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/major.h linux-3.3.1-vs2.3.3.2/include/linux/major.h +--- linux-3.3.1/include/linux/major.h 2009-09-10 15:26:25.000000000 +0200 ++++ linux-3.3.1-vs2.3.3.2/include/linux/major.h 2012-02-24 03:55:06.000000000 +0100 @@ -15,6 +15,7 @@ #define HD_MAJOR IDE0_MAJOR #define PTY_SLAVE_MAJOR 3 @@ -8381,9 +8381,9 @@ diff -NurpP --minimal linux-3.3/include/linux/major.h linux-3.3-vs2.3.3.1/includ #define TTYAUX_MAJOR 5 #define LP_MAJOR 6 #define VCS_MAJOR 7 -diff -NurpP --minimal linux-3.3/include/linux/memcontrol.h linux-3.3-vs2.3.3.1/include/linux/memcontrol.h ---- linux-3.3/include/linux/memcontrol.h 2012-03-19 19:47:28.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/memcontrol.h 2012-03-19 20:52:10.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/memcontrol.h linux-3.3.1-vs2.3.3.2/include/linux/memcontrol.h +--- linux-3.3.1/include/linux/memcontrol.h 2012-03-19 19:47:28.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/memcontrol.h 2012-03-19 20:52:10.000000000 +0100 @@ -87,6 +87,13 @@ extern struct mem_cgroup *try_get_mem_cg extern struct mem_cgroup *parent_mem_cgroup(struct mem_cgroup *memcg); extern struct mem_cgroup *mem_cgroup_from_cont(struct cgroup *cont); @@ -8398,9 +8398,9 @@ diff -NurpP --minimal linux-3.3/include/linux/memcontrol.h linux-3.3-vs2.3.3.1/i static inline int mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *cgroup) { -diff -NurpP --minimal linux-3.3/include/linux/mm_types.h linux-3.3-vs2.3.3.1/include/linux/mm_types.h ---- linux-3.3/include/linux/mm_types.h 2012-03-19 19:47:28.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/mm_types.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/mm_types.h linux-3.3.1-vs2.3.3.2/include/linux/mm_types.h +--- linux-3.3.1/include/linux/mm_types.h 2012-03-19 19:47:28.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/mm_types.h 2012-02-24 03:55:06.000000000 +0100 @@ -343,6 +343,7 @@ struct mm_struct { /* Architecture-specific MM context */ @@ -8409,9 +8409,9 @@ diff -NurpP --minimal linux-3.3/include/linux/mm_types.h linux-3.3-vs2.3.3.1/inc /* Swap token stuff */ /* -diff -NurpP --minimal linux-3.3/include/linux/mmzone.h linux-3.3-vs2.3.3.1/include/linux/mmzone.h ---- linux-3.3/include/linux/mmzone.h 2012-03-19 19:47:28.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/mmzone.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/mmzone.h linux-3.3.1-vs2.3.3.2/include/linux/mmzone.h +--- linux-3.3.1/include/linux/mmzone.h 2012-03-19 19:47:28.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/mmzone.h 2012-02-24 03:55:06.000000000 +0100 @@ -683,6 +683,13 @@ typedef struct pglist_data { __pgdat->node_start_pfn + __pgdat->node_spanned_pages;\ }) @@ -8426,9 +8426,9 @@ diff -NurpP --minimal linux-3.3/include/linux/mmzone.h linux-3.3-vs2.3.3.1/inclu #include extern struct mutex zonelists_mutex; -diff -NurpP --minimal linux-3.3/include/linux/mount.h linux-3.3-vs2.3.3.1/include/linux/mount.h ---- linux-3.3/include/linux/mount.h 2012-03-19 19:47:28.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/mount.h 2012-02-24 17:29:28.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/mount.h linux-3.3.1-vs2.3.3.2/include/linux/mount.h +--- linux-3.3.1/include/linux/mount.h 2012-03-19 19:47:28.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/mount.h 2012-02-24 17:29:28.000000000 +0100 @@ -47,6 +47,9 @@ struct mnt_namespace; #define MNT_INTERNAL 0x4000 @@ -8439,9 +8439,9 @@ diff -NurpP --minimal linux-3.3/include/linux/mount.h linux-3.3-vs2.3.3.1/includ struct vfsmount { struct dentry *mnt_root; /* root of the mounted tree */ struct super_block *mnt_sb; /* pointer to superblock */ -diff -NurpP --minimal linux-3.3/include/linux/net.h linux-3.3-vs2.3.3.1/include/linux/net.h ---- linux-3.3/include/linux/net.h 2011-07-22 11:18:11.000000000 +0200 -+++ linux-3.3-vs2.3.3.1/include/linux/net.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/net.h linux-3.3.1-vs2.3.3.2/include/linux/net.h +--- linux-3.3.1/include/linux/net.h 2011-07-22 11:18:11.000000000 +0200 ++++ linux-3.3.1-vs2.3.3.2/include/linux/net.h 2012-02-24 03:55:06.000000000 +0100 @@ -72,6 +72,7 @@ struct net; #define SOCK_NOSPACE 2 #define SOCK_PASSCRED 3 @@ -8450,9 +8450,9 @@ diff -NurpP --minimal linux-3.3/include/linux/net.h linux-3.3-vs2.3.3.1/include/ #ifndef ARCH_HAS_SOCKET_TYPES /** -diff -NurpP --minimal linux-3.3/include/linux/netdevice.h linux-3.3-vs2.3.3.1/include/linux/netdevice.h ---- linux-3.3/include/linux/netdevice.h 2012-03-19 19:47:28.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/netdevice.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/netdevice.h linux-3.3.1-vs2.3.3.2/include/linux/netdevice.h +--- linux-3.3.1/include/linux/netdevice.h 2012-03-19 19:47:28.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/netdevice.h 2012-02-24 03:55:06.000000000 +0100 @@ -1627,6 +1627,7 @@ extern void netdev_resync_ops(struct ne extern struct net_device *dev_get_by_index(struct net *net, int ifindex); @@ -8461,9 +8461,9 @@ diff -NurpP --minimal linux-3.3/include/linux/netdevice.h linux-3.3-vs2.3.3.1/in extern struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex); extern int dev_restart(struct net_device *dev); #ifdef CONFIG_NETPOLL_TRAP -diff -NurpP --minimal linux-3.3/include/linux/nfs_mount.h linux-3.3-vs2.3.3.1/include/linux/nfs_mount.h ---- linux-3.3/include/linux/nfs_mount.h 2011-01-05 21:50:31.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/nfs_mount.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/nfs_mount.h linux-3.3.1-vs2.3.3.2/include/linux/nfs_mount.h +--- linux-3.3.1/include/linux/nfs_mount.h 2011-01-05 21:50:31.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/nfs_mount.h 2012-02-24 03:55:06.000000000 +0100 @@ -63,7 +63,8 @@ struct nfs_mount_data { #define NFS_MOUNT_SECFLAVOUR 0x2000 /* 5 */ #define NFS_MOUNT_NORDIRPLUS 0x4000 /* 5 */ @@ -8474,9 +8474,9 @@ diff -NurpP --minimal linux-3.3/include/linux/nfs_mount.h linux-3.3-vs2.3.3.1/in /* The following are for internal use only */ #define NFS_MOUNT_LOOKUP_CACHE_NONEG 0x10000 -diff -NurpP --minimal linux-3.3/include/linux/nsproxy.h linux-3.3-vs2.3.3.1/include/linux/nsproxy.h ---- linux-3.3/include/linux/nsproxy.h 2011-10-24 18:45:32.000000000 +0200 -+++ linux-3.3-vs2.3.3.1/include/linux/nsproxy.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/nsproxy.h linux-3.3.1-vs2.3.3.2/include/linux/nsproxy.h +--- linux-3.3.1/include/linux/nsproxy.h 2011-10-24 18:45:32.000000000 +0200 ++++ linux-3.3.1-vs2.3.3.2/include/linux/nsproxy.h 2012-02-24 03:55:06.000000000 +0100 @@ -3,6 +3,7 @@ #include @@ -8526,9 +8526,9 @@ diff -NurpP --minimal linux-3.3/include/linux/nsproxy.h linux-3.3-vs2.3.3.1/incl } #endif -diff -NurpP --minimal linux-3.3/include/linux/pid.h linux-3.3-vs2.3.3.1/include/linux/pid.h ---- linux-3.3/include/linux/pid.h 2011-07-22 11:18:11.000000000 +0200 -+++ linux-3.3-vs2.3.3.1/include/linux/pid.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/pid.h linux-3.3.1-vs2.3.3.2/include/linux/pid.h +--- linux-3.3.1/include/linux/pid.h 2011-07-22 11:18:11.000000000 +0200 ++++ linux-3.3.1-vs2.3.3.2/include/linux/pid.h 2012-02-24 03:55:06.000000000 +0100 @@ -8,7 +8,8 @@ enum pid_type PIDTYPE_PID, PIDTYPE_PGID, @@ -8547,9 +8547,9 @@ diff -NurpP --minimal linux-3.3/include/linux/pid.h linux-3.3-vs2.3.3.1/include/ pid_t pid_vnr(struct pid *pid); #define do_each_pid_task(pid, type, task) \ -diff -NurpP --minimal linux-3.3/include/linux/proc_fs.h linux-3.3-vs2.3.3.1/include/linux/proc_fs.h ---- linux-3.3/include/linux/proc_fs.h 2012-03-19 19:47:28.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/proc_fs.h 2012-02-24 04:17:21.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/proc_fs.h linux-3.3.1-vs2.3.3.2/include/linux/proc_fs.h +--- linux-3.3.1/include/linux/proc_fs.h 2012-03-19 19:47:28.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/proc_fs.h 2012-02-24 04:17:21.000000000 +0100 @@ -54,6 +54,7 @@ struct proc_dir_entry { nlink_t nlink; uid_t uid; @@ -8585,9 +8585,9 @@ diff -NurpP --minimal linux-3.3/include/linux/proc_fs.h linux-3.3-vs2.3.3.1/incl int fd; union proc_op op; struct proc_dir_entry *pde; -diff -NurpP --minimal linux-3.3/include/linux/quotaops.h linux-3.3-vs2.3.3.1/include/linux/quotaops.h ---- linux-3.3/include/linux/quotaops.h 2012-01-09 16:14:58.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/quotaops.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/quotaops.h linux-3.3.1-vs2.3.3.2/include/linux/quotaops.h +--- linux-3.3.1/include/linux/quotaops.h 2012-01-09 16:14:58.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/quotaops.h 2012-02-24 03:55:06.000000000 +0100 @@ -8,6 +8,7 @@ #define _LINUX_QUOTAOPS_ @@ -8629,9 +8629,9 @@ diff -NurpP --minimal linux-3.3/include/linux/quotaops.h linux-3.3-vs2.3.3.1/inc } static inline int dquot_claim_space_nodirty(struct inode *inode, qsize_t number) -diff -NurpP --minimal linux-3.3/include/linux/reboot.h linux-3.3-vs2.3.3.1/include/linux/reboot.h ---- linux-3.3/include/linux/reboot.h 2011-10-24 18:45:32.000000000 +0200 -+++ linux-3.3-vs2.3.3.1/include/linux/reboot.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/reboot.h linux-3.3.1-vs2.3.3.2/include/linux/reboot.h +--- linux-3.3.1/include/linux/reboot.h 2011-10-24 18:45:32.000000000 +0200 ++++ linux-3.3.1-vs2.3.3.2/include/linux/reboot.h 2012-02-24 03:55:06.000000000 +0100 @@ -33,6 +33,7 @@ #define LINUX_REBOOT_CMD_RESTART2 0xA1B2C3D4 #define LINUX_REBOOT_CMD_SW_SUSPEND 0xD000FCE2 @@ -8640,9 +8640,9 @@ diff -NurpP --minimal linux-3.3/include/linux/reboot.h linux-3.3-vs2.3.3.1/inclu #ifdef __KERNEL__ -diff -NurpP --minimal linux-3.3/include/linux/reiserfs_fs.h linux-3.3-vs2.3.3.1/include/linux/reiserfs_fs.h ---- linux-3.3/include/linux/reiserfs_fs.h 2012-03-19 19:47:28.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/reiserfs_fs.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/reiserfs_fs.h linux-3.3.1-vs2.3.3.2/include/linux/reiserfs_fs.h +--- linux-3.3.1/include/linux/reiserfs_fs.h 2012-03-19 19:47:28.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/reiserfs_fs.h 2012-02-24 03:55:06.000000000 +0100 @@ -976,6 +976,11 @@ struct stat_data_v1 { #define REISERFS_COMPR_FL FS_COMPR_FL #define REISERFS_NOTAIL_FL FS_NOTAIL_FL @@ -8673,9 +8673,9 @@ diff -NurpP --minimal linux-3.3/include/linux/reiserfs_fs.h linux-3.3-vs2.3.3.1/ int __reiserfs_write_begin(struct page *page, unsigned from, unsigned len); -diff -NurpP --minimal linux-3.3/include/linux/reiserfs_fs_sb.h linux-3.3-vs2.3.3.1/include/linux/reiserfs_fs_sb.h ---- linux-3.3/include/linux/reiserfs_fs_sb.h 2012-03-19 19:47:28.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/reiserfs_fs_sb.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/reiserfs_fs_sb.h linux-3.3.1-vs2.3.3.2/include/linux/reiserfs_fs_sb.h +--- linux-3.3.1/include/linux/reiserfs_fs_sb.h 2012-03-19 19:47:28.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/reiserfs_fs_sb.h 2012-02-24 03:55:06.000000000 +0100 @@ -477,6 +477,7 @@ enum reiserfs_mount_options { REISERFS_EXPOSE_PRIVROOT, REISERFS_BARRIER_NONE, @@ -8684,9 +8684,9 @@ diff -NurpP --minimal linux-3.3/include/linux/reiserfs_fs_sb.h linux-3.3-vs2.3.3 /* Actions on error */ REISERFS_ERROR_PANIC, -diff -NurpP --minimal linux-3.3/include/linux/sched.h linux-3.3-vs2.3.3.1/include/linux/sched.h ---- linux-3.3/include/linux/sched.h 2012-03-19 19:47:28.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/sched.h 2012-03-19 20:52:10.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/sched.h linux-3.3.1-vs2.3.3.2/include/linux/sched.h +--- linux-3.3.1/include/linux/sched.h 2012-03-19 19:47:28.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/sched.h 2012-03-19 20:52:10.000000000 +0100 @@ -1420,6 +1420,14 @@ struct task_struct { #endif seccomp_t seccomp; @@ -8733,9 +8733,9 @@ diff -NurpP --minimal linux-3.3/include/linux/sched.h linux-3.3-vs2.3.3.1/includ } -diff -NurpP --minimal linux-3.3/include/linux/shmem_fs.h linux-3.3-vs2.3.3.1/include/linux/shmem_fs.h ---- linux-3.3/include/linux/shmem_fs.h 2012-03-19 19:47:29.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/shmem_fs.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/shmem_fs.h linux-3.3.1-vs2.3.3.2/include/linux/shmem_fs.h +--- linux-3.3.1/include/linux/shmem_fs.h 2012-03-19 19:47:29.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/shmem_fs.h 2012-02-24 03:55:06.000000000 +0100 @@ -8,6 +8,9 @@ /* inode in-kernel data */ @@ -8746,9 +8746,9 @@ diff -NurpP --minimal linux-3.3/include/linux/shmem_fs.h linux-3.3-vs2.3.3.1/inc struct shmem_inode_info { spinlock_t lock; unsigned long flags; -diff -NurpP --minimal linux-3.3/include/linux/stat.h linux-3.3-vs2.3.3.1/include/linux/stat.h ---- linux-3.3/include/linux/stat.h 2008-12-25 00:26:37.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/stat.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/stat.h linux-3.3.1-vs2.3.3.2/include/linux/stat.h +--- linux-3.3.1/include/linux/stat.h 2008-12-25 00:26:37.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/stat.h 2012-02-24 03:55:06.000000000 +0100 @@ -66,6 +66,7 @@ struct kstat { unsigned int nlink; uid_t uid; @@ -8757,9 +8757,9 @@ diff -NurpP --minimal linux-3.3/include/linux/stat.h linux-3.3-vs2.3.3.1/include dev_t rdev; loff_t size; struct timespec atime; -diff -NurpP --minimal linux-3.3/include/linux/sunrpc/auth.h linux-3.3-vs2.3.3.1/include/linux/sunrpc/auth.h ---- linux-3.3/include/linux/sunrpc/auth.h 2012-03-19 19:47:29.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/sunrpc/auth.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/sunrpc/auth.h linux-3.3.1-vs2.3.3.2/include/linux/sunrpc/auth.h +--- linux-3.3.1/include/linux/sunrpc/auth.h 2012-03-19 19:47:29.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/sunrpc/auth.h 2012-02-24 03:55:06.000000000 +0100 @@ -25,6 +25,7 @@ struct auth_cred { uid_t uid; @@ -8768,9 +8768,9 @@ diff -NurpP --minimal linux-3.3/include/linux/sunrpc/auth.h linux-3.3-vs2.3.3.1/ struct group_info *group_info; const char *principal; unsigned char machine_cred : 1; -diff -NurpP --minimal linux-3.3/include/linux/sunrpc/clnt.h linux-3.3-vs2.3.3.1/include/linux/sunrpc/clnt.h ---- linux-3.3/include/linux/sunrpc/clnt.h 2012-03-19 19:47:29.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/sunrpc/clnt.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/sunrpc/clnt.h linux-3.3.1-vs2.3.3.2/include/linux/sunrpc/clnt.h +--- linux-3.3.1/include/linux/sunrpc/clnt.h 2012-03-19 19:47:29.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/sunrpc/clnt.h 2012-02-24 03:55:06.000000000 +0100 @@ -50,7 +50,8 @@ struct rpc_clnt { unsigned int cl_softrtry : 1,/* soft timeouts */ cl_discrtry : 1,/* disconnect before retry */ @@ -8781,9 +8781,9 @@ diff -NurpP --minimal linux-3.3/include/linux/sunrpc/clnt.h linux-3.3-vs2.3.3.1/ struct rpc_rtt * cl_rtt; /* RTO estimator data */ const struct rpc_timeout *cl_timeout; /* Timeout strategy */ -diff -NurpP --minimal linux-3.3/include/linux/sysctl.h linux-3.3-vs2.3.3.1/include/linux/sysctl.h ---- linux-3.3/include/linux/sysctl.h 2012-03-19 19:47:29.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/sysctl.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/sysctl.h linux-3.3.1-vs2.3.3.2/include/linux/sysctl.h +--- linux-3.3.1/include/linux/sysctl.h 2012-03-19 19:47:29.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/sysctl.h 2012-02-24 03:55:06.000000000 +0100 @@ -60,6 +60,7 @@ enum CTL_ABI=9, /* Binary emulation */ CTL_CPU=10, /* CPU stuff (speed scaling, etc) */ @@ -8800,9 +8800,9 @@ diff -NurpP --minimal linux-3.3/include/linux/sysctl.h linux-3.3-vs2.3.3.1/inclu KERN_SPARC_REBOOT=21, /* reboot command on Sparc */ KERN_CTLALTDEL=22, /* int: allow ctl-alt-del to reboot */ -diff -NurpP --minimal linux-3.3/include/linux/sysfs.h linux-3.3-vs2.3.3.1/include/linux/sysfs.h ---- linux-3.3/include/linux/sysfs.h 2012-03-19 19:47:29.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/sysfs.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/sysfs.h linux-3.3.1-vs2.3.3.2/include/linux/sysfs.h +--- linux-3.3.1/include/linux/sysfs.h 2012-03-19 19:47:29.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/sysfs.h 2012-02-24 03:55:06.000000000 +0100 @@ -19,6 +19,8 @@ #include #include @@ -8812,9 +8812,9 @@ diff -NurpP --minimal linux-3.3/include/linux/sysfs.h linux-3.3-vs2.3.3.1/includ struct kobject; struct module; enum kobj_ns_type; -diff -NurpP --minimal linux-3.3/include/linux/time.h linux-3.3-vs2.3.3.1/include/linux/time.h ---- linux-3.3/include/linux/time.h 2011-07-22 11:18:11.000000000 +0200 -+++ linux-3.3-vs2.3.3.1/include/linux/time.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/time.h linux-3.3.1-vs2.3.3.2/include/linux/time.h +--- linux-3.3.1/include/linux/time.h 2011-07-22 11:18:11.000000000 +0200 ++++ linux-3.3.1-vs2.3.3.2/include/linux/time.h 2012-02-24 03:55:06.000000000 +0100 @@ -256,6 +256,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; @@ -8825,9 +8825,9 @@ diff -NurpP --minimal linux-3.3/include/linux/time.h linux-3.3-vs2.3.3.1/include #endif /* __KERNEL__ */ #define NFDBITS __NFDBITS -diff -NurpP --minimal linux-3.3/include/linux/types.h linux-3.3-vs2.3.3.1/include/linux/types.h ---- linux-3.3/include/linux/types.h 2012-03-19 19:47:29.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/types.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/types.h linux-3.3.1-vs2.3.3.2/include/linux/types.h +--- linux-3.3.1/include/linux/types.h 2012-03-19 19:47:29.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/types.h 2012-02-24 03:55:06.000000000 +0100 @@ -41,6 +41,9 @@ typedef __kernel_uid32_t uid_t; typedef __kernel_gid32_t gid_t; typedef __kernel_uid16_t uid16_t; @@ -8838,9 +8838,9 @@ diff -NurpP --minimal linux-3.3/include/linux/types.h linux-3.3-vs2.3.3.1/includ typedef unsigned long uintptr_t; -diff -NurpP --minimal linux-3.3/include/linux/utsname.h linux-3.3-vs2.3.3.1/include/linux/utsname.h ---- linux-3.3/include/linux/utsname.h 2012-01-09 16:14:59.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/utsname.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/utsname.h linux-3.3.1-vs2.3.3.2/include/linux/utsname.h +--- linux-3.3.1/include/linux/utsname.h 2012-01-09 16:14:59.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/utsname.h 2012-02-24 03:55:06.000000000 +0100 @@ -62,7 +62,8 @@ static inline void get_uts_ns(struct uts } @@ -8867,9 +8867,9 @@ diff -NurpP --minimal linux-3.3/include/linux/utsname.h linux-3.3-vs2.3.3.1/incl } #endif -diff -NurpP --minimal linux-3.3/include/linux/vroot.h linux-3.3-vs2.3.3.1/include/linux/vroot.h ---- linux-3.3/include/linux/vroot.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/vroot.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/vroot.h linux-3.3.1-vs2.3.3.2/include/linux/vroot.h +--- linux-3.3.1/include/linux/vroot.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/vroot.h 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,51 @@ + +/* @@ -8922,9 +8922,9 @@ diff -NurpP --minimal linux-3.3/include/linux/vroot.h linux-3.3-vs2.3.3.1/includ +#define VROOT_CLR_DEV 0x5601 + +#endif /* _LINUX_VROOT_H */ -diff -NurpP --minimal linux-3.3/include/linux/vs_base.h linux-3.3-vs2.3.3.1/include/linux/vs_base.h ---- linux-3.3/include/linux/vs_base.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/vs_base.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/vs_base.h linux-3.3.1-vs2.3.3.2/include/linux/vs_base.h +--- linux-3.3.1/include/linux/vs_base.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/vs_base.h 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,10 @@ +#ifndef _VS_BASE_H +#define _VS_BASE_H @@ -8936,9 +8936,9 @@ diff -NurpP --minimal linux-3.3/include/linux/vs_base.h linux-3.3-vs2.3.3.1/incl +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.3/include/linux/vs_context.h linux-3.3-vs2.3.3.1/include/linux/vs_context.h ---- linux-3.3/include/linux/vs_context.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/vs_context.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/vs_context.h linux-3.3.1-vs2.3.3.2/include/linux/vs_context.h +--- linux-3.3.1/include/linux/vs_context.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/vs_context.h 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,242 @@ +#ifndef _VS_CONTEXT_H +#define _VS_CONTEXT_H @@ -9182,9 +9182,9 @@ diff -NurpP --minimal linux-3.3/include/linux/vs_context.h linux-3.3-vs2.3.3.1/i +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.3/include/linux/vs_cowbl.h linux-3.3-vs2.3.3.1/include/linux/vs_cowbl.h ---- linux-3.3/include/linux/vs_cowbl.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/vs_cowbl.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/vs_cowbl.h linux-3.3.1-vs2.3.3.2/include/linux/vs_cowbl.h +--- linux-3.3.1/include/linux/vs_cowbl.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/vs_cowbl.h 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,48 @@ +#ifndef _VS_COWBL_H +#define _VS_COWBL_H @@ -9234,9 +9234,9 @@ diff -NurpP --minimal linux-3.3/include/linux/vs_cowbl.h linux-3.3-vs2.3.3.1/inc +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.3/include/linux/vs_cvirt.h linux-3.3-vs2.3.3.1/include/linux/vs_cvirt.h ---- linux-3.3/include/linux/vs_cvirt.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/vs_cvirt.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/vs_cvirt.h linux-3.3.1-vs2.3.3.2/include/linux/vs_cvirt.h +--- linux-3.3.1/include/linux/vs_cvirt.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/vs_cvirt.h 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,50 @@ +#ifndef _VS_CVIRT_H +#define _VS_CVIRT_H @@ -9288,9 +9288,9 @@ diff -NurpP --minimal linux-3.3/include/linux/vs_cvirt.h linux-3.3-vs2.3.3.1/inc +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.3/include/linux/vs_device.h linux-3.3-vs2.3.3.1/include/linux/vs_device.h ---- linux-3.3/include/linux/vs_device.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/vs_device.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/vs_device.h linux-3.3.1-vs2.3.3.2/include/linux/vs_device.h +--- linux-3.3.1/include/linux/vs_device.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/vs_device.h 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,45 @@ +#ifndef _VS_DEVICE_H +#define _VS_DEVICE_H @@ -9337,9 +9337,9 @@ diff -NurpP --minimal linux-3.3/include/linux/vs_device.h linux-3.3-vs2.3.3.1/in +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.3/include/linux/vs_dlimit.h linux-3.3-vs2.3.3.1/include/linux/vs_dlimit.h ---- linux-3.3/include/linux/vs_dlimit.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/vs_dlimit.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/vs_dlimit.h linux-3.3.1-vs2.3.3.2/include/linux/vs_dlimit.h +--- linux-3.3.1/include/linux/vs_dlimit.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/vs_dlimit.h 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,215 @@ +#ifndef _VS_DLIMIT_H +#define _VS_DLIMIT_H @@ -9556,9 +9556,9 @@ diff -NurpP --minimal linux-3.3/include/linux/vs_dlimit.h linux-3.3-vs2.3.3.1/in +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.3/include/linux/vs_inet.h linux-3.3-vs2.3.3.1/include/linux/vs_inet.h ---- linux-3.3/include/linux/vs_inet.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/vs_inet.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/vs_inet.h linux-3.3.1-vs2.3.3.2/include/linux/vs_inet.h +--- linux-3.3.1/include/linux/vs_inet.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/vs_inet.h 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,353 @@ +#ifndef _VS_INET_H +#define _VS_INET_H @@ -9913,9 +9913,9 @@ diff -NurpP --minimal linux-3.3/include/linux/vs_inet.h linux-3.3-vs2.3.3.1/incl +#else +// #warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.3/include/linux/vs_inet6.h linux-3.3-vs2.3.3.1/include/linux/vs_inet6.h ---- linux-3.3/include/linux/vs_inet6.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/vs_inet6.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/vs_inet6.h linux-3.3.1-vs2.3.3.2/include/linux/vs_inet6.h +--- linux-3.3.1/include/linux/vs_inet6.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/vs_inet6.h 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,246 @@ +#ifndef _VS_INET6_H +#define _VS_INET6_H @@ -10163,9 +10163,9 @@ diff -NurpP --minimal linux-3.3/include/linux/vs_inet6.h linux-3.3-vs2.3.3.1/inc +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.3/include/linux/vs_limit.h linux-3.3-vs2.3.3.1/include/linux/vs_limit.h ---- linux-3.3/include/linux/vs_limit.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/vs_limit.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/vs_limit.h linux-3.3.1-vs2.3.3.2/include/linux/vs_limit.h +--- linux-3.3.1/include/linux/vs_limit.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/vs_limit.h 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,140 @@ +#ifndef _VS_LIMIT_H +#define _VS_LIMIT_H @@ -10307,9 +10307,9 @@ diff -NurpP --minimal linux-3.3/include/linux/vs_limit.h linux-3.3-vs2.3.3.1/inc +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.3/include/linux/vs_network.h linux-3.3-vs2.3.3.1/include/linux/vs_network.h ---- linux-3.3/include/linux/vs_network.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/vs_network.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/vs_network.h linux-3.3.1-vs2.3.3.2/include/linux/vs_network.h +--- linux-3.3.1/include/linux/vs_network.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/vs_network.h 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,169 @@ +#ifndef _NX_VS_NETWORK_H +#define _NX_VS_NETWORK_H @@ -10480,9 +10480,9 @@ diff -NurpP --minimal linux-3.3/include/linux/vs_network.h linux-3.3-vs2.3.3.1/i +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.3/include/linux/vs_pid.h linux-3.3-vs2.3.3.1/include/linux/vs_pid.h ---- linux-3.3/include/linux/vs_pid.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/vs_pid.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/vs_pid.h linux-3.3.1-vs2.3.3.2/include/linux/vs_pid.h +--- linux-3.3.1/include/linux/vs_pid.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/vs_pid.h 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,50 @@ +#ifndef _VS_PID_H +#define _VS_PID_H @@ -10534,9 +10534,9 @@ diff -NurpP --minimal linux-3.3/include/linux/vs_pid.h linux-3.3-vs2.3.3.1/inclu +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.3/include/linux/vs_sched.h linux-3.3-vs2.3.3.1/include/linux/vs_sched.h ---- linux-3.3/include/linux/vs_sched.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/vs_sched.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/vs_sched.h linux-3.3.1-vs2.3.3.2/include/linux/vs_sched.h +--- linux-3.3.1/include/linux/vs_sched.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/vs_sched.h 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,40 @@ +#ifndef _VS_SCHED_H +#define _VS_SCHED_H @@ -10578,9 +10578,9 @@ diff -NurpP --minimal linux-3.3/include/linux/vs_sched.h linux-3.3-vs2.3.3.1/inc +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.3/include/linux/vs_socket.h linux-3.3-vs2.3.3.1/include/linux/vs_socket.h ---- linux-3.3/include/linux/vs_socket.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/vs_socket.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/vs_socket.h linux-3.3.1-vs2.3.3.2/include/linux/vs_socket.h +--- linux-3.3.1/include/linux/vs_socket.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/vs_socket.h 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,67 @@ +#ifndef _VS_SOCKET_H +#define _VS_SOCKET_H @@ -10649,9 +10649,9 @@ diff -NurpP --minimal linux-3.3/include/linux/vs_socket.h linux-3.3-vs2.3.3.1/in +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.3/include/linux/vs_tag.h linux-3.3-vs2.3.3.1/include/linux/vs_tag.h ---- linux-3.3/include/linux/vs_tag.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/vs_tag.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/vs_tag.h linux-3.3.1-vs2.3.3.2/include/linux/vs_tag.h +--- linux-3.3.1/include/linux/vs_tag.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/vs_tag.h 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,47 @@ +#ifndef _VS_TAG_H +#define _VS_TAG_H @@ -10700,9 +10700,9 @@ diff -NurpP --minimal linux-3.3/include/linux/vs_tag.h linux-3.3-vs2.3.3.1/inclu +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.3/include/linux/vs_time.h linux-3.3-vs2.3.3.1/include/linux/vs_time.h ---- linux-3.3/include/linux/vs_time.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/vs_time.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/vs_time.h linux-3.3.1-vs2.3.3.2/include/linux/vs_time.h +--- linux-3.3.1/include/linux/vs_time.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/vs_time.h 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,19 @@ +#ifndef _VS_TIME_H +#define _VS_TIME_H @@ -10723,9 +10723,9 @@ diff -NurpP --minimal linux-3.3/include/linux/vs_time.h linux-3.3-vs2.3.3.1/incl +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.3/include/linux/vserver/Kbuild linux-3.3-vs2.3.3.1/include/linux/vserver/Kbuild ---- linux-3.3/include/linux/vserver/Kbuild 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/vserver/Kbuild 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/vserver/Kbuild linux-3.3.1-vs2.3.3.2/include/linux/vserver/Kbuild +--- linux-3.3.1/include/linux/vserver/Kbuild 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/vserver/Kbuild 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,8 @@ + +header-y += context_cmd.h network_cmd.h space_cmd.h \ @@ -10735,9 +10735,9 @@ diff -NurpP --minimal linux-3.3/include/linux/vserver/Kbuild linux-3.3-vs2.3.3.1 + +header-y += switch.h network.h monitor.h inode.h device.h + -diff -NurpP --minimal linux-3.3/include/linux/vserver/base.h linux-3.3-vs2.3.3.1/include/linux/vserver/base.h ---- linux-3.3/include/linux/vserver/base.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/vserver/base.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/vserver/base.h linux-3.3.1-vs2.3.3.2/include/linux/vserver/base.h +--- linux-3.3.1/include/linux/vserver/base.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/vserver/base.h 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,178 @@ +#ifndef _VX_BASE_H +#define _VX_BASE_H @@ -10917,9 +10917,9 @@ diff -NurpP --minimal linux-3.3/include/linux/vserver/base.h linux-3.3-vs2.3.3.1 +#define nx_info_state(n, m) (__nx_state(n) & (m)) + +#endif -diff -NurpP --minimal linux-3.3/include/linux/vserver/cacct.h linux-3.3-vs2.3.3.1/include/linux/vserver/cacct.h ---- linux-3.3/include/linux/vserver/cacct.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/vserver/cacct.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/vserver/cacct.h linux-3.3.1-vs2.3.3.2/include/linux/vserver/cacct.h +--- linux-3.3.1/include/linux/vserver/cacct.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/vserver/cacct.h 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,15 @@ +#ifndef _VX_CACCT_H +#define _VX_CACCT_H @@ -10936,9 +10936,9 @@ diff -NurpP --minimal linux-3.3/include/linux/vserver/cacct.h linux-3.3-vs2.3.3. +}; + +#endif /* _VX_CACCT_H */ -diff -NurpP --minimal linux-3.3/include/linux/vserver/cacct_cmd.h linux-3.3-vs2.3.3.1/include/linux/vserver/cacct_cmd.h ---- linux-3.3/include/linux/vserver/cacct_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/vserver/cacct_cmd.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/vserver/cacct_cmd.h linux-3.3.1-vs2.3.3.2/include/linux/vserver/cacct_cmd.h +--- linux-3.3.1/include/linux/vserver/cacct_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/vserver/cacct_cmd.h 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,23 @@ +#ifndef _VX_CACCT_CMD_H +#define _VX_CACCT_CMD_H @@ -10963,9 +10963,9 @@ diff -NurpP --minimal linux-3.3/include/linux/vserver/cacct_cmd.h linux-3.3-vs2. + +#endif /* __KERNEL__ */ +#endif /* _VX_CACCT_CMD_H */ -diff -NurpP --minimal linux-3.3/include/linux/vserver/cacct_def.h linux-3.3-vs2.3.3.1/include/linux/vserver/cacct_def.h ---- linux-3.3/include/linux/vserver/cacct_def.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/vserver/cacct_def.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/vserver/cacct_def.h linux-3.3.1-vs2.3.3.2/include/linux/vserver/cacct_def.h +--- linux-3.3.1/include/linux/vserver/cacct_def.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/vserver/cacct_def.h 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,43 @@ +#ifndef _VX_CACCT_DEF_H +#define _VX_CACCT_DEF_H @@ -11010,9 +11010,9 @@ diff -NurpP --minimal linux-3.3/include/linux/vserver/cacct_def.h linux-3.3-vs2. +#endif + +#endif /* _VX_CACCT_DEF_H */ -diff -NurpP --minimal linux-3.3/include/linux/vserver/cacct_int.h linux-3.3-vs2.3.3.1/include/linux/vserver/cacct_int.h ---- linux-3.3/include/linux/vserver/cacct_int.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/vserver/cacct_int.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/vserver/cacct_int.h linux-3.3.1-vs2.3.3.2/include/linux/vserver/cacct_int.h +--- linux-3.3.1/include/linux/vserver/cacct_int.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/vserver/cacct_int.h 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,21 @@ +#ifndef _VX_CACCT_INT_H +#define _VX_CACCT_INT_H @@ -11035,9 +11035,9 @@ diff -NurpP --minimal linux-3.3/include/linux/vserver/cacct_int.h linux-3.3-vs2. + +#endif /* __KERNEL__ */ +#endif /* _VX_CACCT_INT_H */ -diff -NurpP --minimal linux-3.3/include/linux/vserver/check.h linux-3.3-vs2.3.3.1/include/linux/vserver/check.h ---- linux-3.3/include/linux/vserver/check.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/vserver/check.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/vserver/check.h linux-3.3.1-vs2.3.3.2/include/linux/vserver/check.h +--- linux-3.3.1/include/linux/vserver/check.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/vserver/check.h 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,89 @@ +#ifndef _VS_CHECK_H +#define _VS_CHECK_H @@ -11128,9 +11128,9 @@ diff -NurpP --minimal linux-3.3/include/linux/vserver/check.h linux-3.3-vs2.3.3. +#define nx_weak_check(c, m) ((m) ? nx_check(c, m) : 1) + +#endif -diff -NurpP --minimal linux-3.3/include/linux/vserver/context.h linux-3.3-vs2.3.3.1/include/linux/vserver/context.h ---- linux-3.3/include/linux/vserver/context.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/vserver/context.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/vserver/context.h linux-3.3.1-vs2.3.3.2/include/linux/vserver/context.h +--- linux-3.3.1/include/linux/vserver/context.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/vserver/context.h 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,188 @@ +#ifndef _VX_CONTEXT_H +#define _VX_CONTEXT_H @@ -11320,9 +11320,9 @@ diff -NurpP --minimal linux-3.3/include/linux/vserver/context.h linux-3.3-vs2.3. + +#endif /* __KERNEL__ */ +#endif /* _VX_CONTEXT_H */ -diff -NurpP --minimal linux-3.3/include/linux/vserver/context_cmd.h linux-3.3-vs2.3.3.1/include/linux/vserver/context_cmd.h ---- linux-3.3/include/linux/vserver/context_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/vserver/context_cmd.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/vserver/context_cmd.h linux-3.3.1-vs2.3.3.2/include/linux/vserver/context_cmd.h +--- linux-3.3.1/include/linux/vserver/context_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/vserver/context_cmd.h 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,162 @@ +#ifndef _VX_CONTEXT_CMD_H +#define _VX_CONTEXT_CMD_H @@ -11486,9 +11486,9 @@ diff -NurpP --minimal linux-3.3/include/linux/vserver/context_cmd.h linux-3.3-vs + +#endif /* __KERNEL__ */ +#endif /* _VX_CONTEXT_CMD_H */ -diff -NurpP --minimal linux-3.3/include/linux/vserver/cvirt.h linux-3.3-vs2.3.3.1/include/linux/vserver/cvirt.h ---- linux-3.3/include/linux/vserver/cvirt.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/vserver/cvirt.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/vserver/cvirt.h linux-3.3.1-vs2.3.3.2/include/linux/vserver/cvirt.h +--- linux-3.3.1/include/linux/vserver/cvirt.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/vserver/cvirt.h 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,20 @@ +#ifndef _VX_CVIRT_H +#define _VX_CVIRT_H @@ -11510,9 +11510,9 @@ diff -NurpP --minimal linux-3.3/include/linux/vserver/cvirt.h linux-3.3-vs2.3.3. + +#endif /* __KERNEL__ */ +#endif /* _VX_CVIRT_H */ -diff -NurpP --minimal linux-3.3/include/linux/vserver/cvirt_cmd.h linux-3.3-vs2.3.3.1/include/linux/vserver/cvirt_cmd.h ---- linux-3.3/include/linux/vserver/cvirt_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/vserver/cvirt_cmd.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/vserver/cvirt_cmd.h linux-3.3.1-vs2.3.3.2/include/linux/vserver/cvirt_cmd.h +--- linux-3.3.1/include/linux/vserver/cvirt_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/vserver/cvirt_cmd.h 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,53 @@ +#ifndef _VX_CVIRT_CMD_H +#define _VX_CVIRT_CMD_H @@ -11567,9 +11567,9 @@ diff -NurpP --minimal linux-3.3/include/linux/vserver/cvirt_cmd.h linux-3.3-vs2. + +#endif /* __KERNEL__ */ +#endif /* _VX_CVIRT_CMD_H */ -diff -NurpP --minimal linux-3.3/include/linux/vserver/cvirt_def.h linux-3.3-vs2.3.3.1/include/linux/vserver/cvirt_def.h ---- linux-3.3/include/linux/vserver/cvirt_def.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/vserver/cvirt_def.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/vserver/cvirt_def.h linux-3.3.1-vs2.3.3.2/include/linux/vserver/cvirt_def.h +--- linux-3.3.1/include/linux/vserver/cvirt_def.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/vserver/cvirt_def.h 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,80 @@ +#ifndef _VX_CVIRT_DEF_H +#define _VX_CVIRT_DEF_H @@ -11651,9 +11651,9 @@ diff -NurpP --minimal linux-3.3/include/linux/vserver/cvirt_def.h linux-3.3-vs2. +#endif + +#endif /* _VX_CVIRT_DEF_H */ -diff -NurpP --minimal linux-3.3/include/linux/vserver/debug.h linux-3.3-vs2.3.3.1/include/linux/vserver/debug.h ---- linux-3.3/include/linux/vserver/debug.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/vserver/debug.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/vserver/debug.h linux-3.3.1-vs2.3.3.2/include/linux/vserver/debug.h +--- linux-3.3.1/include/linux/vserver/debug.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/vserver/debug.h 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,145 @@ +#ifndef _VX_DEBUG_H +#define _VX_DEBUG_H @@ -11800,9 +11800,9 @@ diff -NurpP --minimal linux-3.3/include/linux/vserver/debug.h linux-3.3-vs2.3.3. + + +#endif /* _VX_DEBUG_H */ -diff -NurpP --minimal linux-3.3/include/linux/vserver/debug_cmd.h linux-3.3-vs2.3.3.1/include/linux/vserver/debug_cmd.h ---- linux-3.3/include/linux/vserver/debug_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/vserver/debug_cmd.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/vserver/debug_cmd.h linux-3.3.1-vs2.3.3.2/include/linux/vserver/debug_cmd.h +--- linux-3.3.1/include/linux/vserver/debug_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/vserver/debug_cmd.h 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,58 @@ +#ifndef _VX_DEBUG_CMD_H +#define _VX_DEBUG_CMD_H @@ -11862,9 +11862,9 @@ diff -NurpP --minimal linux-3.3/include/linux/vserver/debug_cmd.h linux-3.3-vs2. + +#endif /* __KERNEL__ */ +#endif /* _VX_DEBUG_CMD_H */ -diff -NurpP --minimal linux-3.3/include/linux/vserver/device.h linux-3.3-vs2.3.3.1/include/linux/vserver/device.h ---- linux-3.3/include/linux/vserver/device.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/vserver/device.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/vserver/device.h linux-3.3.1-vs2.3.3.2/include/linux/vserver/device.h +--- linux-3.3.1/include/linux/vserver/device.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/vserver/device.h 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,15 @@ +#ifndef _VX_DEVICE_H +#define _VX_DEVICE_H @@ -11881,9 +11881,9 @@ diff -NurpP --minimal linux-3.3/include/linux/vserver/device.h linux-3.3-vs2.3.3 +#else /* _VX_DEVICE_H */ +#warning duplicate inclusion +#endif /* _VX_DEVICE_H */ -diff -NurpP --minimal linux-3.3/include/linux/vserver/device_cmd.h linux-3.3-vs2.3.3.1/include/linux/vserver/device_cmd.h ---- linux-3.3/include/linux/vserver/device_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/vserver/device_cmd.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/vserver/device_cmd.h linux-3.3.1-vs2.3.3.2/include/linux/vserver/device_cmd.h +--- linux-3.3.1/include/linux/vserver/device_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/vserver/device_cmd.h 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,44 @@ +#ifndef _VX_DEVICE_CMD_H +#define _VX_DEVICE_CMD_H @@ -11929,9 +11929,9 @@ diff -NurpP --minimal linux-3.3/include/linux/vserver/device_cmd.h linux-3.3-vs2 + +#endif /* __KERNEL__ */ +#endif /* _VX_DEVICE_CMD_H */ -diff -NurpP --minimal linux-3.3/include/linux/vserver/device_def.h linux-3.3-vs2.3.3.1/include/linux/vserver/device_def.h ---- linux-3.3/include/linux/vserver/device_def.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/vserver/device_def.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/vserver/device_def.h linux-3.3.1-vs2.3.3.2/include/linux/vserver/device_def.h +--- linux-3.3.1/include/linux/vserver/device_def.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/vserver/device_def.h 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,17 @@ +#ifndef _VX_DEVICE_DEF_H +#define _VX_DEVICE_DEF_H @@ -11950,9 +11950,9 @@ diff -NurpP --minimal linux-3.3/include/linux/vserver/device_def.h linux-3.3-vs2 +}; + +#endif /* _VX_DEVICE_DEF_H */ -diff -NurpP --minimal linux-3.3/include/linux/vserver/dlimit.h linux-3.3-vs2.3.3.1/include/linux/vserver/dlimit.h ---- linux-3.3/include/linux/vserver/dlimit.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/vserver/dlimit.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/vserver/dlimit.h linux-3.3.1-vs2.3.3.2/include/linux/vserver/dlimit.h +--- linux-3.3.1/include/linux/vserver/dlimit.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/vserver/dlimit.h 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,54 @@ +#ifndef _VX_DLIMIT_H +#define _VX_DLIMIT_H @@ -12008,9 +12008,9 @@ diff -NurpP --minimal linux-3.3/include/linux/vserver/dlimit.h linux-3.3-vs2.3.3 +#else /* _VX_DLIMIT_H */ +#warning duplicate inclusion +#endif /* _VX_DLIMIT_H */ -diff -NurpP --minimal linux-3.3/include/linux/vserver/dlimit_cmd.h linux-3.3-vs2.3.3.1/include/linux/vserver/dlimit_cmd.h ---- linux-3.3/include/linux/vserver/dlimit_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/vserver/dlimit_cmd.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/vserver/dlimit_cmd.h linux-3.3.1-vs2.3.3.2/include/linux/vserver/dlimit_cmd.h +--- linux-3.3.1/include/linux/vserver/dlimit_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/vserver/dlimit_cmd.h 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,109 @@ +#ifndef _VX_DLIMIT_CMD_H +#define _VX_DLIMIT_CMD_H @@ -12121,9 +12121,9 @@ diff -NurpP --minimal linux-3.3/include/linux/vserver/dlimit_cmd.h linux-3.3-vs2 + +#endif /* __KERNEL__ */ +#endif /* _VX_DLIMIT_CMD_H */ -diff -NurpP --minimal linux-3.3/include/linux/vserver/global.h linux-3.3-vs2.3.3.1/include/linux/vserver/global.h ---- linux-3.3/include/linux/vserver/global.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/vserver/global.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/vserver/global.h linux-3.3.1-vs2.3.3.2/include/linux/vserver/global.h +--- linux-3.3.1/include/linux/vserver/global.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/vserver/global.h 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,19 @@ +#ifndef _VX_GLOBAL_H +#define _VX_GLOBAL_H @@ -12144,9 +12144,9 @@ diff -NurpP --minimal linux-3.3/include/linux/vserver/global.h linux-3.3-vs2.3.3 + + +#endif /* _VX_GLOBAL_H */ -diff -NurpP --minimal linux-3.3/include/linux/vserver/history.h linux-3.3-vs2.3.3.1/include/linux/vserver/history.h ---- linux-3.3/include/linux/vserver/history.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/vserver/history.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/vserver/history.h linux-3.3.1-vs2.3.3.2/include/linux/vserver/history.h +--- linux-3.3.1/include/linux/vserver/history.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/vserver/history.h 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,197 @@ +#ifndef _VX_HISTORY_H +#define _VX_HISTORY_H @@ -12345,9 +12345,9 @@ diff -NurpP --minimal linux-3.3/include/linux/vserver/history.h linux-3.3-vs2.3. +#endif /* CONFIG_VSERVER_HISTORY */ + +#endif /* _VX_HISTORY_H */ -diff -NurpP --minimal linux-3.3/include/linux/vserver/inode.h linux-3.3-vs2.3.3.1/include/linux/vserver/inode.h ---- linux-3.3/include/linux/vserver/inode.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/vserver/inode.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/vserver/inode.h linux-3.3.1-vs2.3.3.2/include/linux/vserver/inode.h +--- linux-3.3.1/include/linux/vserver/inode.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/vserver/inode.h 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,39 @@ +#ifndef _VX_INODE_H +#define _VX_INODE_H @@ -12388,9 +12388,9 @@ diff -NurpP --minimal linux-3.3/include/linux/vserver/inode.h linux-3.3-vs2.3.3. +#else /* _VX_INODE_H */ +#warning duplicate inclusion +#endif /* _VX_INODE_H */ -diff -NurpP --minimal linux-3.3/include/linux/vserver/inode_cmd.h linux-3.3-vs2.3.3.1/include/linux/vserver/inode_cmd.h ---- linux-3.3/include/linux/vserver/inode_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/vserver/inode_cmd.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/vserver/inode_cmd.h linux-3.3.1-vs2.3.3.2/include/linux/vserver/inode_cmd.h +--- linux-3.3.1/include/linux/vserver/inode_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/vserver/inode_cmd.h 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,59 @@ +#ifndef _VX_INODE_CMD_H +#define _VX_INODE_CMD_H @@ -12451,9 +12451,9 @@ diff -NurpP --minimal linux-3.3/include/linux/vserver/inode_cmd.h linux-3.3-vs2. + +#endif /* __KERNEL__ */ +#endif /* _VX_INODE_CMD_H */ -diff -NurpP --minimal linux-3.3/include/linux/vserver/limit.h linux-3.3-vs2.3.3.1/include/linux/vserver/limit.h ---- linux-3.3/include/linux/vserver/limit.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/vserver/limit.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/vserver/limit.h linux-3.3.1-vs2.3.3.2/include/linux/vserver/limit.h +--- linux-3.3.1/include/linux/vserver/limit.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/vserver/limit.h 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,71 @@ +#ifndef _VX_LIMIT_H +#define _VX_LIMIT_H @@ -12526,9 +12526,9 @@ diff -NurpP --minimal linux-3.3/include/linux/vserver/limit.h linux-3.3-vs2.3.3. + +#endif /* __KERNEL__ */ +#endif /* _VX_LIMIT_H */ -diff -NurpP --minimal linux-3.3/include/linux/vserver/limit_cmd.h linux-3.3-vs2.3.3.1/include/linux/vserver/limit_cmd.h ---- linux-3.3/include/linux/vserver/limit_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/vserver/limit_cmd.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/vserver/limit_cmd.h linux-3.3.1-vs2.3.3.2/include/linux/vserver/limit_cmd.h +--- linux-3.3.1/include/linux/vserver/limit_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/vserver/limit_cmd.h 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,71 @@ +#ifndef _VX_LIMIT_CMD_H +#define _VX_LIMIT_CMD_H @@ -12601,9 +12601,9 @@ diff -NurpP --minimal linux-3.3/include/linux/vserver/limit_cmd.h linux-3.3-vs2. + +#endif /* __KERNEL__ */ +#endif /* _VX_LIMIT_CMD_H */ -diff -NurpP --minimal linux-3.3/include/linux/vserver/limit_def.h linux-3.3-vs2.3.3.1/include/linux/vserver/limit_def.h ---- linux-3.3/include/linux/vserver/limit_def.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/vserver/limit_def.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/vserver/limit_def.h linux-3.3.1-vs2.3.3.2/include/linux/vserver/limit_def.h +--- linux-3.3.1/include/linux/vserver/limit_def.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/vserver/limit_def.h 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,47 @@ +#ifndef _VX_LIMIT_DEF_H +#define _VX_LIMIT_DEF_H @@ -12652,9 +12652,9 @@ diff -NurpP --minimal linux-3.3/include/linux/vserver/limit_def.h linux-3.3-vs2. +#endif + +#endif /* _VX_LIMIT_DEF_H */ -diff -NurpP --minimal linux-3.3/include/linux/vserver/limit_int.h linux-3.3-vs2.3.3.1/include/linux/vserver/limit_int.h ---- linux-3.3/include/linux/vserver/limit_int.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/vserver/limit_int.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/vserver/limit_int.h linux-3.3.1-vs2.3.3.2/include/linux/vserver/limit_int.h +--- linux-3.3.1/include/linux/vserver/limit_int.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/vserver/limit_int.h 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,198 @@ +#ifndef _VX_LIMIT_INT_H +#define _VX_LIMIT_INT_H @@ -12854,9 +12854,9 @@ diff -NurpP --minimal linux-3.3/include/linux/vserver/limit_int.h linux-3.3-vs2. + +#endif /* __KERNEL__ */ +#endif /* _VX_LIMIT_INT_H */ -diff -NurpP --minimal linux-3.3/include/linux/vserver/monitor.h linux-3.3-vs2.3.3.1/include/linux/vserver/monitor.h ---- linux-3.3/include/linux/vserver/monitor.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/vserver/monitor.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/vserver/monitor.h linux-3.3.1-vs2.3.3.2/include/linux/vserver/monitor.h +--- linux-3.3.1/include/linux/vserver/monitor.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/vserver/monitor.h 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,96 @@ +#ifndef _VX_MONITOR_H +#define _VX_MONITOR_H @@ -12954,9 +12954,9 @@ diff -NurpP --minimal linux-3.3/include/linux/vserver/monitor.h linux-3.3-vs2.3. + + +#endif /* _VX_MONITOR_H */ -diff -NurpP --minimal linux-3.3/include/linux/vserver/network.h linux-3.3-vs2.3.3.1/include/linux/vserver/network.h ---- linux-3.3/include/linux/vserver/network.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/vserver/network.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/vserver/network.h linux-3.3.1-vs2.3.3.2/include/linux/vserver/network.h +--- linux-3.3.1/include/linux/vserver/network.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/vserver/network.h 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,148 @@ +#ifndef _VX_NETWORK_H +#define _VX_NETWORK_H @@ -13106,9 +13106,9 @@ diff -NurpP --minimal linux-3.3/include/linux/vserver/network.h linux-3.3-vs2.3. + +#endif /* __KERNEL__ */ +#endif /* _VX_NETWORK_H */ -diff -NurpP --minimal linux-3.3/include/linux/vserver/network_cmd.h linux-3.3-vs2.3.3.1/include/linux/vserver/network_cmd.h ---- linux-3.3/include/linux/vserver/network_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/vserver/network_cmd.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/vserver/network_cmd.h linux-3.3.1-vs2.3.3.2/include/linux/vserver/network_cmd.h +--- linux-3.3.1/include/linux/vserver/network_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/vserver/network_cmd.h 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,164 @@ +#ifndef _VX_NETWORK_CMD_H +#define _VX_NETWORK_CMD_H @@ -13274,9 +13274,9 @@ diff -NurpP --minimal linux-3.3/include/linux/vserver/network_cmd.h linux-3.3-vs + +#endif /* __KERNEL__ */ +#endif /* _VX_CONTEXT_CMD_H */ -diff -NurpP --minimal linux-3.3/include/linux/vserver/percpu.h linux-3.3-vs2.3.3.1/include/linux/vserver/percpu.h ---- linux-3.3/include/linux/vserver/percpu.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/vserver/percpu.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/vserver/percpu.h linux-3.3.1-vs2.3.3.2/include/linux/vserver/percpu.h +--- linux-3.3.1/include/linux/vserver/percpu.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/vserver/percpu.h 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,14 @@ +#ifndef _VX_PERCPU_H +#define _VX_PERCPU_H @@ -13292,9 +13292,9 @@ diff -NurpP --minimal linux-3.3/include/linux/vserver/percpu.h linux-3.3-vs2.3.3 +#define PERCPU_PERCTX (sizeof(struct _vx_percpu)) + +#endif /* _VX_PERCPU_H */ -diff -NurpP --minimal linux-3.3/include/linux/vserver/pid.h linux-3.3-vs2.3.3.1/include/linux/vserver/pid.h ---- linux-3.3/include/linux/vserver/pid.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/vserver/pid.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/vserver/pid.h linux-3.3.1-vs2.3.3.2/include/linux/vserver/pid.h +--- linux-3.3.1/include/linux/vserver/pid.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/vserver/pid.h 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,51 @@ +#ifndef _VSERVER_PID_H +#define _VSERVER_PID_H @@ -13347,9 +13347,9 @@ diff -NurpP --minimal linux-3.3/include/linux/vserver/pid.h linux-3.3-vs2.3.3.1/ +} + +#endif -diff -NurpP --minimal linux-3.3/include/linux/vserver/sched.h linux-3.3-vs2.3.3.1/include/linux/vserver/sched.h ---- linux-3.3/include/linux/vserver/sched.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/vserver/sched.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/vserver/sched.h linux-3.3.1-vs2.3.3.2/include/linux/vserver/sched.h +--- linux-3.3.1/include/linux/vserver/sched.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/vserver/sched.h 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,23 @@ +#ifndef _VX_SCHED_H +#define _VX_SCHED_H @@ -13374,9 +13374,9 @@ diff -NurpP --minimal linux-3.3/include/linux/vserver/sched.h linux-3.3-vs2.3.3. +#else /* _VX_SCHED_H */ +#warning duplicate inclusion +#endif /* _VX_SCHED_H */ -diff -NurpP --minimal linux-3.3/include/linux/vserver/sched_cmd.h linux-3.3-vs2.3.3.1/include/linux/vserver/sched_cmd.h ---- linux-3.3/include/linux/vserver/sched_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/vserver/sched_cmd.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/vserver/sched_cmd.h linux-3.3.1-vs2.3.3.2/include/linux/vserver/sched_cmd.h +--- linux-3.3.1/include/linux/vserver/sched_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/vserver/sched_cmd.h 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,21 @@ +#ifndef _VX_SCHED_CMD_H +#define _VX_SCHED_CMD_H @@ -13399,9 +13399,9 @@ diff -NurpP --minimal linux-3.3/include/linux/vserver/sched_cmd.h linux-3.3-vs2. + +#endif /* __KERNEL__ */ +#endif /* _VX_SCHED_CMD_H */ -diff -NurpP --minimal linux-3.3/include/linux/vserver/sched_def.h linux-3.3-vs2.3.3.1/include/linux/vserver/sched_def.h ---- linux-3.3/include/linux/vserver/sched_def.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/vserver/sched_def.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/vserver/sched_def.h linux-3.3.1-vs2.3.3.2/include/linux/vserver/sched_def.h +--- linux-3.3.1/include/linux/vserver/sched_def.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/vserver/sched_def.h 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,38 @@ +#ifndef _VX_SCHED_DEF_H +#define _VX_SCHED_DEF_H @@ -13441,9 +13441,9 @@ diff -NurpP --minimal linux-3.3/include/linux/vserver/sched_def.h linux-3.3-vs2. +#endif + +#endif /* _VX_SCHED_DEF_H */ -diff -NurpP --minimal linux-3.3/include/linux/vserver/signal.h linux-3.3-vs2.3.3.1/include/linux/vserver/signal.h ---- linux-3.3/include/linux/vserver/signal.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/vserver/signal.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/vserver/signal.h linux-3.3.1-vs2.3.3.2/include/linux/vserver/signal.h +--- linux-3.3.1/include/linux/vserver/signal.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/vserver/signal.h 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,14 @@ +#ifndef _VX_SIGNAL_H +#define _VX_SIGNAL_H @@ -13459,9 +13459,9 @@ diff -NurpP --minimal linux-3.3/include/linux/vserver/signal.h linux-3.3-vs2.3.3 +#else /* _VX_SIGNAL_H */ +#warning duplicate inclusion +#endif /* _VX_SIGNAL_H */ -diff -NurpP --minimal linux-3.3/include/linux/vserver/signal_cmd.h linux-3.3-vs2.3.3.1/include/linux/vserver/signal_cmd.h ---- linux-3.3/include/linux/vserver/signal_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/vserver/signal_cmd.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/vserver/signal_cmd.h linux-3.3.1-vs2.3.3.2/include/linux/vserver/signal_cmd.h +--- linux-3.3.1/include/linux/vserver/signal_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/vserver/signal_cmd.h 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,43 @@ +#ifndef _VX_SIGNAL_CMD_H +#define _VX_SIGNAL_CMD_H @@ -13506,9 +13506,9 @@ diff -NurpP --minimal linux-3.3/include/linux/vserver/signal_cmd.h linux-3.3-vs2 + +#endif /* __KERNEL__ */ +#endif /* _VX_SIGNAL_CMD_H */ -diff -NurpP --minimal linux-3.3/include/linux/vserver/space.h linux-3.3-vs2.3.3.1/include/linux/vserver/space.h ---- linux-3.3/include/linux/vserver/space.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/vserver/space.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/vserver/space.h linux-3.3.1-vs2.3.3.2/include/linux/vserver/space.h +--- linux-3.3.1/include/linux/vserver/space.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/vserver/space.h 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,12 @@ +#ifndef _VX_SPACE_H +#define _VX_SPACE_H @@ -13522,9 +13522,9 @@ diff -NurpP --minimal linux-3.3/include/linux/vserver/space.h linux-3.3-vs2.3.3. +#else /* _VX_SPACE_H */ +#warning duplicate inclusion +#endif /* _VX_SPACE_H */ -diff -NurpP --minimal linux-3.3/include/linux/vserver/space_cmd.h linux-3.3-vs2.3.3.1/include/linux/vserver/space_cmd.h ---- linux-3.3/include/linux/vserver/space_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/vserver/space_cmd.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/vserver/space_cmd.h linux-3.3.1-vs2.3.3.2/include/linux/vserver/space_cmd.h +--- linux-3.3.1/include/linux/vserver/space_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/vserver/space_cmd.h 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,38 @@ +#ifndef _VX_SPACE_CMD_H +#define _VX_SPACE_CMD_H @@ -13564,9 +13564,9 @@ diff -NurpP --minimal linux-3.3/include/linux/vserver/space_cmd.h linux-3.3-vs2. + +#endif /* __KERNEL__ */ +#endif /* _VX_SPACE_CMD_H */ -diff -NurpP --minimal linux-3.3/include/linux/vserver/switch.h linux-3.3-vs2.3.3.1/include/linux/vserver/switch.h ---- linux-3.3/include/linux/vserver/switch.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/vserver/switch.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/vserver/switch.h linux-3.3.1-vs2.3.3.2/include/linux/vserver/switch.h +--- linux-3.3.1/include/linux/vserver/switch.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/vserver/switch.h 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,98 @@ +#ifndef _VX_SWITCH_H +#define _VX_SWITCH_H @@ -13666,9 +13666,9 @@ diff -NurpP --minimal linux-3.3/include/linux/vserver/switch.h linux-3.3-vs2.3.3 + +#endif /* _VX_SWITCH_H */ + -diff -NurpP --minimal linux-3.3/include/linux/vserver/tag.h linux-3.3-vs2.3.3.1/include/linux/vserver/tag.h ---- linux-3.3/include/linux/vserver/tag.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/vserver/tag.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/vserver/tag.h linux-3.3.1-vs2.3.3.2/include/linux/vserver/tag.h +--- linux-3.3.1/include/linux/vserver/tag.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/vserver/tag.h 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,143 @@ +#ifndef _DX_TAG_H +#define _DX_TAG_H @@ -13813,9 +13813,9 @@ diff -NurpP --minimal linux-3.3/include/linux/vserver/tag.h linux-3.3-vs2.3.3.1/ +#endif + +#endif /* _DX_TAG_H */ -diff -NurpP --minimal linux-3.3/include/linux/vserver/tag_cmd.h linux-3.3-vs2.3.3.1/include/linux/vserver/tag_cmd.h ---- linux-3.3/include/linux/vserver/tag_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/linux/vserver/tag_cmd.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/linux/vserver/tag_cmd.h linux-3.3.1-vs2.3.3.2/include/linux/vserver/tag_cmd.h +--- linux-3.3.1/include/linux/vserver/tag_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/linux/vserver/tag_cmd.h 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,22 @@ +#ifndef _VX_TAG_CMD_H +#define _VX_TAG_CMD_H @@ -13839,9 +13839,9 @@ diff -NurpP --minimal linux-3.3/include/linux/vserver/tag_cmd.h linux-3.3-vs2.3. + +#endif /* __KERNEL__ */ +#endif /* _VX_TAG_CMD_H */ -diff -NurpP --minimal linux-3.3/include/net/addrconf.h linux-3.3-vs2.3.3.1/include/net/addrconf.h ---- linux-3.3/include/net/addrconf.h 2012-03-19 19:47:29.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/net/addrconf.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/net/addrconf.h linux-3.3.1-vs2.3.3.2/include/net/addrconf.h +--- linux-3.3.1/include/net/addrconf.h 2012-03-19 19:47:29.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/net/addrconf.h 2012-02-24 03:55:06.000000000 +0100 @@ -80,7 +80,8 @@ extern int ipv6_dev_get_saddr(struct n struct net_device *dev, const struct in6_addr *daddr, @@ -13852,9 +13852,9 @@ diff -NurpP --minimal linux-3.3/include/net/addrconf.h linux-3.3-vs2.3.3.1/inclu extern int ipv6_get_lladdr(struct net_device *dev, struct in6_addr *addr, unsigned char banned_flags); -diff -NurpP --minimal linux-3.3/include/net/af_unix.h linux-3.3-vs2.3.3.1/include/net/af_unix.h ---- linux-3.3/include/net/af_unix.h 2012-03-19 19:47:29.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/net/af_unix.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/net/af_unix.h linux-3.3.1-vs2.3.3.2/include/net/af_unix.h +--- linux-3.3.1/include/net/af_unix.h 2012-03-19 19:47:29.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/net/af_unix.h 2012-02-24 03:55:06.000000000 +0100 @@ -4,6 +4,7 @@ #include #include @@ -13863,9 +13863,9 @@ diff -NurpP --minimal linux-3.3/include/net/af_unix.h linux-3.3-vs2.3.3.1/includ #include extern void unix_inflight(struct file *fp); -diff -NurpP --minimal linux-3.3/include/net/inet_timewait_sock.h linux-3.3-vs2.3.3.1/include/net/inet_timewait_sock.h ---- linux-3.3/include/net/inet_timewait_sock.h 2012-03-19 19:47:29.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/net/inet_timewait_sock.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/net/inet_timewait_sock.h linux-3.3.1-vs2.3.3.2/include/net/inet_timewait_sock.h +--- linux-3.3.1/include/net/inet_timewait_sock.h 2012-03-19 19:47:29.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/net/inet_timewait_sock.h 2012-02-24 03:55:06.000000000 +0100 @@ -112,6 +112,10 @@ struct inet_timewait_sock { #define tw_net __tw_common.skc_net #define tw_daddr __tw_common.skc_daddr @@ -13877,9 +13877,9 @@ diff -NurpP --minimal linux-3.3/include/net/inet_timewait_sock.h linux-3.3-vs2.3 int tw_timeout; volatile unsigned char tw_substate; unsigned char tw_rcv_wscale; -diff -NurpP --minimal linux-3.3/include/net/ip6_route.h linux-3.3-vs2.3.3.1/include/net/ip6_route.h ---- linux-3.3/include/net/ip6_route.h 2012-03-19 19:47:29.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/net/ip6_route.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/net/ip6_route.h linux-3.3.1-vs2.3.3.2/include/net/ip6_route.h +--- linux-3.3.1/include/net/ip6_route.h 2012-03-19 19:47:29.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/net/ip6_route.h 2012-02-24 03:55:06.000000000 +0100 @@ -88,7 +88,8 @@ extern int ip6_route_get_saddr(struct struct rt6_info *rt, const struct in6_addr *daddr, @@ -13890,9 +13890,9 @@ diff -NurpP --minimal linux-3.3/include/net/ip6_route.h linux-3.3-vs2.3.3.1/incl extern struct rt6_info *rt6_lookup(struct net *net, const struct in6_addr *daddr, -diff -NurpP --minimal linux-3.3/include/net/route.h linux-3.3-vs2.3.3.1/include/net/route.h ---- linux-3.3/include/net/route.h 2012-03-19 19:47:29.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/net/route.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/net/route.h linux-3.3.1-vs2.3.3.2/include/net/route.h +--- linux-3.3.1/include/net/route.h 2012-03-19 19:47:29.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/net/route.h 2012-02-24 03:55:06.000000000 +0100 @@ -202,6 +202,9 @@ static inline void ip_rt_put(struct rtab dst_release(&rt->dst); } @@ -13940,9 +13940,9 @@ diff -NurpP --minimal linux-3.3/include/net/route.h linux-3.3-vs2.3.3.1/include/ rt = __ip_route_output_key(net, fl4); if (IS_ERR(rt)) return rt; -diff -NurpP --minimal linux-3.3/include/net/sock.h linux-3.3-vs2.3.3.1/include/net/sock.h ---- linux-3.3/include/net/sock.h 2012-03-19 19:47:29.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/include/net/sock.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/include/net/sock.h linux-3.3.1-vs2.3.3.2/include/net/sock.h +--- linux-3.3.1/include/net/sock.h 2012-03-19 19:47:29.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/include/net/sock.h 2012-02-24 03:55:06.000000000 +0100 @@ -168,6 +168,10 @@ struct sock_common { #ifdef CONFIG_NET_NS struct net *skc_net; @@ -13965,9 +13965,9 @@ diff -NurpP --minimal linux-3.3/include/net/sock.h linux-3.3-vs2.3.3.1/include/n socket_lock_t sk_lock; struct sk_buff_head sk_receive_queue; /* -diff -NurpP --minimal linux-3.3/init/Kconfig linux-3.3-vs2.3.3.1/init/Kconfig ---- linux-3.3/init/Kconfig 2012-03-19 19:47:29.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/init/Kconfig 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/init/Kconfig linux-3.3.1-vs2.3.3.2/init/Kconfig +--- linux-3.3.1/init/Kconfig 2012-03-19 19:47:29.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/init/Kconfig 2012-02-24 03:55:06.000000000 +0100 @@ -588,6 +588,7 @@ config HAVE_UNSTABLE_SCHED_CLOCK menuconfig CGROUPS boolean "Control Group support" @@ -13984,9 +13984,9 @@ diff -NurpP --minimal linux-3.3/init/Kconfig linux-3.3-vs2.3.3.1/init/Kconfig default y help This allows containers, i.e. vservers, to use user namespaces -diff -NurpP --minimal linux-3.3/init/main.c linux-3.3-vs2.3.3.1/init/main.c ---- linux-3.3/init/main.c 2012-03-19 19:47:29.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/init/main.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/init/main.c linux-3.3.1-vs2.3.3.2/init/main.c +--- linux-3.3.1/init/main.c 2012-03-19 19:47:29.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/init/main.c 2012-02-24 03:55:06.000000000 +0100 @@ -68,6 +68,7 @@ #include #include @@ -13995,9 +13995,9 @@ diff -NurpP --minimal linux-3.3/init/main.c linux-3.3-vs2.3.3.1/init/main.c #include #include -diff -NurpP --minimal linux-3.3/ipc/mqueue.c linux-3.3-vs2.3.3.1/ipc/mqueue.c ---- linux-3.3/ipc/mqueue.c 2012-03-19 19:47:29.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/ipc/mqueue.c 2012-02-24 04:07:13.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/ipc/mqueue.c linux-3.3.1-vs2.3.3.2/ipc/mqueue.c +--- linux-3.3.1/ipc/mqueue.c 2012-03-19 19:47:29.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/ipc/mqueue.c 2012-02-24 04:07:13.000000000 +0100 @@ -34,6 +34,8 @@ #include #include @@ -14073,9 +14073,9 @@ diff -NurpP --minimal linux-3.3/ipc/mqueue.c linux-3.3-vs2.3.3.1/ipc/mqueue.c free_uid(user); } if (ipc_ns) -diff -NurpP --minimal linux-3.3/ipc/msg.c linux-3.3-vs2.3.3.1/ipc/msg.c ---- linux-3.3/ipc/msg.c 2011-05-22 16:17:59.000000000 +0200 -+++ linux-3.3-vs2.3.3.1/ipc/msg.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/ipc/msg.c linux-3.3.1-vs2.3.3.2/ipc/msg.c +--- linux-3.3.1/ipc/msg.c 2011-05-22 16:17:59.000000000 +0200 ++++ linux-3.3.1-vs2.3.3.2/ipc/msg.c 2012-02-24 03:55:06.000000000 +0100 @@ -37,6 +37,7 @@ #include #include @@ -14092,9 +14092,9 @@ diff -NurpP --minimal linux-3.3/ipc/msg.c linux-3.3-vs2.3.3.1/ipc/msg.c msq->q_perm.security = NULL; retval = security_msg_queue_alloc(msq); -diff -NurpP --minimal linux-3.3/ipc/namespace.c linux-3.3-vs2.3.3.1/ipc/namespace.c ---- linux-3.3/ipc/namespace.c 2011-07-22 11:18:12.000000000 +0200 -+++ linux-3.3-vs2.3.3.1/ipc/namespace.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/ipc/namespace.c linux-3.3.1-vs2.3.3.2/ipc/namespace.c +--- linux-3.3.1/ipc/namespace.c 2011-07-22 11:18:12.000000000 +0200 ++++ linux-3.3.1-vs2.3.3.2/ipc/namespace.c 2012-02-24 03:55:06.000000000 +0100 @@ -13,11 +13,12 @@ #include #include @@ -14135,9 +14135,9 @@ diff -NurpP --minimal linux-3.3/ipc/namespace.c linux-3.3-vs2.3.3.1/ipc/namespac } /* -diff -NurpP --minimal linux-3.3/ipc/sem.c linux-3.3-vs2.3.3.1/ipc/sem.c ---- linux-3.3/ipc/sem.c 2012-01-09 16:14:59.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/ipc/sem.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/ipc/sem.c linux-3.3.1-vs2.3.3.2/ipc/sem.c +--- linux-3.3.1/ipc/sem.c 2012-01-09 16:14:59.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/ipc/sem.c 2012-02-24 03:55:06.000000000 +0100 @@ -86,6 +86,8 @@ #include #include @@ -14175,9 +14175,9 @@ diff -NurpP --minimal linux-3.3/ipc/sem.c linux-3.3-vs2.3.3.1/ipc/sem.c security_sem_free(sma); ipc_rcu_putref(sma); } -diff -NurpP --minimal linux-3.3/ipc/shm.c linux-3.3-vs2.3.3.1/ipc/shm.c ---- linux-3.3/ipc/shm.c 2012-03-19 19:47:29.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/ipc/shm.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/ipc/shm.c linux-3.3.1-vs2.3.3.2/ipc/shm.c +--- linux-3.3.1/ipc/shm.c 2012-03-19 19:47:29.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/ipc/shm.c 2012-02-24 03:55:06.000000000 +0100 @@ -39,6 +39,8 @@ #include #include @@ -14233,9 +14233,9 @@ diff -NurpP --minimal linux-3.3/ipc/shm.c linux-3.3-vs2.3.3.1/ipc/shm.c return error; no_id: -diff -NurpP --minimal linux-3.3/kernel/Makefile linux-3.3-vs2.3.3.1/kernel/Makefile ---- linux-3.3/kernel/Makefile 2012-03-19 19:47:29.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/kernel/Makefile 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/kernel/Makefile linux-3.3.1-vs2.3.3.2/kernel/Makefile +--- linux-3.3.1/kernel/Makefile 2012-03-19 19:47:29.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/kernel/Makefile 2012-02-24 03:55:06.000000000 +0100 @@ -25,6 +25,7 @@ endif obj-y += sched/ obj-y += power/ @@ -14244,9 +14244,9 @@ diff -NurpP --minimal linux-3.3/kernel/Makefile linux-3.3-vs2.3.3.1/kernel/Makef obj-$(CONFIG_FREEZER) += freezer.o obj-$(CONFIG_PROFILING) += profile.o obj-$(CONFIG_SYSCTL_SYSCALL_CHECK) += sysctl_check.o -diff -NurpP --minimal linux-3.3/kernel/auditsc.c linux-3.3-vs2.3.3.1/kernel/auditsc.c ---- linux-3.3/kernel/auditsc.c 2012-03-19 19:47:29.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/kernel/auditsc.c 2012-02-24 16:47:49.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/kernel/auditsc.c linux-3.3.1-vs2.3.3.2/kernel/auditsc.c +--- linux-3.3.1/kernel/auditsc.c 2012-03-19 19:47:29.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/kernel/auditsc.c 2012-02-24 16:47:49.000000000 +0100 @@ -2308,7 +2308,7 @@ int audit_set_loginuid(uid_t loginuid) if (task->loginuid != -1) return -EPERM; @@ -14256,9 +14256,9 @@ diff -NurpP --minimal linux-3.3/kernel/auditsc.c linux-3.3-vs2.3.3.1/kernel/audi return -EPERM; #endif /* CONFIG_AUDIT_LOGINUID_IMMUTABLE */ -diff -NurpP --minimal linux-3.3/kernel/capability.c linux-3.3-vs2.3.3.1/kernel/capability.c ---- linux-3.3/kernel/capability.c 2012-03-19 19:47:29.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/kernel/capability.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/kernel/capability.c linux-3.3.1-vs2.3.3.2/kernel/capability.c +--- linux-3.3.1/kernel/capability.c 2012-03-19 19:47:29.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/kernel/capability.c 2012-02-24 03:55:06.000000000 +0100 @@ -15,6 +15,7 @@ #include #include @@ -14284,9 +14284,9 @@ diff -NurpP --minimal linux-3.3/kernel/capability.c linux-3.3-vs2.3.3.1/kernel/c /** * has_capability_noaudit - Does a task have a capability (unaudited) in the * initial user ns -diff -NurpP --minimal linux-3.3/kernel/compat.c linux-3.3-vs2.3.3.1/kernel/compat.c ---- linux-3.3/kernel/compat.c 2012-01-09 16:14:59.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/kernel/compat.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/kernel/compat.c linux-3.3.1-vs2.3.3.2/kernel/compat.c +--- linux-3.3.1/kernel/compat.c 2012-01-09 16:14:59.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/kernel/compat.c 2012-02-24 03:55:06.000000000 +0100 @@ -973,7 +973,7 @@ asmlinkage long compat_sys_stime(compat_ if (err) return err; @@ -14296,9 +14296,9 @@ diff -NurpP --minimal linux-3.3/kernel/compat.c linux-3.3-vs2.3.3.1/kernel/compa return 0; } -diff -NurpP --minimal linux-3.3/kernel/cred.c linux-3.3-vs2.3.3.1/kernel/cred.c ---- linux-3.3/kernel/cred.c 2012-01-09 16:15:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/kernel/cred.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/kernel/cred.c linux-3.3.1-vs2.3.3.2/kernel/cred.c +--- linux-3.3.1/kernel/cred.c 2012-01-09 16:15:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/kernel/cred.c 2012-02-24 03:55:06.000000000 +0100 @@ -61,31 +61,6 @@ struct cred init_cred = { #endif }; @@ -14368,9 +14368,9 @@ diff -NurpP --minimal linux-3.3/kernel/cred.c linux-3.3-vs2.3.3.1/kernel/cred.c EXPORT_SYMBOL(prepare_creds); /* -diff -NurpP --minimal linux-3.3/kernel/exit.c linux-3.3-vs2.3.3.1/kernel/exit.c ---- linux-3.3/kernel/exit.c 2012-03-19 19:47:30.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/kernel/exit.c 2012-02-24 04:09:40.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/kernel/exit.c linux-3.3.1-vs2.3.3.2/kernel/exit.c +--- linux-3.3.1/kernel/exit.c 2012-03-19 19:47:30.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/kernel/exit.c 2012-02-24 04:09:40.000000000 +0100 @@ -48,6 +48,10 @@ #include #include @@ -14410,9 +14410,9 @@ diff -NurpP --minimal linux-3.3/kernel/exit.c linux-3.3-vs2.3.3.1/kernel/exit.c BUG(); /* Avoid "noreturn function does return". */ for (;;) -diff -NurpP --minimal linux-3.3/kernel/fork.c linux-3.3-vs2.3.3.1/kernel/fork.c ---- linux-3.3/kernel/fork.c 2012-03-19 19:47:30.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/kernel/fork.c 2012-03-19 20:52:37.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/kernel/fork.c linux-3.3.1-vs2.3.3.2/kernel/fork.c +--- linux-3.3.1/kernel/fork.c 2012-03-19 19:47:30.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/kernel/fork.c 2012-03-19 20:52:37.000000000 +0100 @@ -67,6 +67,9 @@ #include #include @@ -14505,9 +14505,9 @@ diff -NurpP --minimal linux-3.3/kernel/fork.c linux-3.3-vs2.3.3.1/kernel/fork.c write_unlock_irq(&tasklist_lock); proc_fork_connector(p); cgroup_post_fork(p); -diff -NurpP --minimal linux-3.3/kernel/kthread.c linux-3.3-vs2.3.3.1/kernel/kthread.c ---- linux-3.3/kernel/kthread.c 2012-03-19 19:47:30.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/kernel/kthread.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/kernel/kthread.c linux-3.3.1-vs2.3.3.2/kernel/kthread.c +--- linux-3.3.1/kernel/kthread.c 2012-03-19 19:47:30.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/kernel/kthread.c 2012-02-24 03:55:06.000000000 +0100 @@ -16,6 +16,7 @@ #include #include @@ -14516,9 +14516,9 @@ diff -NurpP --minimal linux-3.3/kernel/kthread.c linux-3.3-vs2.3.3.1/kernel/kthr #include static DEFINE_SPINLOCK(kthread_create_lock); -diff -NurpP --minimal linux-3.3/kernel/nsproxy.c linux-3.3-vs2.3.3.1/kernel/nsproxy.c ---- linux-3.3/kernel/nsproxy.c 2012-01-09 16:15:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/kernel/nsproxy.c 2012-02-24 16:59:37.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/kernel/nsproxy.c linux-3.3.1-vs2.3.3.2/kernel/nsproxy.c +--- linux-3.3.1/kernel/nsproxy.c 2012-01-09 16:15:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/kernel/nsproxy.c 2012-02-24 16:59:37.000000000 +0100 @@ -20,11 +20,14 @@ #include #include @@ -14700,9 +14700,9 @@ diff -NurpP --minimal linux-3.3/kernel/nsproxy.c linux-3.3-vs2.3.3.1/kernel/nspr return -EPERM; *new_nsp = create_new_namespaces(unshare_flags, current, -diff -NurpP --minimal linux-3.3/kernel/pid.c linux-3.3-vs2.3.3.1/kernel/pid.c ---- linux-3.3/kernel/pid.c 2012-03-19 19:47:30.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/kernel/pid.c 2012-03-19 20:52:10.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/kernel/pid.c linux-3.3.1-vs2.3.3.2/kernel/pid.c +--- linux-3.3.1/kernel/pid.c 2012-03-19 19:47:30.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/kernel/pid.c 2012-03-19 20:52:10.000000000 +0100 @@ -36,6 +36,7 @@ #include #include @@ -14760,9 +14760,9 @@ diff -NurpP --minimal linux-3.3/kernel/pid.c linux-3.3-vs2.3.3.1/kernel/pid.c pid_t pid_vnr(struct pid *pid) { return pid_nr_ns(pid, current->nsproxy->pid_ns); -diff -NurpP --minimal linux-3.3/kernel/pid_namespace.c linux-3.3-vs2.3.3.1/kernel/pid_namespace.c ---- linux-3.3/kernel/pid_namespace.c 2012-03-19 19:47:30.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/kernel/pid_namespace.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/kernel/pid_namespace.c linux-3.3.1-vs2.3.3.2/kernel/pid_namespace.c +--- linux-3.3.1/kernel/pid_namespace.c 2012-03-19 19:47:30.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/kernel/pid_namespace.c 2012-02-24 03:55:06.000000000 +0100 @@ -15,6 +15,7 @@ #include #include @@ -14787,9 +14787,9 @@ diff -NurpP --minimal linux-3.3/kernel/pid_namespace.c linux-3.3-vs2.3.3.1/kerne kmem_cache_free(pid_ns_cachep, ns); } -diff -NurpP --minimal linux-3.3/kernel/posix-timers.c linux-3.3-vs2.3.3.1/kernel/posix-timers.c ---- linux-3.3/kernel/posix-timers.c 2012-01-09 16:15:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/kernel/posix-timers.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/kernel/posix-timers.c linux-3.3.1-vs2.3.3.2/kernel/posix-timers.c +--- linux-3.3.1/kernel/posix-timers.c 2012-01-09 16:15:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/kernel/posix-timers.c 2012-02-24 03:55:06.000000000 +0100 @@ -47,6 +47,7 @@ #include #include @@ -14825,9 +14825,9 @@ diff -NurpP --minimal linux-3.3/kernel/posix-timers.c linux-3.3-vs2.3.3.1/kernel /* If we failed to send the signal the timer stops. */ return ret > 0; } -diff -NurpP --minimal linux-3.3/kernel/printk.c linux-3.3-vs2.3.3.1/kernel/printk.c ---- linux-3.3/kernel/printk.c 2012-03-19 19:47:30.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/kernel/printk.c 2012-03-19 20:52:10.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/kernel/printk.c linux-3.3.1-vs2.3.3.2/kernel/printk.c +--- linux-3.3.1/kernel/printk.c 2012-03-19 19:47:30.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/kernel/printk.c 2012-03-19 20:52:10.000000000 +0100 @@ -41,6 +41,7 @@ #include #include @@ -14895,9 +14895,9 @@ diff -NurpP --minimal linux-3.3/kernel/printk.c linux-3.3-vs2.3.3.1/kernel/print count = len; if (count > log_buf_len) count = log_buf_len; -diff -NurpP --minimal linux-3.3/kernel/ptrace.c linux-3.3-vs2.3.3.1/kernel/ptrace.c ---- linux-3.3/kernel/ptrace.c 2012-03-19 19:47:30.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/kernel/ptrace.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/kernel/ptrace.c linux-3.3.1-vs2.3.3.2/kernel/ptrace.c +--- linux-3.3.1/kernel/ptrace.c 2012-03-19 19:47:30.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/kernel/ptrace.c 2012-02-24 03:55:06.000000000 +0100 @@ -22,6 +22,7 @@ #include #include @@ -14918,9 +14918,9 @@ diff -NurpP --minimal linux-3.3/kernel/ptrace.c linux-3.3-vs2.3.3.1/kernel/ptrac return security_ptrace_access_check(task, mode); } -diff -NurpP --minimal linux-3.3/kernel/sched/core.c linux-3.3-vs2.3.3.1/kernel/sched/core.c ---- linux-3.3/kernel/sched/core.c 2012-03-19 19:47:30.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/kernel/sched/core.c 2012-03-19 20:52:10.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/kernel/sched/core.c linux-3.3.1-vs2.3.3.2/kernel/sched/core.c +--- linux-3.3.1/kernel/sched/core.c 2012-03-19 19:47:30.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/kernel/sched/core.c 2012-03-19 20:52:10.000000000 +0100 @@ -71,6 +71,8 @@ #include #include @@ -14992,9 +14992,9 @@ diff -NurpP --minimal linux-3.3/kernel/sched/core.c linux-3.3-vs2.3.3.1/kernel/s retval = security_task_setnice(current, nice); if (retval) -diff -NurpP --minimal linux-3.3/kernel/sched/fair.c linux-3.3-vs2.3.3.1/kernel/sched/fair.c ---- linux-3.3/kernel/sched/fair.c 2012-03-19 19:47:30.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/kernel/sched/fair.c 2012-03-19 20:52:10.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/kernel/sched/fair.c linux-3.3.1-vs2.3.3.2/kernel/sched/fair.c +--- linux-3.3.1/kernel/sched/fair.c 2012-03-19 19:47:30.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/kernel/sched/fair.c 2012-03-19 20:52:10.000000000 +0100 @@ -26,6 +26,7 @@ #include #include @@ -15021,9 +15021,9 @@ diff -NurpP --minimal linux-3.3/kernel/sched/fair.c linux-3.3-vs2.3.3.1/kernel/s update_cfs_load(cfs_rq, 0); account_entity_dequeue(cfs_rq, se); -diff -NurpP --minimal linux-3.3/kernel/signal.c linux-3.3-vs2.3.3.1/kernel/signal.c ---- linux-3.3/kernel/signal.c 2012-03-19 19:47:30.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/kernel/signal.c 2012-02-24 04:10:10.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/kernel/signal.c linux-3.3.1-vs2.3.3.2/kernel/signal.c +--- linux-3.3.1/kernel/signal.c 2012-03-19 19:47:30.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/kernel/signal.c 2012-02-24 04:10:10.000000000 +0100 @@ -29,6 +29,8 @@ #include #include @@ -15116,9 +15116,9 @@ diff -NurpP --minimal linux-3.3/kernel/signal.c linux-3.3-vs2.3.3.1/kernel/signa if (sig_kernel_stop(signr)) { /* * The default action is to stop all threads in -diff -NurpP --minimal linux-3.3/kernel/softirq.c linux-3.3-vs2.3.3.1/kernel/softirq.c ---- linux-3.3/kernel/softirq.c 2012-03-19 19:47:30.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/kernel/softirq.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/kernel/softirq.c linux-3.3.1-vs2.3.3.2/kernel/softirq.c +--- linux-3.3.1/kernel/softirq.c 2012-03-19 19:47:30.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/kernel/softirq.c 2012-02-24 03:55:06.000000000 +0100 @@ -24,6 +24,7 @@ #include #include @@ -15127,9 +15127,9 @@ diff -NurpP --minimal linux-3.3/kernel/softirq.c linux-3.3-vs2.3.3.1/kernel/soft #define CREATE_TRACE_POINTS #include -diff -NurpP --minimal linux-3.3/kernel/sys.c linux-3.3-vs2.3.3.1/kernel/sys.c ---- linux-3.3/kernel/sys.c 2012-03-19 19:47:30.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/kernel/sys.c 2012-03-19 20:52:10.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/kernel/sys.c linux-3.3.1-vs2.3.3.2/kernel/sys.c +--- linux-3.3.1/kernel/sys.c 2012-03-19 19:47:30.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/kernel/sys.c 2012-03-19 20:52:10.000000000 +0100 @@ -45,6 +45,7 @@ #include #include @@ -15226,9 +15226,9 @@ diff -NurpP --minimal linux-3.3/kernel/sys.c linux-3.3-vs2.3.3.1/kernel/sys.c return 0; return -EPERM; -diff -NurpP --minimal linux-3.3/kernel/sysctl.c linux-3.3-vs2.3.3.1/kernel/sysctl.c ---- linux-3.3/kernel/sysctl.c 2012-03-19 19:47:30.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/kernel/sysctl.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/kernel/sysctl.c linux-3.3.1-vs2.3.3.2/kernel/sysctl.c +--- linux-3.3.1/kernel/sysctl.c 2012-03-19 19:47:30.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/kernel/sysctl.c 2012-02-24 03:55:06.000000000 +0100 @@ -76,6 +76,7 @@ #if defined(CONFIG_PROVE_LOCKING) || defined(CONFIG_LOCK_STAT) #include @@ -15251,9 +15251,9 @@ diff -NurpP --minimal linux-3.3/kernel/sysctl.c linux-3.3-vs2.3.3.1/kernel/sysct #ifdef CONFIG_CHR_DEV_SG { .procname = "sg-big-buff", -diff -NurpP --minimal linux-3.3/kernel/sysctl_binary.c linux-3.3-vs2.3.3.1/kernel/sysctl_binary.c ---- linux-3.3/kernel/sysctl_binary.c 2012-01-09 16:15:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/kernel/sysctl_binary.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/kernel/sysctl_binary.c linux-3.3.1-vs2.3.3.2/kernel/sysctl_binary.c +--- linux-3.3.1/kernel/sysctl_binary.c 2012-01-09 16:15:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/kernel/sysctl_binary.c 2012-02-24 03:55:06.000000000 +0100 @@ -73,6 +73,7 @@ static const struct bin_table bin_kern_t { CTL_INT, KERN_PANIC, "panic" }, @@ -15262,9 +15262,9 @@ diff -NurpP --minimal linux-3.3/kernel/sysctl_binary.c linux-3.3-vs2.3.3.1/kerne { CTL_STR, KERN_SPARC_REBOOT, "reboot-cmd" }, { CTL_INT, KERN_CTLALTDEL, "ctrl-alt-del" }, -diff -NurpP --minimal linux-3.3/kernel/time/timekeeping.c linux-3.3-vs2.3.3.1/kernel/time/timekeeping.c ---- linux-3.3/kernel/time/timekeeping.c 2012-03-19 19:47:30.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/kernel/time/timekeeping.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/kernel/time/timekeeping.c linux-3.3.1-vs2.3.3.2/kernel/time/timekeeping.c +--- linux-3.3.1/kernel/time/timekeeping.c 2012-03-19 19:47:30.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/kernel/time/timekeeping.c 2012-02-24 03:55:06.000000000 +0100 @@ -233,6 +233,7 @@ void getnstimeofday(struct timespec *ts) } while (read_seqretry(&xtime_lock, seq)); @@ -15273,9 +15273,9 @@ diff -NurpP --minimal linux-3.3/kernel/time/timekeeping.c linux-3.3-vs2.3.3.1/ke } EXPORT_SYMBOL(getnstimeofday); -diff -NurpP --minimal linux-3.3/kernel/time.c linux-3.3-vs2.3.3.1/kernel/time.c ---- linux-3.3/kernel/time.c 2012-01-09 16:15:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/kernel/time.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/kernel/time.c linux-3.3.1-vs2.3.3.2/kernel/time.c +--- linux-3.3.1/kernel/time.c 2012-01-09 16:15:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/kernel/time.c 2012-02-24 03:55:06.000000000 +0100 @@ -92,7 +92,7 @@ SYSCALL_DEFINE1(stime, time_t __user *, if (err) return err; @@ -15294,9 +15294,9 @@ diff -NurpP --minimal linux-3.3/kernel/time.c linux-3.3-vs2.3.3.1/kernel/time.c } return 0; } -diff -NurpP --minimal linux-3.3/kernel/timer.c linux-3.3-vs2.3.3.1/kernel/timer.c ---- linux-3.3/kernel/timer.c 2012-03-19 19:47:30.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/kernel/timer.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/kernel/timer.c linux-3.3.1-vs2.3.3.2/kernel/timer.c +--- linux-3.3.1/kernel/timer.c 2012-03-19 19:47:30.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/kernel/timer.c 2012-02-24 03:55:06.000000000 +0100 @@ -40,6 +40,10 @@ #include #include @@ -15346,9 +15346,9 @@ diff -NurpP --minimal linux-3.3/kernel/timer.c linux-3.3-vs2.3.3.1/kernel/timer. SYSCALL_DEFINE0(getuid) { /* Only we change this so SMP safe */ -diff -NurpP --minimal linux-3.3/kernel/user_namespace.c linux-3.3-vs2.3.3.1/kernel/user_namespace.c ---- linux-3.3/kernel/user_namespace.c 2012-01-09 16:15:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/kernel/user_namespace.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/kernel/user_namespace.c linux-3.3.1-vs2.3.3.2/kernel/user_namespace.c +--- linux-3.3.1/kernel/user_namespace.c 2012-01-09 16:15:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/kernel/user_namespace.c 2012-02-24 03:55:06.000000000 +0100 @@ -11,6 +11,7 @@ #include #include @@ -15374,9 +15374,9 @@ diff -NurpP --minimal linux-3.3/kernel/user_namespace.c linux-3.3-vs2.3.3.1/kern INIT_WORK(&ns->destroyer, free_user_ns_work); schedule_work(&ns->destroyer); } -diff -NurpP --minimal linux-3.3/kernel/utsname.c linux-3.3-vs2.3.3.1/kernel/utsname.c ---- linux-3.3/kernel/utsname.c 2012-01-09 16:15:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/kernel/utsname.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/kernel/utsname.c linux-3.3.1-vs2.3.3.2/kernel/utsname.c +--- linux-3.3.1/kernel/utsname.c 2012-01-09 16:15:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/kernel/utsname.c 2012-02-24 03:55:06.000000000 +0100 @@ -16,14 +16,17 @@ #include #include @@ -15445,9 +15445,9 @@ diff -NurpP --minimal linux-3.3/kernel/utsname.c linux-3.3-vs2.3.3.1/kernel/utsn kfree(ns); } -diff -NurpP --minimal linux-3.3/kernel/vserver/Kconfig linux-3.3-vs2.3.3.1/kernel/vserver/Kconfig ---- linux-3.3/kernel/vserver/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/kernel/vserver/Kconfig 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/kernel/vserver/Kconfig linux-3.3.1-vs2.3.3.2/kernel/vserver/Kconfig +--- linux-3.3.1/kernel/vserver/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/kernel/vserver/Kconfig 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,224 @@ +# +# Linux VServer configuration @@ -15673,9 +15673,9 @@ diff -NurpP --minimal linux-3.3/kernel/vserver/Kconfig linux-3.3-vs2.3.3.1/kerne + bool + default n + -diff -NurpP --minimal linux-3.3/kernel/vserver/Makefile linux-3.3-vs2.3.3.1/kernel/vserver/Makefile ---- linux-3.3/kernel/vserver/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/kernel/vserver/Makefile 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/kernel/vserver/Makefile linux-3.3.1-vs2.3.3.2/kernel/vserver/Makefile +--- linux-3.3.1/kernel/vserver/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/kernel/vserver/Makefile 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,18 @@ +# +# Makefile for the Linux vserver routines. @@ -15695,9 +15695,9 @@ diff -NurpP --minimal linux-3.3/kernel/vserver/Makefile linux-3.3-vs2.3.3.1/kern +vserver-$(CONFIG_VSERVER_MONITOR) += monitor.o +vserver-$(CONFIG_VSERVER_DEVICE) += device.o + -diff -NurpP --minimal linux-3.3/kernel/vserver/cacct.c linux-3.3-vs2.3.3.1/kernel/vserver/cacct.c ---- linux-3.3/kernel/vserver/cacct.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/kernel/vserver/cacct.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/kernel/vserver/cacct.c linux-3.3.1-vs2.3.3.2/kernel/vserver/cacct.c +--- linux-3.3.1/kernel/vserver/cacct.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/kernel/vserver/cacct.c 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,42 @@ +/* + * linux/kernel/vserver/cacct.c @@ -15741,9 +15741,9 @@ diff -NurpP --minimal linux-3.3/kernel/vserver/cacct.c linux-3.3-vs2.3.3.1/kerne + return 0; +} + -diff -NurpP --minimal linux-3.3/kernel/vserver/cacct_init.h linux-3.3-vs2.3.3.1/kernel/vserver/cacct_init.h ---- linux-3.3/kernel/vserver/cacct_init.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/kernel/vserver/cacct_init.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/kernel/vserver/cacct_init.h linux-3.3.1-vs2.3.3.2/kernel/vserver/cacct_init.h +--- linux-3.3.1/kernel/vserver/cacct_init.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/kernel/vserver/cacct_init.h 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,25 @@ + + @@ -15770,9 +15770,9 @@ diff -NurpP --minimal linux-3.3/kernel/vserver/cacct_init.h linux-3.3-vs2.3.3.1/ + return; +} + -diff -NurpP --minimal linux-3.3/kernel/vserver/cacct_proc.h linux-3.3-vs2.3.3.1/kernel/vserver/cacct_proc.h ---- linux-3.3/kernel/vserver/cacct_proc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/kernel/vserver/cacct_proc.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/kernel/vserver/cacct_proc.h linux-3.3.1-vs2.3.3.2/kernel/vserver/cacct_proc.h +--- linux-3.3.1/kernel/vserver/cacct_proc.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/kernel/vserver/cacct_proc.h 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,53 @@ +#ifndef _VX_CACCT_PROC_H +#define _VX_CACCT_PROC_H @@ -15827,9 +15827,9 @@ diff -NurpP --minimal linux-3.3/kernel/vserver/cacct_proc.h linux-3.3-vs2.3.3.1/ +} + +#endif /* _VX_CACCT_PROC_H */ -diff -NurpP --minimal linux-3.3/kernel/vserver/context.c linux-3.3-vs2.3.3.1/kernel/vserver/context.c ---- linux-3.3/kernel/vserver/context.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/kernel/vserver/context.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/kernel/vserver/context.c linux-3.3.1-vs2.3.3.2/kernel/vserver/context.c +--- linux-3.3.1/kernel/vserver/context.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/kernel/vserver/context.c 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,1107 @@ +/* + * linux/kernel/vserver/context.c @@ -16938,9 +16938,9 @@ diff -NurpP --minimal linux-3.3/kernel/vserver/context.c linux-3.3-vs2.3.3.1/ker + +EXPORT_SYMBOL_GPL(free_vx_info); + -diff -NurpP --minimal linux-3.3/kernel/vserver/cvirt.c linux-3.3-vs2.3.3.1/kernel/vserver/cvirt.c ---- linux-3.3/kernel/vserver/cvirt.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/kernel/vserver/cvirt.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/kernel/vserver/cvirt.c linux-3.3.1-vs2.3.3.2/kernel/vserver/cvirt.c +--- linux-3.3.1/kernel/vserver/cvirt.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/kernel/vserver/cvirt.c 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,303 @@ +/* + * linux/kernel/vserver/cvirt.c @@ -17245,9 +17245,9 @@ diff -NurpP --minimal linux-3.3/kernel/vserver/cvirt.c linux-3.3-vs2.3.3.1/kerne + +#endif + -diff -NurpP --minimal linux-3.3/kernel/vserver/cvirt_init.h linux-3.3-vs2.3.3.1/kernel/vserver/cvirt_init.h ---- linux-3.3/kernel/vserver/cvirt_init.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/kernel/vserver/cvirt_init.h 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/kernel/vserver/cvirt_init.h linux-3.3.1-vs2.3.3.2/kernel/vserver/cvirt_init.h +--- linux-3.3.1/kernel/vserver/cvirt_init.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/kernel/vserver/cvirt_init.h 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,70 @@ + + @@ -17319,9 +17319,9 @@ diff -NurpP --minimal linux-3.3/kernel/vserver/cvirt_init.h linux-3.3-vs2.3.3.1/ + return; +} + -diff -NurpP --minimal linux-3.3/kernel/vserver/cvirt_proc.h linux-3.3-vs2.3.3.1/kernel/vserver/cvirt_proc.h ---- linux-3.3/kernel/vserver/cvirt_proc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/kernel/vserver/cvirt_proc.h 2012-02-24 17:26:10.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/kernel/vserver/cvirt_proc.h linux-3.3.1-vs2.3.3.2/kernel/vserver/cvirt_proc.h +--- linux-3.3.1/kernel/vserver/cvirt_proc.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/kernel/vserver/cvirt_proc.h 2012-02-24 17:26:10.000000000 +0100 @@ -0,0 +1,137 @@ +#ifndef _VX_CVIRT_PROC_H +#define _VX_CVIRT_PROC_H @@ -17460,9 +17460,9 @@ diff -NurpP --minimal linux-3.3/kernel/vserver/cvirt_proc.h linux-3.3-vs2.3.3.1/ +} + +#endif /* _VX_CVIRT_PROC_H */ -diff -NurpP --minimal linux-3.3/kernel/vserver/debug.c linux-3.3-vs2.3.3.1/kernel/vserver/debug.c ---- linux-3.3/kernel/vserver/debug.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/kernel/vserver/debug.c 2012-02-24 03:55:06.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/kernel/vserver/debug.c linux-3.3.1-vs2.3.3.2/kernel/vserver/debug.c +--- linux-3.3.1/kernel/vserver/debug.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/kernel/vserver/debug.c 2012-02-24 03:55:06.000000000 +0100 @@ -0,0 +1,32 @@ +/* + * kernel/vserver/debug.c @@ -17496,9 +17496,9 @@ diff -NurpP --minimal linux-3.3/kernel/vserver/debug.c linux-3.3-vs2.3.3.1/kerne + +EXPORT_SYMBOL_GPL(dump_vx_info); + -diff -NurpP --minimal linux-3.3/kernel/vserver/device.c linux-3.3-vs2.3.3.1/kernel/vserver/device.c ---- linux-3.3/kernel/vserver/device.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/kernel/vserver/device.c 2012-02-24 03:55:07.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/kernel/vserver/device.c linux-3.3.1-vs2.3.3.2/kernel/vserver/device.c +--- linux-3.3.1/kernel/vserver/device.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/kernel/vserver/device.c 2012-02-24 03:55:07.000000000 +0100 @@ -0,0 +1,443 @@ +/* + * linux/kernel/vserver/device.c @@ -17943,9 +17943,9 @@ diff -NurpP --minimal linux-3.3/kernel/vserver/device.c linux-3.3-vs2.3.3.1/kern +#endif /* CONFIG_COMPAT */ + + -diff -NurpP --minimal linux-3.3/kernel/vserver/dlimit.c linux-3.3-vs2.3.3.1/kernel/vserver/dlimit.c ---- linux-3.3/kernel/vserver/dlimit.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/kernel/vserver/dlimit.c 2012-02-24 03:55:07.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/kernel/vserver/dlimit.c linux-3.3.1-vs2.3.3.2/kernel/vserver/dlimit.c +--- linux-3.3.1/kernel/vserver/dlimit.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/kernel/vserver/dlimit.c 2012-02-24 03:55:07.000000000 +0100 @@ -0,0 +1,531 @@ +/* + * linux/kernel/vserver/dlimit.c @@ -18478,9 +18478,9 @@ diff -NurpP --minimal linux-3.3/kernel/vserver/dlimit.c linux-3.3-vs2.3.3.1/kern +EXPORT_SYMBOL_GPL(locate_dl_info); +EXPORT_SYMBOL_GPL(rcu_free_dl_info); + -diff -NurpP --minimal linux-3.3/kernel/vserver/helper.c linux-3.3-vs2.3.3.1/kernel/vserver/helper.c ---- linux-3.3/kernel/vserver/helper.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/kernel/vserver/helper.c 2012-02-24 03:55:07.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/kernel/vserver/helper.c linux-3.3.1-vs2.3.3.2/kernel/vserver/helper.c +--- linux-3.3.1/kernel/vserver/helper.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/kernel/vserver/helper.c 2012-02-24 03:55:07.000000000 +0100 @@ -0,0 +1,223 @@ +/* + * linux/kernel/vserver/helper.c @@ -18705,9 +18705,9 @@ diff -NurpP --minimal linux-3.3/kernel/vserver/helper.c linux-3.3-vs2.3.3.1/kern + return do_vshelper(vshelper_path, argv, envp, 1); +} + -diff -NurpP --minimal linux-3.3/kernel/vserver/history.c linux-3.3-vs2.3.3.1/kernel/vserver/history.c ---- linux-3.3/kernel/vserver/history.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/kernel/vserver/history.c 2012-02-24 03:55:07.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/kernel/vserver/history.c linux-3.3.1-vs2.3.3.2/kernel/vserver/history.c +--- linux-3.3.1/kernel/vserver/history.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/kernel/vserver/history.c 2012-02-24 03:55:07.000000000 +0100 @@ -0,0 +1,258 @@ +/* + * kernel/vserver/history.c @@ -18967,9 +18967,9 @@ diff -NurpP --minimal linux-3.3/kernel/vserver/history.c linux-3.3-vs2.3.3.1/ker + +#endif /* CONFIG_COMPAT */ + -diff -NurpP --minimal linux-3.3/kernel/vserver/inet.c linux-3.3-vs2.3.3.1/kernel/vserver/inet.c ---- linux-3.3/kernel/vserver/inet.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/kernel/vserver/inet.c 2012-02-24 03:55:07.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/kernel/vserver/inet.c linux-3.3.1-vs2.3.3.2/kernel/vserver/inet.c +--- linux-3.3.1/kernel/vserver/inet.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/kernel/vserver/inet.c 2012-02-24 03:55:07.000000000 +0100 @@ -0,0 +1,226 @@ + +#include @@ -19197,9 +19197,9 @@ diff -NurpP --minimal linux-3.3/kernel/vserver/inet.c linux-3.3-vs2.3.3.1/kernel + +EXPORT_SYMBOL_GPL(ip_v4_find_src); + -diff -NurpP --minimal linux-3.3/kernel/vserver/init.c linux-3.3-vs2.3.3.1/kernel/vserver/init.c ---- linux-3.3/kernel/vserver/init.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/kernel/vserver/init.c 2012-02-24 03:55:07.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/kernel/vserver/init.c linux-3.3.1-vs2.3.3.2/kernel/vserver/init.c +--- linux-3.3.1/kernel/vserver/init.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/kernel/vserver/init.c 2012-02-24 03:55:07.000000000 +0100 @@ -0,0 +1,45 @@ +/* + * linux/kernel/init.c @@ -19246,9 +19246,9 @@ diff -NurpP --minimal linux-3.3/kernel/vserver/init.c linux-3.3-vs2.3.3.1/kernel +module_init(init_vserver); +module_exit(exit_vserver); + -diff -NurpP --minimal linux-3.3/kernel/vserver/inode.c linux-3.3-vs2.3.3.1/kernel/vserver/inode.c ---- linux-3.3/kernel/vserver/inode.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/kernel/vserver/inode.c 2012-02-24 03:55:07.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/kernel/vserver/inode.c linux-3.3.1-vs2.3.3.2/kernel/vserver/inode.c +--- linux-3.3.1/kernel/vserver/inode.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/kernel/vserver/inode.c 2012-02-24 03:55:07.000000000 +0100 @@ -0,0 +1,437 @@ +/* + * linux/kernel/vserver/inode.c @@ -19687,9 +19687,9 @@ diff -NurpP --minimal linux-3.3/kernel/vserver/inode.c linux-3.3-vs2.3.3.1/kerne + +#endif /* CONFIG_PROPAGATE */ + -diff -NurpP --minimal linux-3.3/kernel/vserver/limit.c linux-3.3-vs2.3.3.1/kernel/vserver/limit.c ---- linux-3.3/kernel/vserver/limit.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/kernel/vserver/limit.c 2012-02-24 03:55:07.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/kernel/vserver/limit.c linux-3.3.1-vs2.3.3.2/kernel/vserver/limit.c +--- linux-3.3.1/kernel/vserver/limit.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/kernel/vserver/limit.c 2012-02-24 03:55:07.000000000 +0100 @@ -0,0 +1,330 @@ +/* + * linux/kernel/vserver/limit.c @@ -20021,9 +20021,9 @@ diff -NurpP --minimal linux-3.3/kernel/vserver/limit.c linux-3.3-vs2.3.3.1/kerne +#endif +} + -diff -NurpP --minimal linux-3.3/kernel/vserver/limit_init.h linux-3.3-vs2.3.3.1/kernel/vserver/limit_init.h ---- linux-3.3/kernel/vserver/limit_init.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/kernel/vserver/limit_init.h 2012-02-24 03:55:07.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/kernel/vserver/limit_init.h linux-3.3.1-vs2.3.3.2/kernel/vserver/limit_init.h +--- linux-3.3.1/kernel/vserver/limit_init.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/kernel/vserver/limit_init.h 2012-02-24 03:55:07.000000000 +0100 @@ -0,0 +1,31 @@ + + @@ -20056,9 +20056,9 @@ diff -NurpP --minimal linux-3.3/kernel/vserver/limit_init.h linux-3.3-vs2.3.3.1/ + } +} + -diff -NurpP --minimal linux-3.3/kernel/vserver/limit_proc.h linux-3.3-vs2.3.3.1/kernel/vserver/limit_proc.h ---- linux-3.3/kernel/vserver/limit_proc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/kernel/vserver/limit_proc.h 2012-02-24 03:55:07.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/kernel/vserver/limit_proc.h linux-3.3.1-vs2.3.3.2/kernel/vserver/limit_proc.h +--- linux-3.3.1/kernel/vserver/limit_proc.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/kernel/vserver/limit_proc.h 2012-02-24 03:55:07.000000000 +0100 @@ -0,0 +1,57 @@ +#ifndef _VX_LIMIT_PROC_H +#define _VX_LIMIT_PROC_H @@ -20117,9 +20117,9 @@ diff -NurpP --minimal linux-3.3/kernel/vserver/limit_proc.h linux-3.3-vs2.3.3.1/ +#endif /* _VX_LIMIT_PROC_H */ + + -diff -NurpP --minimal linux-3.3/kernel/vserver/network.c linux-3.3-vs2.3.3.1/kernel/vserver/network.c ---- linux-3.3/kernel/vserver/network.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/kernel/vserver/network.c 2012-02-24 03:55:07.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/kernel/vserver/network.c linux-3.3.1-vs2.3.3.2/kernel/vserver/network.c +--- linux-3.3.1/kernel/vserver/network.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/kernel/vserver/network.c 2012-02-24 03:55:07.000000000 +0100 @@ -0,0 +1,912 @@ +/* + * linux/kernel/vserver/network.c @@ -21033,9 +21033,9 @@ diff -NurpP --minimal linux-3.3/kernel/vserver/network.c linux-3.3-vs2.3.3.1/ker +EXPORT_SYMBOL_GPL(free_nx_info); +EXPORT_SYMBOL_GPL(unhash_nx_info); + -diff -NurpP --minimal linux-3.3/kernel/vserver/proc.c linux-3.3-vs2.3.3.1/kernel/vserver/proc.c ---- linux-3.3/kernel/vserver/proc.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/kernel/vserver/proc.c 2012-02-24 03:55:07.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/kernel/vserver/proc.c linux-3.3.1-vs2.3.3.2/kernel/vserver/proc.c +--- linux-3.3.1/kernel/vserver/proc.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/kernel/vserver/proc.c 2012-02-24 03:55:07.000000000 +0100 @@ -0,0 +1,1103 @@ +/* + * linux/kernel/vserver/proc.c @@ -22140,9 +22140,9 @@ diff -NurpP --minimal linux-3.3/kernel/vserver/proc.c linux-3.3-vs2.3.3.1/kernel + return buffer - orig; +} + -diff -NurpP --minimal linux-3.3/kernel/vserver/sched.c linux-3.3-vs2.3.3.1/kernel/vserver/sched.c ---- linux-3.3/kernel/vserver/sched.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/kernel/vserver/sched.c 2012-02-24 03:55:07.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/kernel/vserver/sched.c linux-3.3.1-vs2.3.3.2/kernel/vserver/sched.c +--- linux-3.3.1/kernel/vserver/sched.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/kernel/vserver/sched.c 2012-02-24 03:55:07.000000000 +0100 @@ -0,0 +1,82 @@ +/* + * linux/kernel/vserver/sched.c @@ -22226,9 +22226,9 @@ diff -NurpP --minimal linux-3.3/kernel/vserver/sched.c linux-3.3-vs2.3.3.1/kerne + return 0; +} + -diff -NurpP --minimal linux-3.3/kernel/vserver/sched_init.h linux-3.3-vs2.3.3.1/kernel/vserver/sched_init.h ---- linux-3.3/kernel/vserver/sched_init.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/kernel/vserver/sched_init.h 2012-02-24 03:55:07.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/kernel/vserver/sched_init.h linux-3.3.1-vs2.3.3.2/kernel/vserver/sched_init.h +--- linux-3.3.1/kernel/vserver/sched_init.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/kernel/vserver/sched_init.h 2012-02-24 03:55:07.000000000 +0100 @@ -0,0 +1,27 @@ + +static inline void vx_info_init_sched(struct _vx_sched *sched) @@ -22257,9 +22257,9 @@ diff -NurpP --minimal linux-3.3/kernel/vserver/sched_init.h linux-3.3-vs2.3.3.1/ +{ + return; +} -diff -NurpP --minimal linux-3.3/kernel/vserver/sched_proc.h linux-3.3-vs2.3.3.1/kernel/vserver/sched_proc.h ---- linux-3.3/kernel/vserver/sched_proc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/kernel/vserver/sched_proc.h 2012-02-24 03:55:07.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/kernel/vserver/sched_proc.h linux-3.3.1-vs2.3.3.2/kernel/vserver/sched_proc.h +--- linux-3.3.1/kernel/vserver/sched_proc.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/kernel/vserver/sched_proc.h 2012-02-24 03:55:07.000000000 +0100 @@ -0,0 +1,32 @@ +#ifndef _VX_SCHED_PROC_H +#define _VX_SCHED_PROC_H @@ -22293,9 +22293,9 @@ diff -NurpP --minimal linux-3.3/kernel/vserver/sched_proc.h linux-3.3-vs2.3.3.1/ +} + +#endif /* _VX_SCHED_PROC_H */ -diff -NurpP --minimal linux-3.3/kernel/vserver/signal.c linux-3.3-vs2.3.3.1/kernel/vserver/signal.c ---- linux-3.3/kernel/vserver/signal.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/kernel/vserver/signal.c 2012-02-24 03:55:07.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/kernel/vserver/signal.c linux-3.3.1-vs2.3.3.2/kernel/vserver/signal.c +--- linux-3.3.1/kernel/vserver/signal.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/kernel/vserver/signal.c 2012-02-24 03:55:07.000000000 +0100 @@ -0,0 +1,134 @@ +/* + * linux/kernel/vserver/signal.c @@ -22431,9 +22431,9 @@ diff -NurpP --minimal linux-3.3/kernel/vserver/signal.c linux-3.3-vs2.3.3.1/kern + return ret; +} + -diff -NurpP --minimal linux-3.3/kernel/vserver/space.c linux-3.3-vs2.3.3.1/kernel/vserver/space.c ---- linux-3.3/kernel/vserver/space.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/kernel/vserver/space.c 2012-02-24 17:01:40.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/kernel/vserver/space.c linux-3.3.1-vs2.3.3.2/kernel/vserver/space.c +--- linux-3.3.1/kernel/vserver/space.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/kernel/vserver/space.c 2012-02-24 17:01:40.000000000 +0100 @@ -0,0 +1,436 @@ +/* + * linux/kernel/vserver/space.c @@ -22871,9 +22871,9 @@ diff -NurpP --minimal linux-3.3/kernel/vserver/space.c linux-3.3-vs2.3.3.1/kerne + return 0; +} + -diff -NurpP --minimal linux-3.3/kernel/vserver/switch.c linux-3.3-vs2.3.3.1/kernel/vserver/switch.c ---- linux-3.3/kernel/vserver/switch.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/kernel/vserver/switch.c 2012-02-24 03:55:07.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/kernel/vserver/switch.c linux-3.3.1-vs2.3.3.2/kernel/vserver/switch.c +--- linux-3.3.1/kernel/vserver/switch.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/kernel/vserver/switch.c 2012-02-24 03:55:07.000000000 +0100 @@ -0,0 +1,556 @@ +/* + * linux/kernel/vserver/switch.c @@ -23431,9 +23431,9 @@ diff -NurpP --minimal linux-3.3/kernel/vserver/switch.c linux-3.3-vs2.3.3.1/kern +} + +#endif /* CONFIG_COMPAT */ -diff -NurpP --minimal linux-3.3/kernel/vserver/sysctl.c linux-3.3-vs2.3.3.1/kernel/vserver/sysctl.c ---- linux-3.3/kernel/vserver/sysctl.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/kernel/vserver/sysctl.c 2012-02-24 03:55:07.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/kernel/vserver/sysctl.c linux-3.3.1-vs2.3.3.2/kernel/vserver/sysctl.c +--- linux-3.3.1/kernel/vserver/sysctl.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/kernel/vserver/sysctl.c 2012-02-24 03:55:07.000000000 +0100 @@ -0,0 +1,247 @@ +/* + * kernel/vserver/sysctl.c @@ -23682,9 +23682,9 @@ diff -NurpP --minimal linux-3.3/kernel/vserver/sysctl.c linux-3.3-vs2.3.3.1/kern +EXPORT_SYMBOL_GPL(vs_debug_perm); +EXPORT_SYMBOL_GPL(vs_debug_misc); + -diff -NurpP --minimal linux-3.3/kernel/vserver/tag.c linux-3.3-vs2.3.3.1/kernel/vserver/tag.c ---- linux-3.3/kernel/vserver/tag.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/kernel/vserver/tag.c 2012-02-24 03:55:07.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/kernel/vserver/tag.c linux-3.3.1-vs2.3.3.2/kernel/vserver/tag.c +--- linux-3.3.1/kernel/vserver/tag.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/kernel/vserver/tag.c 2012-02-24 03:55:07.000000000 +0100 @@ -0,0 +1,63 @@ +/* + * linux/kernel/vserver/tag.c @@ -23749,9 +23749,9 @@ diff -NurpP --minimal linux-3.3/kernel/vserver/tag.c linux-3.3-vs2.3.3.1/kernel/ +} + + -diff -NurpP --minimal linux-3.3/kernel/vserver/vci_config.h linux-3.3-vs2.3.3.1/kernel/vserver/vci_config.h ---- linux-3.3/kernel/vserver/vci_config.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/kernel/vserver/vci_config.h 2012-02-24 03:55:07.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/kernel/vserver/vci_config.h linux-3.3.1-vs2.3.3.2/kernel/vserver/vci_config.h +--- linux-3.3.1/kernel/vserver/vci_config.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/kernel/vserver/vci_config.h 2012-02-24 03:55:07.000000000 +0100 @@ -0,0 +1,76 @@ + +/* interface version */ @@ -23829,9 +23829,9 @@ diff -NurpP --minimal linux-3.3/kernel/vserver/vci_config.h linux-3.3-vs2.3.3.1/ + 0; +} + -diff -NurpP --minimal linux-3.3/mm/memcontrol.c linux-3.3-vs2.3.3.1/mm/memcontrol.c ---- linux-3.3/mm/memcontrol.c 2012-03-19 19:47:30.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/mm/memcontrol.c 2012-03-19 20:52:10.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/mm/memcontrol.c linux-3.3.1-vs2.3.3.2/mm/memcontrol.c +--- linux-3.3.1/mm/memcontrol.c 2012-04-03 03:01:26.000000000 +0200 ++++ linux-3.3.1-vs2.3.3.2/mm/memcontrol.c 2012-04-03 03:02:13.000000000 +0200 @@ -839,6 +839,31 @@ struct mem_cgroup *mem_cgroup_from_task( struct mem_cgroup, css); } @@ -23864,9 +23864,9 @@ diff -NurpP --minimal linux-3.3/mm/memcontrol.c linux-3.3-vs2.3.3.1/mm/memcontro struct mem_cgroup *try_get_mem_cgroup_from_mm(struct mm_struct *mm) { struct mem_cgroup *memcg = NULL; -diff -NurpP --minimal linux-3.3/mm/oom_kill.c linux-3.3-vs2.3.3.1/mm/oom_kill.c ---- linux-3.3/mm/oom_kill.c 2012-03-19 19:47:30.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/mm/oom_kill.c 2012-02-24 04:15:27.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/mm/oom_kill.c linux-3.3.1-vs2.3.3.2/mm/oom_kill.c +--- linux-3.3.1/mm/oom_kill.c 2012-03-19 19:47:30.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/mm/oom_kill.c 2012-02-24 04:15:27.000000000 +0100 @@ -34,6 +34,8 @@ #include #include @@ -23941,9 +23941,9 @@ diff -NurpP --minimal linux-3.3/mm/oom_kill.c linux-3.3-vs2.3.3.1/mm/oom_kill.c } if (oom_kill_process(p, gfp_mask, order, points, totalpages, NULL, -diff -NurpP --minimal linux-3.3/mm/page_alloc.c linux-3.3-vs2.3.3.1/mm/page_alloc.c ---- linux-3.3/mm/page_alloc.c 2012-03-19 19:47:30.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/mm/page_alloc.c 2012-03-19 20:52:10.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/mm/page_alloc.c linux-3.3.1-vs2.3.3.2/mm/page_alloc.c +--- linux-3.3.1/mm/page_alloc.c 2012-03-19 19:47:30.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/mm/page_alloc.c 2012-03-19 20:52:10.000000000 +0100 @@ -58,6 +58,8 @@ #include #include @@ -23973,9 +23973,9 @@ diff -NurpP --minimal linux-3.3/mm/page_alloc.c linux-3.3-vs2.3.3.1/mm/page_allo } #endif -diff -NurpP --minimal linux-3.3/mm/pgtable-generic.c linux-3.3-vs2.3.3.1/mm/pgtable-generic.c ---- linux-3.3/mm/pgtable-generic.c 2011-03-15 18:07:42.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/mm/pgtable-generic.c 2012-02-24 03:55:07.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/mm/pgtable-generic.c linux-3.3.1-vs2.3.3.2/mm/pgtable-generic.c +--- linux-3.3.1/mm/pgtable-generic.c 2011-03-15 18:07:42.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/mm/pgtable-generic.c 2012-02-24 03:55:07.000000000 +0100 @@ -6,6 +6,8 @@ * Copyright (C) 2010 Linus Torvalds */ @@ -23985,9 +23985,9 @@ diff -NurpP --minimal linux-3.3/mm/pgtable-generic.c linux-3.3-vs2.3.3.1/mm/pgta #include #include #include -diff -NurpP --minimal linux-3.3/mm/shmem.c linux-3.3-vs2.3.3.1/mm/shmem.c ---- linux-3.3/mm/shmem.c 2012-03-19 19:47:30.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/mm/shmem.c 2012-02-24 03:55:07.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/mm/shmem.c linux-3.3.1-vs2.3.3.2/mm/shmem.c +--- linux-3.3.1/mm/shmem.c 2012-03-19 19:47:30.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/mm/shmem.c 2012-02-24 03:55:07.000000000 +0100 @@ -1460,7 +1460,7 @@ static int shmem_statfs(struct dentry *d { struct shmem_sb_info *sbinfo = SHMEM_SB(dentry->d_sb); @@ -24006,9 +24006,9 @@ diff -NurpP --minimal linux-3.3/mm/shmem.c linux-3.3-vs2.3.3.1/mm/shmem.c sb->s_op = &shmem_ops; sb->s_time_gran = 1; #ifdef CONFIG_TMPFS_XATTR -diff -NurpP --minimal linux-3.3/mm/slab.c linux-3.3-vs2.3.3.1/mm/slab.c ---- linux-3.3/mm/slab.c 2012-03-19 19:47:30.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/mm/slab.c 2012-02-24 03:55:07.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/mm/slab.c linux-3.3.1-vs2.3.3.2/mm/slab.c +--- linux-3.3.1/mm/slab.c 2012-03-19 19:47:30.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/mm/slab.c 2012-02-24 03:55:07.000000000 +0100 @@ -413,6 +413,8 @@ static void kmem_list3_init(struct kmem_ #define STATS_INC_FREEMISS(x) do { } while (0) #endif @@ -24042,9 +24042,9 @@ diff -NurpP --minimal linux-3.3/mm/slab.c linux-3.3-vs2.3.3.1/mm/slab.c kmemcheck_slab_free(cachep, objp, obj_size(cachep)); -diff -NurpP --minimal linux-3.3/mm/slab_vs.h linux-3.3-vs2.3.3.1/mm/slab_vs.h ---- linux-3.3/mm/slab_vs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/mm/slab_vs.h 2012-02-24 03:55:07.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/mm/slab_vs.h linux-3.3.1-vs2.3.3.2/mm/slab_vs.h +--- linux-3.3.1/mm/slab_vs.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/mm/slab_vs.h 2012-02-24 03:55:07.000000000 +0100 @@ -0,0 +1,29 @@ + +#include @@ -24075,9 +24075,9 @@ diff -NurpP --minimal linux-3.3/mm/slab_vs.h linux-3.3-vs2.3.3.1/mm/slab_vs.h + atomic_sub(cachep->buffer_size, &vxi->cacct.slab[what]); +} + -diff -NurpP --minimal linux-3.3/mm/swapfile.c linux-3.3-vs2.3.3.1/mm/swapfile.c ---- linux-3.3/mm/swapfile.c 2012-03-19 19:47:30.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/mm/swapfile.c 2012-02-24 03:55:07.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/mm/swapfile.c linux-3.3.1-vs2.3.3.2/mm/swapfile.c +--- linux-3.3.1/mm/swapfile.c 2012-04-03 03:01:26.000000000 +0200 ++++ linux-3.3.1-vs2.3.3.2/mm/swapfile.c 2012-04-03 03:02:13.000000000 +0200 @@ -36,6 +36,7 @@ #include #include @@ -24086,7 +24086,7 @@ diff -NurpP --minimal linux-3.3/mm/swapfile.c linux-3.3-vs2.3.3.1/mm/swapfile.c static bool swap_count_continued(struct swap_info_struct *, pgoff_t, unsigned char); -@@ -1754,6 +1755,16 @@ static int swap_show(struct seq_file *sw +@@ -1752,6 +1753,16 @@ static int swap_show(struct seq_file *sw if (si == SEQ_START_TOKEN) { seq_puts(swap,"Filename\t\t\t\tType\t\tSize\tUsed\tPriority\n"); @@ -24103,7 +24103,7 @@ diff -NurpP --minimal linux-3.3/mm/swapfile.c linux-3.3-vs2.3.3.1/mm/swapfile.c return 0; } -@@ -2177,6 +2188,8 @@ void si_swapinfo(struct sysinfo *val) +@@ -2175,6 +2186,8 @@ void si_swapinfo(struct sysinfo *val) val->freeswap = nr_swap_pages + nr_to_be_unused; val->totalswap = total_swap_pages + nr_to_be_unused; spin_unlock(&swap_lock); @@ -24112,9 +24112,9 @@ diff -NurpP --minimal linux-3.3/mm/swapfile.c linux-3.3-vs2.3.3.1/mm/swapfile.c } /* -diff -NurpP --minimal linux-3.3/net/bridge/br_multicast.c linux-3.3-vs2.3.3.1/net/bridge/br_multicast.c ---- linux-3.3/net/bridge/br_multicast.c 2012-03-19 19:47:32.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/net/bridge/br_multicast.c 2012-03-19 20:53:28.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/net/bridge/br_multicast.c linux-3.3.1-vs2.3.3.2/net/bridge/br_multicast.c +--- linux-3.3.1/net/bridge/br_multicast.c 2012-03-19 19:47:32.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/net/bridge/br_multicast.c 2012-03-19 20:53:28.000000000 +0100 @@ -447,7 +447,7 @@ static struct sk_buff *br_ip6_multicast_ ip6h->hop_limit = 1; ipv6_addr_set(&ip6h->daddr, htonl(0xff020000), 0, 0, htonl(1)); @@ -24124,9 +24124,9 @@ diff -NurpP --minimal linux-3.3/net/bridge/br_multicast.c linux-3.3-vs2.3.3.1/ne kfree_skb(skb); return NULL; } -diff -NurpP --minimal linux-3.3/net/core/dev.c linux-3.3-vs2.3.3.1/net/core/dev.c ---- linux-3.3/net/core/dev.c 2012-03-19 19:47:32.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/net/core/dev.c 2012-02-24 03:55:07.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/net/core/dev.c linux-3.3.1-vs2.3.3.2/net/core/dev.c +--- linux-3.3.1/net/core/dev.c 2012-04-03 03:01:26.000000000 +0200 ++++ linux-3.3.1-vs2.3.3.2/net/core/dev.c 2012-04-03 03:02:13.000000000 +0200 @@ -127,6 +127,7 @@ #include #include @@ -24224,7 +24224,7 @@ diff -NurpP --minimal linux-3.3/net/core/dev.c linux-3.3-vs2.3.3.1/net/core/dev. /* avoid cases where sscanf is not exact inverse of printf */ snprintf(buf, IFNAMSIZ, name, i); -@@ -4008,6 +4027,8 @@ static int dev_ifconf(struct net *net, c +@@ -4009,6 +4028,8 @@ static int dev_ifconf(struct net *net, c total = 0; for_each_netdev(net, dev) { @@ -24233,7 +24233,7 @@ diff -NurpP --minimal linux-3.3/net/core/dev.c linux-3.3-vs2.3.3.1/net/core/dev. for (i = 0; i < NPROTO; i++) { if (gifconf_list[i]) { int done; -@@ -4136,6 +4157,10 @@ static void dev_seq_printf_stats(struct +@@ -4137,6 +4158,10 @@ static void dev_seq_printf_stats(struct struct rtnl_link_stats64 temp; const struct rtnl_link_stats64 *stats = dev_get_stats(dev, &temp); @@ -24244,9 +24244,9 @@ diff -NurpP --minimal linux-3.3/net/core/dev.c linux-3.3-vs2.3.3.1/net/core/dev. 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-3.3/net/core/rtnetlink.c linux-3.3-vs2.3.3.1/net/core/rtnetlink.c ---- linux-3.3/net/core/rtnetlink.c 2012-03-19 19:47:33.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/net/core/rtnetlink.c 2012-03-19 20:52:10.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/net/core/rtnetlink.c linux-3.3.1-vs2.3.3.2/net/core/rtnetlink.c +--- linux-3.3.1/net/core/rtnetlink.c 2012-04-03 03:01:26.000000000 +0200 ++++ linux-3.3.1-vs2.3.3.2/net/core/rtnetlink.c 2012-04-03 03:02:13.000000000 +0200 @@ -1073,6 +1073,8 @@ static int rtnl_dump_ifinfo(struct sk_bu hlist_for_each_entry_rcu(dev, node, head, index_hlist) { if (idx < s_idx) @@ -24256,7 +24256,7 @@ diff -NurpP --minimal linux-3.3/net/core/rtnetlink.c linux-3.3-vs2.3.3.1/net/cor if (rtnl_fill_ifinfo(skb, dev, RTM_NEWLINK, NETLINK_CB(cb->skb).pid, cb->nlh->nlmsg_seq, 0, -@@ -1953,6 +1955,9 @@ void rtmsg_ifinfo(int type, struct net_d +@@ -1955,6 +1957,9 @@ void rtmsg_ifinfo(int type, struct net_d int err = -ENOBUFS; size_t if_info_size; @@ -24266,9 +24266,9 @@ diff -NurpP --minimal linux-3.3/net/core/rtnetlink.c linux-3.3-vs2.3.3.1/net/cor skb = nlmsg_new((if_info_size = if_nlmsg_size(dev, 0)), GFP_KERNEL); if (skb == NULL) goto errout; -diff -NurpP --minimal linux-3.3/net/core/sock.c linux-3.3-vs2.3.3.1/net/core/sock.c ---- linux-3.3/net/core/sock.c 2012-03-19 19:47:33.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/net/core/sock.c 2012-02-24 03:55:07.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/net/core/sock.c linux-3.3.1-vs2.3.3.2/net/core/sock.c +--- linux-3.3.1/net/core/sock.c 2012-03-19 19:47:33.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/net/core/sock.c 2012-02-24 03:55:07.000000000 +0100 @@ -130,6 +130,10 @@ #include @@ -24336,9 +24336,9 @@ diff -NurpP --minimal linux-3.3/net/core/sock.c linux-3.3-vs2.3.3.1/net/core/soc /* * Before updating sk_refcnt, we must commit prior changes to memory * (Documentation/RCU/rculist_nulls.txt for details) -diff -NurpP --minimal linux-3.3/net/ipv4/af_inet.c linux-3.3-vs2.3.3.1/net/ipv4/af_inet.c ---- linux-3.3/net/ipv4/af_inet.c 2012-03-19 19:47:33.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/net/ipv4/af_inet.c 2012-02-24 03:55:07.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/net/ipv4/af_inet.c linux-3.3.1-vs2.3.3.2/net/ipv4/af_inet.c +--- linux-3.3.1/net/ipv4/af_inet.c 2012-03-19 19:47:33.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/net/ipv4/af_inet.c 2012-02-24 03:55:07.000000000 +0100 @@ -117,6 +117,7 @@ #ifdef CONFIG_IP_MROUTE #include @@ -24416,9 +24416,9 @@ diff -NurpP --minimal linux-3.3/net/ipv4/af_inet.c linux-3.3-vs2.3.3.1/net/ipv4/ sin->sin_port = inet->inet_sport; sin->sin_addr.s_addr = addr; } -diff -NurpP --minimal linux-3.3/net/ipv4/arp.c linux-3.3-vs2.3.3.1/net/ipv4/arp.c ---- linux-3.3/net/ipv4/arp.c 2012-03-19 19:47:33.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/net/ipv4/arp.c 2012-02-24 03:55:07.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/net/ipv4/arp.c linux-3.3.1-vs2.3.3.2/net/ipv4/arp.c +--- linux-3.3.1/net/ipv4/arp.c 2012-03-19 19:47:33.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/net/ipv4/arp.c 2012-02-24 03:55:07.000000000 +0100 @@ -1329,6 +1329,7 @@ static void arp_format_neigh_entry(struc struct net_device *dev = n->dev; int hatype = dev->type; @@ -24435,9 +24435,9 @@ diff -NurpP --minimal linux-3.3/net/ipv4/arp.c linux-3.3-vs2.3.3.1/net/ipv4/arp. sprintf(tbuf, "%pI4", n->key); seq_printf(seq, "%-16s 0x%-10x0x%-10x%s * %s\n", tbuf, hatype, ATF_PUBL | ATF_PERM, "00:00:00:00:00:00", -diff -NurpP --minimal linux-3.3/net/ipv4/devinet.c linux-3.3-vs2.3.3.1/net/ipv4/devinet.c ---- linux-3.3/net/ipv4/devinet.c 2012-03-19 19:47:33.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/net/ipv4/devinet.c 2012-02-24 03:55:07.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/net/ipv4/devinet.c linux-3.3.1-vs2.3.3.2/net/ipv4/devinet.c +--- linux-3.3.1/net/ipv4/devinet.c 2012-03-19 19:47:33.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/net/ipv4/devinet.c 2012-02-24 03:55:07.000000000 +0100 @@ -518,6 +518,7 @@ struct in_device *inetdev_by_index(struc } EXPORT_SYMBOL(inetdev_by_index); @@ -24504,9 +24504,9 @@ diff -NurpP --minimal linux-3.3/net/ipv4/devinet.c linux-3.3-vs2.3.3.1/net/ipv4/ if (ip_idx < s_ip_idx) continue; if (inet_fill_ifaddr(skb, ifa, -diff -NurpP --minimal linux-3.3/net/ipv4/fib_trie.c linux-3.3-vs2.3.3.1/net/ipv4/fib_trie.c ---- linux-3.3/net/ipv4/fib_trie.c 2012-03-19 19:47:33.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/net/ipv4/fib_trie.c 2012-02-24 03:55:07.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/net/ipv4/fib_trie.c linux-3.3.1-vs2.3.3.2/net/ipv4/fib_trie.c +--- linux-3.3.1/net/ipv4/fib_trie.c 2012-03-19 19:47:33.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/net/ipv4/fib_trie.c 2012-02-24 03:55:07.000000000 +0100 @@ -2556,6 +2556,7 @@ static int fib_route_seq_show(struct seq || fa->fa_type == RTN_MULTICAST) continue; @@ -24515,9 +24515,9 @@ diff -NurpP --minimal linux-3.3/net/ipv4/fib_trie.c linux-3.3-vs2.3.3.1/net/ipv4 if (fi) seq_printf(seq, "%s\t%08X\t%08X\t%04X\t%d\t%u\t" -diff -NurpP --minimal linux-3.3/net/ipv4/inet_connection_sock.c linux-3.3-vs2.3.3.1/net/ipv4/inet_connection_sock.c ---- linux-3.3/net/ipv4/inet_connection_sock.c 2012-03-19 19:47:33.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/net/ipv4/inet_connection_sock.c 2012-02-24 03:55:07.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/net/ipv4/inet_connection_sock.c linux-3.3.1-vs2.3.3.2/net/ipv4/inet_connection_sock.c +--- linux-3.3.1/net/ipv4/inet_connection_sock.c 2012-03-19 19:47:33.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/net/ipv4/inet_connection_sock.c 2012-02-24 03:55:07.000000000 +0100 @@ -52,6 +52,37 @@ void inet_get_local_port_range(int *low, } EXPORT_SYMBOL(inet_get_local_port_range); @@ -24567,9 +24567,9 @@ diff -NurpP --minimal linux-3.3/net/ipv4/inet_connection_sock.c linux-3.3-vs2.3. break; } } -diff -NurpP --minimal linux-3.3/net/ipv4/inet_diag.c linux-3.3-vs2.3.3.1/net/ipv4/inet_diag.c ---- linux-3.3/net/ipv4/inet_diag.c 2012-03-19 19:47:33.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/net/ipv4/inet_diag.c 2012-02-24 04:26:38.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/net/ipv4/inet_diag.c linux-3.3.1-vs2.3.3.2/net/ipv4/inet_diag.c +--- linux-3.3.1/net/ipv4/inet_diag.c 2012-03-19 19:47:33.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/net/ipv4/inet_diag.c 2012-02-24 04:26:38.000000000 +0100 @@ -31,6 +31,8 @@ #include @@ -24680,9 +24680,9 @@ diff -NurpP --minimal linux-3.3/net/ipv4/inet_diag.c linux-3.3-vs2.3.3.1/net/ipv if (num < s_num) goto next_dying; if (r->sdiag_family != AF_UNSPEC && -diff -NurpP --minimal linux-3.3/net/ipv4/inet_hashtables.c linux-3.3-vs2.3.3.1/net/ipv4/inet_hashtables.c ---- linux-3.3/net/ipv4/inet_hashtables.c 2011-10-24 18:45:34.000000000 +0200 -+++ linux-3.3-vs2.3.3.1/net/ipv4/inet_hashtables.c 2012-02-24 03:55:07.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/net/ipv4/inet_hashtables.c linux-3.3.1-vs2.3.3.2/net/ipv4/inet_hashtables.c +--- linux-3.3.1/net/ipv4/inet_hashtables.c 2011-10-24 18:45:34.000000000 +0200 ++++ linux-3.3.1-vs2.3.3.2/net/ipv4/inet_hashtables.c 2012-02-24 03:55:07.000000000 +0100 @@ -22,6 +22,7 @@ #include #include @@ -24719,9 +24719,9 @@ diff -NurpP --minimal linux-3.3/net/ipv4/inet_hashtables.c linux-3.3-vs2.3.3.1/n /* * 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-3.3/net/ipv4/netfilter/nf_nat_helper.c linux-3.3-vs2.3.3.1/net/ipv4/netfilter/nf_nat_helper.c ---- linux-3.3/net/ipv4/netfilter/nf_nat_helper.c 2012-03-19 19:47:33.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/net/ipv4/netfilter/nf_nat_helper.c 2012-02-24 03:55:07.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/net/ipv4/netfilter/nf_nat_helper.c linux-3.3.1-vs2.3.3.2/net/ipv4/netfilter/nf_nat_helper.c +--- linux-3.3.1/net/ipv4/netfilter/nf_nat_helper.c 2012-03-19 19:47:33.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/net/ipv4/netfilter/nf_nat_helper.c 2012-02-24 03:55:07.000000000 +0100 @@ -20,6 +20,7 @@ #include @@ -24730,9 +24730,9 @@ diff -NurpP --minimal linux-3.3/net/ipv4/netfilter/nf_nat_helper.c linux-3.3-vs2 #include #include #include -diff -NurpP --minimal linux-3.3/net/ipv4/netfilter.c linux-3.3-vs2.3.3.1/net/ipv4/netfilter.c ---- linux-3.3/net/ipv4/netfilter.c 2012-01-09 16:15:03.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/net/ipv4/netfilter.c 2012-02-24 03:55:07.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/net/ipv4/netfilter.c linux-3.3.1-vs2.3.3.2/net/ipv4/netfilter.c +--- linux-3.3.1/net/ipv4/netfilter.c 2012-01-09 16:15:03.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/net/ipv4/netfilter.c 2012-02-24 03:55:07.000000000 +0100 @@ -6,7 +6,7 @@ #include #include @@ -24742,9 +24742,9 @@ diff -NurpP --minimal linux-3.3/net/ipv4/netfilter.c linux-3.3-vs2.3.3.1/net/ipv #include #include #include -diff -NurpP --minimal linux-3.3/net/ipv4/raw.c linux-3.3-vs2.3.3.1/net/ipv4/raw.c ---- linux-3.3/net/ipv4/raw.c 2012-03-19 19:47:33.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/net/ipv4/raw.c 2012-02-24 03:55:07.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/net/ipv4/raw.c linux-3.3.1-vs2.3.3.2/net/ipv4/raw.c +--- linux-3.3.1/net/ipv4/raw.c 2012-03-19 19:47:33.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/net/ipv4/raw.c 2012-02-24 03:55:07.000000000 +0100 @@ -118,7 +118,7 @@ static struct sock *__raw_v4_lookup(stru if (net_eq(sock_net(sk), net) && inet->inet_num == num && @@ -24837,9 +24837,9 @@ diff -NurpP --minimal linux-3.3/net/ipv4/raw.c linux-3.3-vs2.3.3.1/net/ipv4/raw. if (!sk && ++state->bucket < RAW_HTABLE_SIZE) { sk = sk_head(&state->h->ht[state->bucket]); -diff -NurpP --minimal linux-3.3/net/ipv4/route.c linux-3.3-vs2.3.3.1/net/ipv4/route.c ---- linux-3.3/net/ipv4/route.c 2012-03-19 19:47:33.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/net/ipv4/route.c 2012-03-19 20:52:10.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/net/ipv4/route.c linux-3.3.1-vs2.3.3.2/net/ipv4/route.c +--- linux-3.3.1/net/ipv4/route.c 2012-03-19 19:47:33.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/net/ipv4/route.c 2012-03-19 20:52:10.000000000 +0100 @@ -2697,7 +2697,7 @@ static struct rtable *ip_route_output_sl @@ -24849,9 +24849,9 @@ diff -NurpP --minimal linux-3.3/net/ipv4/route.c linux-3.3-vs2.3.3.1/net/ipv4/ro rth = ERR_PTR(-ENODEV); if (dev_out == NULL) goto out; -diff -NurpP --minimal linux-3.3/net/ipv4/tcp.c linux-3.3-vs2.3.3.1/net/ipv4/tcp.c ---- linux-3.3/net/ipv4/tcp.c 2012-03-19 19:47:33.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/net/ipv4/tcp.c 2012-03-19 20:52:10.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/net/ipv4/tcp.c linux-3.3.1-vs2.3.3.2/net/ipv4/tcp.c +--- linux-3.3.1/net/ipv4/tcp.c 2012-03-19 19:47:33.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/net/ipv4/tcp.c 2012-03-19 20:52:10.000000000 +0100 @@ -266,6 +266,7 @@ #include #include @@ -24860,9 +24860,9 @@ diff -NurpP --minimal linux-3.3/net/ipv4/tcp.c linux-3.3-vs2.3.3.1/net/ipv4/tcp. #include #include -diff -NurpP --minimal linux-3.3/net/ipv4/tcp_ipv4.c linux-3.3-vs2.3.3.1/net/ipv4/tcp_ipv4.c ---- linux-3.3/net/ipv4/tcp_ipv4.c 2012-03-19 19:47:33.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/net/ipv4/tcp_ipv4.c 2012-03-19 20:52:10.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/net/ipv4/tcp_ipv4.c linux-3.3.1-vs2.3.3.2/net/ipv4/tcp_ipv4.c +--- linux-3.3.1/net/ipv4/tcp_ipv4.c 2012-03-19 19:47:33.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/net/ipv4/tcp_ipv4.c 2012-03-19 20:52:10.000000000 +0100 @@ -2036,6 +2036,12 @@ static void *listening_get_next(struct s req = req->dl_next; while (1) { @@ -24968,9 +24968,9 @@ diff -NurpP --minimal linux-3.3/net/ipv4/tcp_ipv4.c linux-3.3-vs2.3.3.1/net/ipv4 destp = ntohs(tw->tw_dport); srcp = ntohs(tw->tw_sport); -diff -NurpP --minimal linux-3.3/net/ipv4/tcp_minisocks.c linux-3.3-vs2.3.3.1/net/ipv4/tcp_minisocks.c ---- linux-3.3/net/ipv4/tcp_minisocks.c 2012-03-19 19:47:33.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/net/ipv4/tcp_minisocks.c 2012-02-24 04:25:11.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/net/ipv4/tcp_minisocks.c linux-3.3.1-vs2.3.3.2/net/ipv4/tcp_minisocks.c +--- linux-3.3.1/net/ipv4/tcp_minisocks.c 2012-03-19 19:47:33.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/net/ipv4/tcp_minisocks.c 2012-02-24 04:25:11.000000000 +0100 @@ -23,6 +23,9 @@ #include #include @@ -24993,9 +24993,9 @@ diff -NurpP --minimal linux-3.3/net/ipv4/tcp_minisocks.c linux-3.3-vs2.3.3.1/net #if IS_ENABLED(CONFIG_IPV6) if (tw->tw_family == PF_INET6) { struct ipv6_pinfo *np = inet6_sk(sk); -diff -NurpP --minimal linux-3.3/net/ipv4/udp.c linux-3.3-vs2.3.3.1/net/ipv4/udp.c ---- linux-3.3/net/ipv4/udp.c 2012-03-19 19:47:33.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/net/ipv4/udp.c 2012-02-24 03:55:07.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/net/ipv4/udp.c linux-3.3.1-vs2.3.3.2/net/ipv4/udp.c +--- linux-3.3.1/net/ipv4/udp.c 2012-03-19 19:47:33.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/net/ipv4/udp.c 2012-02-24 03:55:07.000000000 +0100 @@ -297,14 +297,7 @@ fail: } EXPORT_SYMBOL(udp_lib_get_port); @@ -25117,9 +25117,9 @@ diff -NurpP --minimal linux-3.3/net/ipv4/udp.c linux-3.3-vs2.3.3.1/net/ipv4/udp. if (!sk) { if (state->bucket <= state->udp_table->mask) -diff -NurpP --minimal linux-3.3/net/ipv6/Kconfig linux-3.3-vs2.3.3.1/net/ipv6/Kconfig ---- linux-3.3/net/ipv6/Kconfig 2010-08-02 16:52:59.000000000 +0200 -+++ linux-3.3-vs2.3.3.1/net/ipv6/Kconfig 2012-02-24 03:55:07.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/net/ipv6/Kconfig linux-3.3.1-vs2.3.3.2/net/ipv6/Kconfig +--- linux-3.3.1/net/ipv6/Kconfig 2010-08-02 16:52:59.000000000 +0200 ++++ linux-3.3.1-vs2.3.3.2/net/ipv6/Kconfig 2012-02-24 03:55:07.000000000 +0100 @@ -4,8 +4,8 @@ # IPv6 as module will cause a CRASH if you try to unload it @@ -25131,9 +25131,9 @@ diff -NurpP --minimal linux-3.3/net/ipv6/Kconfig linux-3.3-vs2.3.3.1/net/ipv6/Kc ---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-3.3/net/ipv6/addrconf.c linux-3.3-vs2.3.3.1/net/ipv6/addrconf.c ---- linux-3.3/net/ipv6/addrconf.c 2012-03-19 19:47:33.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/net/ipv6/addrconf.c 2012-03-19 20:52:10.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/net/ipv6/addrconf.c linux-3.3.1-vs2.3.3.2/net/ipv6/addrconf.c +--- linux-3.3.1/net/ipv6/addrconf.c 2012-03-19 19:47:33.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/net/ipv6/addrconf.c 2012-03-19 20:52:10.000000000 +0100 @@ -88,6 +88,8 @@ #include #include @@ -25233,9 +25233,9 @@ diff -NurpP --minimal linux-3.3/net/ipv6/addrconf.c linux-3.3-vs2.3.3.1/net/ipv6 idev = __in6_dev_get(dev); if (!idev) goto cont; -diff -NurpP --minimal linux-3.3/net/ipv6/af_inet6.c linux-3.3-vs2.3.3.1/net/ipv6/af_inet6.c ---- linux-3.3/net/ipv6/af_inet6.c 2012-03-19 19:47:33.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/net/ipv6/af_inet6.c 2012-02-24 04:23:27.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/net/ipv6/af_inet6.c linux-3.3.1-vs2.3.3.2/net/ipv6/af_inet6.c +--- linux-3.3.1/net/ipv6/af_inet6.c 2012-03-19 19:47:33.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/net/ipv6/af_inet6.c 2012-02-24 04:23:27.000000000 +0100 @@ -42,6 +42,8 @@ #include #include @@ -25331,9 +25331,9 @@ diff -NurpP --minimal linux-3.3/net/ipv6/af_inet6.c linux-3.3-vs2.3.3.1/net/ipv6 if (ipv6_addr_any(&np->rcv_saddr)) sin->sin6_addr = np->saddr; else -diff -NurpP --minimal linux-3.3/net/ipv6/datagram.c linux-3.3-vs2.3.3.1/net/ipv6/datagram.c ---- linux-3.3/net/ipv6/datagram.c 2012-03-19 19:47:33.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/net/ipv6/datagram.c 2012-02-24 03:55:07.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/net/ipv6/datagram.c linux-3.3.1-vs2.3.3.2/net/ipv6/datagram.c +--- linux-3.3.1/net/ipv6/datagram.c 2012-03-19 19:47:33.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/net/ipv6/datagram.c 2012-02-24 03:55:07.000000000 +0100 @@ -642,7 +642,7 @@ int datagram_send_ctl(struct net *net, s rcu_read_lock(); @@ -25343,9 +25343,9 @@ diff -NurpP --minimal linux-3.3/net/ipv6/datagram.c linux-3.3-vs2.3.3.1/net/ipv6 if (!dev) { rcu_read_unlock(); return -ENODEV; -diff -NurpP --minimal linux-3.3/net/ipv6/fib6_rules.c linux-3.3-vs2.3.3.1/net/ipv6/fib6_rules.c ---- linux-3.3/net/ipv6/fib6_rules.c 2012-03-19 19:47:33.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/net/ipv6/fib6_rules.c 2012-02-24 03:55:07.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/net/ipv6/fib6_rules.c linux-3.3.1-vs2.3.3.2/net/ipv6/fib6_rules.c +--- linux-3.3.1/net/ipv6/fib6_rules.c 2012-03-19 19:47:33.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/net/ipv6/fib6_rules.c 2012-02-24 03:55:07.000000000 +0100 @@ -91,7 +91,7 @@ static int fib6_rule_action(struct fib_r ip6_dst_idev(&rt->dst)->dev, &flp6->daddr, @@ -25355,9 +25355,9 @@ diff -NurpP --minimal linux-3.3/net/ipv6/fib6_rules.c linux-3.3-vs2.3.3.1/net/ip goto again; if (!ipv6_prefix_equal(&saddr, &r->src.addr, r->src.plen)) -diff -NurpP --minimal linux-3.3/net/ipv6/inet6_hashtables.c linux-3.3-vs2.3.3.1/net/ipv6/inet6_hashtables.c ---- linux-3.3/net/ipv6/inet6_hashtables.c 2011-10-24 18:45:34.000000000 +0200 -+++ linux-3.3-vs2.3.3.1/net/ipv6/inet6_hashtables.c 2012-02-24 03:55:07.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/net/ipv6/inet6_hashtables.c linux-3.3.1-vs2.3.3.2/net/ipv6/inet6_hashtables.c +--- linux-3.3.1/net/ipv6/inet6_hashtables.c 2011-10-24 18:45:34.000000000 +0200 ++++ linux-3.3.1-vs2.3.3.2/net/ipv6/inet6_hashtables.c 2012-02-24 03:55:07.000000000 +0100 @@ -16,6 +16,7 @@ #include @@ -25393,9 +25393,9 @@ diff -NurpP --minimal linux-3.3/net/ipv6/inet6_hashtables.c linux-3.3-vs2.3.3.1/ } if (sk->sk_bound_dev_if) { if (sk->sk_bound_dev_if != dif) -diff -NurpP --minimal linux-3.3/net/ipv6/ip6_output.c linux-3.3-vs2.3.3.1/net/ipv6/ip6_output.c ---- linux-3.3/net/ipv6/ip6_output.c 2012-03-19 19:47:33.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/net/ipv6/ip6_output.c 2012-02-24 03:55:07.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/net/ipv6/ip6_output.c linux-3.3.1-vs2.3.3.2/net/ipv6/ip6_output.c +--- linux-3.3.1/net/ipv6/ip6_output.c 2012-04-03 03:01:26.000000000 +0200 ++++ linux-3.3.1-vs2.3.3.2/net/ipv6/ip6_output.c 2012-04-03 03:02:13.000000000 +0200 @@ -968,7 +968,8 @@ static int ip6_dst_lookup_tail(struct so struct rt6_info *rt = (struct rt6_info *) *dst; err = ip6_route_get_saddr(net, rt, &fl6->daddr, @@ -25406,9 +25406,9 @@ diff -NurpP --minimal linux-3.3/net/ipv6/ip6_output.c linux-3.3-vs2.3.3.1/net/ip if (err) goto out_err_release; } -diff -NurpP --minimal linux-3.3/net/ipv6/ndisc.c linux-3.3-vs2.3.3.1/net/ipv6/ndisc.c ---- linux-3.3/net/ipv6/ndisc.c 2012-03-19 19:47:33.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/net/ipv6/ndisc.c 2012-03-19 20:52:10.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/net/ipv6/ndisc.c linux-3.3.1-vs2.3.3.2/net/ipv6/ndisc.c +--- linux-3.3.1/net/ipv6/ndisc.c 2012-03-19 19:47:33.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/net/ipv6/ndisc.c 2012-03-19 20:52:10.000000000 +0100 @@ -575,7 +575,7 @@ static void ndisc_send_na(struct net_dev } else { if (ipv6_dev_get_saddr(dev_net(dev), dev, daddr, @@ -25418,9 +25418,9 @@ diff -NurpP --minimal linux-3.3/net/ipv6/ndisc.c linux-3.3-vs2.3.3.1/net/ipv6/nd return; src_addr = &tmpaddr; } -diff -NurpP --minimal linux-3.3/net/ipv6/raw.c linux-3.3-vs2.3.3.1/net/ipv6/raw.c ---- linux-3.3/net/ipv6/raw.c 2012-03-19 19:47:33.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/net/ipv6/raw.c 2012-02-24 03:55:07.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/net/ipv6/raw.c linux-3.3.1-vs2.3.3.2/net/ipv6/raw.c +--- linux-3.3.1/net/ipv6/raw.c 2012-03-19 19:47:33.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/net/ipv6/raw.c 2012-02-24 03:55:07.000000000 +0100 @@ -30,6 +30,7 @@ #include #include @@ -25443,9 +25443,9 @@ diff -NurpP --minimal linux-3.3/net/ipv6/raw.c linux-3.3-vs2.3.3.1/net/ipv6/raw. /* ipv4 addr of the socket is invalid. Only the * unspecified and mapped address have a v4 equivalent. */ -diff -NurpP --minimal linux-3.3/net/ipv6/route.c linux-3.3-vs2.3.3.1/net/ipv6/route.c ---- linux-3.3/net/ipv6/route.c 2012-03-19 19:47:33.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/net/ipv6/route.c 2012-03-19 20:52:10.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/net/ipv6/route.c linux-3.3.1-vs2.3.3.2/net/ipv6/route.c +--- linux-3.3.1/net/ipv6/route.c 2012-04-03 03:01:26.000000000 +0200 ++++ linux-3.3.1-vs2.3.3.2/net/ipv6/route.c 2012-04-03 03:02:13.000000000 +0200 @@ -55,6 +55,7 @@ #include #include @@ -25485,7 +25485,7 @@ diff -NurpP --minimal linux-3.3/net/ipv6/route.c linux-3.3-vs2.3.3.1/net/ipv6/ro NLA_PUT(skb, RTA_PREFSRC, 16, &saddr_buf); } -@@ -2656,6 +2660,7 @@ static int rt6_info_route(struct rt6_inf +@@ -2660,6 +2664,7 @@ static int rt6_info_route(struct rt6_inf struct seq_file *m = p_arg; struct neighbour *n; @@ -25493,9 +25493,9 @@ diff -NurpP --minimal linux-3.3/net/ipv6/route.c linux-3.3-vs2.3.3.1/net/ipv6/ro seq_printf(m, "%pi6 %02x ", &rt->rt6i_dst.addr, rt->rt6i_dst.plen); #ifdef CONFIG_IPV6_SUBTREES -diff -NurpP --minimal linux-3.3/net/ipv6/tcp_ipv6.c linux-3.3-vs2.3.3.1/net/ipv6/tcp_ipv6.c ---- linux-3.3/net/ipv6/tcp_ipv6.c 2012-03-19 19:47:33.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/net/ipv6/tcp_ipv6.c 2012-02-24 03:55:07.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/net/ipv6/tcp_ipv6.c linux-3.3.1-vs2.3.3.2/net/ipv6/tcp_ipv6.c +--- linux-3.3.1/net/ipv6/tcp_ipv6.c 2012-03-19 19:47:33.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/net/ipv6/tcp_ipv6.c 2012-02-24 03:55:07.000000000 +0100 @@ -71,6 +71,7 @@ #include @@ -25522,9 +25522,9 @@ diff -NurpP --minimal linux-3.3/net/ipv6/tcp_ipv6.c linux-3.3-vs2.3.3.1/net/ipv6 addr_type = ipv6_addr_type(&usin->sin6_addr); -diff -NurpP --minimal linux-3.3/net/ipv6/udp.c linux-3.3-vs2.3.3.1/net/ipv6/udp.c ---- linux-3.3/net/ipv6/udp.c 2012-03-19 19:47:33.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/net/ipv6/udp.c 2012-02-24 03:55:07.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/net/ipv6/udp.c linux-3.3.1-vs2.3.3.2/net/ipv6/udp.c +--- linux-3.3.1/net/ipv6/udp.c 2012-03-19 19:47:33.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/net/ipv6/udp.c 2012-02-24 03:55:07.000000000 +0100 @@ -45,41 +45,67 @@ #include #include @@ -25617,9 +25617,9 @@ diff -NurpP --minimal linux-3.3/net/ipv6/udp.c linux-3.3-vs2.3.3.1/net/ipv6/udp. } if (!ipv6_addr_any(&np->daddr)) { if (!ipv6_addr_equal(&np->daddr, saddr)) -diff -NurpP --minimal linux-3.3/net/ipv6/xfrm6_policy.c linux-3.3-vs2.3.3.1/net/ipv6/xfrm6_policy.c ---- linux-3.3/net/ipv6/xfrm6_policy.c 2012-03-19 19:47:33.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/net/ipv6/xfrm6_policy.c 2012-02-24 03:55:07.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/net/ipv6/xfrm6_policy.c linux-3.3.1-vs2.3.3.2/net/ipv6/xfrm6_policy.c +--- linux-3.3.1/net/ipv6/xfrm6_policy.c 2012-03-19 19:47:33.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/net/ipv6/xfrm6_policy.c 2012-02-24 03:55:07.000000000 +0100 @@ -63,7 +63,7 @@ static int xfrm6_get_saddr(struct net *n dev = ip6_dst_idev(dst)->dev; ipv6_dev_get_saddr(dev_net(dev), dev, @@ -25629,9 +25629,9 @@ diff -NurpP --minimal linux-3.3/net/ipv6/xfrm6_policy.c linux-3.3-vs2.3.3.1/net/ dst_release(dst); return 0; } -diff -NurpP --minimal linux-3.3/net/netfilter/ipvs/ip_vs_xmit.c linux-3.3-vs2.3.3.1/net/netfilter/ipvs/ip_vs_xmit.c ---- linux-3.3/net/netfilter/ipvs/ip_vs_xmit.c 2012-03-19 19:47:33.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/net/netfilter/ipvs/ip_vs_xmit.c 2012-02-24 03:55:07.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/net/netfilter/ipvs/ip_vs_xmit.c linux-3.3.1-vs2.3.3.2/net/netfilter/ipvs/ip_vs_xmit.c +--- linux-3.3.1/net/netfilter/ipvs/ip_vs_xmit.c 2012-03-19 19:47:33.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/net/netfilter/ipvs/ip_vs_xmit.c 2012-02-24 03:55:07.000000000 +0100 @@ -226,7 +226,7 @@ __ip_vs_route_output_v6(struct net *net, return dst; if (ipv6_addr_any(&fl6.saddr) && @@ -25641,9 +25641,9 @@ diff -NurpP --minimal linux-3.3/net/netfilter/ipvs/ip_vs_xmit.c linux-3.3-vs2.3. goto out_err; if (do_xfrm) { dst = xfrm_lookup(net, dst, flowi6_to_flowi(&fl6), NULL, 0); -diff -NurpP --minimal linux-3.3/net/netlink/af_netlink.c linux-3.3-vs2.3.3.1/net/netlink/af_netlink.c ---- linux-3.3/net/netlink/af_netlink.c 2012-03-19 19:47:33.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/net/netlink/af_netlink.c 2012-02-24 03:55:07.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/net/netlink/af_netlink.c linux-3.3.1-vs2.3.3.2/net/netlink/af_netlink.c +--- linux-3.3.1/net/netlink/af_netlink.c 2012-03-19 19:47:33.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/net/netlink/af_netlink.c 2012-02-24 03:55:07.000000000 +0100 @@ -55,6 +55,9 @@ #include #include @@ -25683,9 +25683,9 @@ diff -NurpP --minimal linux-3.3/net/netlink/af_netlink.c linux-3.3-vs2.3.3.1/net s = sk_next(s); if (s) { iter->link = i; -diff -NurpP --minimal linux-3.3/net/socket.c linux-3.3-vs2.3.3.1/net/socket.c ---- linux-3.3/net/socket.c 2012-03-19 19:47:33.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/net/socket.c 2012-02-24 03:55:07.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/net/socket.c linux-3.3.1-vs2.3.3.2/net/socket.c +--- linux-3.3.1/net/socket.c 2012-03-19 19:47:33.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/net/socket.c 2012-02-24 03:55:07.000000000 +0100 @@ -98,6 +98,10 @@ #include @@ -25792,9 +25792,9 @@ diff -NurpP --minimal linux-3.3/net/socket.c linux-3.3-vs2.3.3.1/net/socket.c err = sock1->ops->socketpair(sock1, sock2); if (err < 0) -diff -NurpP --minimal linux-3.3/net/sunrpc/auth.c linux-3.3-vs2.3.3.1/net/sunrpc/auth.c ---- linux-3.3/net/sunrpc/auth.c 2011-10-24 18:45:34.000000000 +0200 -+++ linux-3.3-vs2.3.3.1/net/sunrpc/auth.c 2012-02-24 03:55:07.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/net/sunrpc/auth.c linux-3.3.1-vs2.3.3.2/net/sunrpc/auth.c +--- linux-3.3.1/net/sunrpc/auth.c 2011-10-24 18:45:34.000000000 +0200 ++++ linux-3.3.1-vs2.3.3.2/net/sunrpc/auth.c 2012-02-24 03:55:07.000000000 +0100 @@ -14,6 +14,7 @@ #include #include @@ -25819,9 +25819,9 @@ diff -NurpP --minimal linux-3.3/net/sunrpc/auth.c linux-3.3-vs2.3.3.1/net/sunrpc }; dprintk("RPC: %5u looking up %s cred\n", -diff -NurpP --minimal linux-3.3/net/sunrpc/auth_unix.c linux-3.3-vs2.3.3.1/net/sunrpc/auth_unix.c ---- linux-3.3/net/sunrpc/auth_unix.c 2012-01-09 16:15:04.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/net/sunrpc/auth_unix.c 2012-02-24 03:55:07.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/net/sunrpc/auth_unix.c linux-3.3.1-vs2.3.3.2/net/sunrpc/auth_unix.c +--- linux-3.3.1/net/sunrpc/auth_unix.c 2012-01-09 16:15:04.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/net/sunrpc/auth_unix.c 2012-02-24 03:55:07.000000000 +0100 @@ -12,12 +12,14 @@ #include #include @@ -25880,9 +25880,9 @@ diff -NurpP --minimal linux-3.3/net/sunrpc/auth_unix.c linux-3.3-vs2.3.3.1/net/s 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-3.3/net/sunrpc/clnt.c linux-3.3-vs2.3.3.1/net/sunrpc/clnt.c ---- linux-3.3/net/sunrpc/clnt.c 2012-01-09 16:15:04.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/net/sunrpc/clnt.c 2012-02-24 03:55:07.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/net/sunrpc/clnt.c linux-3.3.1-vs2.3.3.2/net/sunrpc/clnt.c +--- linux-3.3.1/net/sunrpc/clnt.c 2012-01-09 16:15:04.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/net/sunrpc/clnt.c 2012-02-24 03:55:07.000000000 +0100 @@ -31,6 +31,7 @@ #include #include @@ -25901,9 +25901,9 @@ diff -NurpP --minimal linux-3.3/net/sunrpc/clnt.c linux-3.3-vs2.3.3.1/net/sunrpc return clnt; } EXPORT_SYMBOL_GPL(rpc_create); -diff -NurpP --minimal linux-3.3/net/unix/af_unix.c linux-3.3-vs2.3.3.1/net/unix/af_unix.c ---- linux-3.3/net/unix/af_unix.c 2012-03-19 19:47:34.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/net/unix/af_unix.c 2012-02-24 03:55:07.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/net/unix/af_unix.c linux-3.3.1-vs2.3.3.2/net/unix/af_unix.c +--- linux-3.3.1/net/unix/af_unix.c 2012-03-19 19:47:34.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/net/unix/af_unix.c 2012-02-24 03:55:07.000000000 +0100 @@ -114,6 +114,8 @@ #include #include @@ -25941,9 +25941,9 @@ diff -NurpP --minimal linux-3.3/net/unix/af_unix.c linux-3.3-vs2.3.3.1/net/unix/ sk = next_unix_socket(&iter->i, sk); return sk; } -diff -NurpP --minimal linux-3.3/scripts/checksyscalls.sh linux-3.3-vs2.3.3.1/scripts/checksyscalls.sh ---- linux-3.3/scripts/checksyscalls.sh 2012-03-19 19:47:34.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/scripts/checksyscalls.sh 2012-02-24 03:55:07.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/scripts/checksyscalls.sh linux-3.3.1-vs2.3.3.2/scripts/checksyscalls.sh +--- linux-3.3.1/scripts/checksyscalls.sh 2012-03-19 19:47:34.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/scripts/checksyscalls.sh 2012-02-24 03:55:07.000000000 +0100 @@ -193,7 +193,6 @@ cat << EOF #define __IGNORE_afs_syscall #define __IGNORE_getpmsg @@ -25952,9 +25952,9 @@ diff -NurpP --minimal linux-3.3/scripts/checksyscalls.sh linux-3.3-vs2.3.3.1/scr EOF } -diff -NurpP --minimal linux-3.3/security/commoncap.c linux-3.3-vs2.3.3.1/security/commoncap.c ---- linux-3.3/security/commoncap.c 2012-03-19 19:47:34.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/security/commoncap.c 2012-02-24 18:08:52.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/security/commoncap.c linux-3.3.1-vs2.3.3.2/security/commoncap.c +--- linux-3.3.1/security/commoncap.c 2012-03-19 19:47:34.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/security/commoncap.c 2012-02-24 18:08:52.000000000 +0100 @@ -74,14 +74,20 @@ int cap_netlink_send(struct sock *sk, st int cap_capable(const struct cred *cred, struct user_namespace *targ_ns, int cap, int audit) @@ -25996,9 +25996,9 @@ diff -NurpP --minimal linux-3.3/security/commoncap.c linux-3.3-vs2.3.3.1/securit return -EPERM; return 0; } -diff -NurpP --minimal linux-3.3/security/selinux/hooks.c linux-3.3-vs2.3.3.1/security/selinux/hooks.c ---- linux-3.3/security/selinux/hooks.c 2012-03-19 19:47:34.000000000 +0100 -+++ linux-3.3-vs2.3.3.1/security/selinux/hooks.c 2012-02-24 03:55:07.000000000 +0100 +diff -NurpP --minimal linux-3.3.1/security/selinux/hooks.c linux-3.3.1-vs2.3.3.2/security/selinux/hooks.c +--- linux-3.3.1/security/selinux/hooks.c 2012-03-19 19:47:34.000000000 +0100 ++++ linux-3.3.1-vs2.3.3.2/security/selinux/hooks.c 2012-02-24 03:55:07.000000000 +0100 @@ -67,7 +67,6 @@ #include #include diff --git a/kernel.spec b/kernel.spec index 55afa5c5..9f9d558a 100644 --- a/kernel.spec +++ b/kernel.spec @@ -89,9 +89,9 @@ %define have_pcmcia 0 %endif -%define rel 3 +%define rel 1 %define basever 3.3 -%define postver .0 +%define postver .1 # __alt_kernel is list of features, empty string if none set # _alt kernel is defined as: %{nil}%{?alt_kernel:-%{?alt_kernel}} (defined in rpm.macros) @@ -134,7 +134,7 @@ Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{basever}.tar.xz # Source0-md5: 7133f5a2086a7d7ef97abac610c094f5 %if "%{postver}" != ".0" Patch0: http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.bz2 -# Patch0-md5: a4c2531ee383dfd429e105816b4d2ccc +# Patch0-md5: b3fafb60dbf571aef9da6f12a774f02c %endif Source3: kernel-autoconf.h @@ -212,7 +212,7 @@ Patch59: kernel-rndis_host-wm5.patch # http://patches.aircrack-ng.org/hostap-kernel-2.6.18.patch Patch85: kernel-hostap.patch -# http://vserver.13thfloor.at/Experimental/patch-3.3-vs2.3.3.1.diff +# http://vserver.13thfloor.at/Experimental/patch-3.3.1-vs2.3.3.2.diff Patch100: kernel-vserver-2.3.patch Patch101: kernel-vserver-fixes.patch