Author: arekm Date: Tue Apr 3 07:02:44 2012 GMT Module: packages Tag: HEAD ---- Log message: - up to 3.3.1; updated vserver patch to vs2.3.3.2; drop scsi workaround
---- Files affected: packages/kernel: kernel-small_fixes.patch (1.59 -> 1.60) , kernel-vserver-2.3.patch (1.93 -> 1.94) , kernel.spec (1.1036 -> 1.1037) ---- Diffs: ================================================================ Index: packages/kernel/kernel-small_fixes.patch diff -u packages/kernel/kernel-small_fixes.patch:1.59 packages/kernel/kernel-small_fixes.patch:1.60 --- packages/kernel/kernel-small_fixes.patch:1.59 Mon Mar 26 19:10:27 2012 +++ packages/kernel/kernel-small_fixes.patch Tue Apr 3 09:02:37 2012 @@ -11,103 +11,6 @@ /* Some toolchains use a `_' prefix for all user symbols. */ -From: Stephen Hemminger <[email protected]> - -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 <[email protected]> -Signed-off-by: Stephen Hemminger <[email protected]> ---- -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 [email protected] -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 @@ -- 1.7.7.3 - \ No newline at end of file + ================================================================ Index: packages/kernel/kernel-vserver-2.3.patch diff -u packages/kernel/kernel-vserver-2.3.patch:1.93 packages/kernel/kernel-vserver-2.3.patch:1.94 --- packages/kernel/kernel-vserver-2.3.patch:1.93 Mon Mar 19 22:33:14 2012 +++ packages/kernel/kernel-vserver-2.3.patch Tue Apr 3 09:02:37 2012 @@ -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 @@ + 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 @@ 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 @@ 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 <linux/user.h> #include <linux/security.h> @@ -214,9 +214,9 @@ #include <asm/uaccess.h> #include <asm/pgtable.h> -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 @@ .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 @@ 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 @@ 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 @@ 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 @@ __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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 <linux/regset.h> #include <linux/elf.h> @@ -375,9 +375,9 @@ #include <asm/pgtable.h> #include <asm/processor.h> -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/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 @@ /* * 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 @@ 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 @@ 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 <linux/security.h> #include <linux/audit.h> @@ -462,9 +462,9 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ /* 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 @@ 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 @@ 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 @@ #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 @@ #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 @@ 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 @@ 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 @@ <<Diff was trimmed, longer than 597 lines>> ---- CVS-web: http://cvs.pld-linux.org/packages/kernel/kernel-small_fixes.patch?r1=1.59&r2=1.60 http://cvs.pld-linux.org/packages/kernel/kernel-vserver-2.3.patch?r1=1.93&r2=1.94 http://cvs.pld-linux.org/packages/kernel/kernel.spec?r1=1.1036&r2=1.1037 _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
