r2595 - in trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches: . series
Sven Luther
luther@costa.debian.org
Fri, 04 Mar 2005 10:59:50 +0100
Author: luther
Date: 2005-03-04 10:59:48 +0100 (Fri, 04 Mar 2005)
New Revision: 2595
Added:
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-1
Removed:
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/001-acpi_ibm_exit.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/002-pio_err_handling.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/003-libata_alpha_build_fix.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/004-sparc64_no_i_sock.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/005-sparc64_no_i_sock.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/006-zatm_cast_fix_fix.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/007-pci_ide_no_reserve.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/008-sock_without_ipv6.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/009-ipt_ecn_corrupt_chksum.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/010-sparc64_macro_pmd_offset.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/011-parport_pc_module_parm_mixing.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/012-conntrack_standalone_proc_removal.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/013-conntrack_standalone_sysctl.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/014-acpi_video_dev_slab_corruption.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/015-vmscan_total_scanned.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/016-cs461x_gameport.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/017-conntrack_sctp_sysctl.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/018-ipt_recent_proc_remove.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/019-conntrack_tcp_RST_handling.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/020-clear_cyrix_mii_ecx_reg.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/021-sunrpc_check_before_kill.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/022-sunrpc_xdr_flush_pages.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/023-nfs_dentry_refcount.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/024-nfs_incorrect_df_output.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/025-track_dummy_capability.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/026-nfs_o_direct_error.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/027-track_dummy_capability.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/031-sg_scsi_ioctl_int_overflows.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/032-do_brk_security_fixes.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/033-rlimit_memlock_check.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/034-stack_resize_exploit.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/035-do_brk_security_fixes.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/036-rlimit_memlock_check.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/037-sctp_err_lookup_oops.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/038-ftdi_sio_debug_output.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/039-serial_console_resume.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/040-sk_forward_alloc_underflow.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/041-ide_hwif_supress_busy.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/042-gx_get_cpuspeed_return_value.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/043-dothan_p4_get_frequency.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/044-elevator_noop_add_request.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/045-pci_psycho_brainfart.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/046-ipv6_sit_lock.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/047-do_tcp_sendpages_tso_assertion.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/048-matroxfb_mtrr_ifdef.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/050-cfq_requeue_request_accounting.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/051-md_sync_page_io_max_vecs.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/052-vfat_valid_longname_proper_return.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/053-ipmi_unhandled_message_counting.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/054-ext3_journal_abort_before_panic.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/055-uml_new_thread_race.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/056-x86_64_acpi_do_suspend_lowlevel_arg.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/058-ia64_binfmt_elf_bug_out.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/060-alsa_cs4231_lib_ifdef_typo.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/061-alsa_es18xx_ifdef_typo.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/062-alsa_sscape_user_copy_check.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/063-alsa_opl4_build_fix.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/064-alsa_usbaudio_disconnect.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/065-alsa_vx_kcalloc.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/066-ibmvscsi_probe_delay_loop_fix.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/067-scsi_gdth_pci_map_sg.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/068-scsi_sd_read_capacity_LBD_bail.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/069-alsa_sscape_upload_firmware_len.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/070-alsa_rme9652_hdsp_get_autosync.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/071-alsa_creation_order_fixes.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/072-sctp_do_bind_random_port.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/073-usb_gadget_serial_free_ports.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/074-usb_makefile_fixes.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/075-acpiphp_ibm_module_parm_perm.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/076-i2c_ali1563_devinit_fixes.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/077-ext3_journal_abort_handle_silence.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/078-jbd_journal_revoke_graceful_double_delete.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/079-i386_timer_resume_slowdown.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/080-kernel_sched_might_sleep_ignore_if_oopsed.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/081-ia64_early_sn_setup_nested_loop.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/082-ide_it8172_init_return_failure.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/084-smp_nmi_watchdog_race.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/085-ia64_irq_reg_typo.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/086-i386_cpufreq_powernow_k8_acpi_error.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/087-ext3_graceful_corruption_fixes.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/alpha-io-typo.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/ia64-ptrace-fixes.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/ia64-unwind-fix.dpatch
Log:
Removed all patches marked as backports.
Added series/2.6.11-1
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/001-acpi_ibm_exit.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/001-acpi_ibm_exit.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/001-acpi_ibm_exit.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,40 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [PATCH] drivers/acpi/ibm_acpi.o .init.text refers to .exit.text
-## DP: Patch author: arjan@infradead.org
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2004/12/27 10:24:28-08:00 arjan@infradead.org
-# [PATCH] drivers/acpi/ibm_acpi.o .init.text refers to .exit.text
-#
-# the ibm_acpi.c driver references acpi_ibm_exit() from it's __init function,
-# which means the exit function isn't allowed to be __exit since __exit
-# functions are not part of vmlinux while __init functions are.
-#
-# Signed-off-by: Arjan van de Ven <arjan@infradead.org>
-# Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-#
-# drivers/acpi/ibm_acpi.c
-# 2004/12/27 02:20:31-08:00 arjan@infradead.org +1 -1
-# drivers/acpi/ibm_acpi.o .init.text refers to .exit.text
-#
-diff -Nru a/drivers/acpi/ibm_acpi.c b/drivers/acpi/ibm_acpi.c
---- a/drivers/acpi/ibm_acpi.c 2005-01-04 17:37:08 -08:00
-+++ b/drivers/acpi/ibm_acpi.c 2005-01-04 17:37:08 -08:00
-@@ -1168,7 +1168,7 @@
- #define IBM_PARAM(feature) \
- module_param_call(feature, set_ibm_param, NULL, NULL, 0)
-
--static void __exit acpi_ibm_exit(void)
-+static void acpi_ibm_exit(void)
- {
- int i;
-
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/002-pio_err_handling.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/002-pio_err_handling.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/002-pio_err_handling.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,105 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [libata] PIO error handling improvement
-## DP: Patch author: albertcc@tw.ibm.com
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2004/12/27 15:24:53-05:00 albertcc@tw.ibm.com
-# [libata] PIO error handling improvement
-#
-# Tested burning CD-RW with libata-dev-2.6 and cdrecord:
-# 1. ATAPI DMA mode - tested OK
-# 2. ATAPI PIO mode - test failed when cdrecord finishes burning and issues MODE_SELECT to the device.
-#
-# After checking the log, it showed that MODE_SELECT caused ata_pio_complete() to return error.
-# However, the error is not handled by ata_pio_task().
-#
-# Attached please find the patch for ata_pio_task() error handling for your review.
-# (The patch is against the libata-dev-2.6 tree. )
-#
-# Changes in the patch:
-# 1. End the PIO task when PIO_ST_IDLE state is entered
-# 2. End the PIO task after PIO_ST_TMOUT and PIO_ST_ERR state handled by ata_pio_error()
-# 3. Remove the first "if" statement to handle the error condition returned from
-# ata_pio_block(), ata_pio_complete() and ata_pio_poll().
-#
-# Change #2 is not so necessary since ata_pio_error() will put the cmd to PIO_ST_IDLE state
-# after the error condition is handled. The change just saves a function call to queue_work().
-#
-# Tested OK on on my machine with pdc20275 and ASUS CD-RW drive.
-#
-# Signed-off-by: Albert Lee <albertcc@tw.ibm.com>
-#
-# drivers/scsi/libata-core.c
-# 2004/12/27 15:24:47-05:00 albertcc@tw.ibm.com +9 -10
-# [libata] PIO error handling improvement
-#
-# Tested burning CD-RW with libata-dev-2.6 and cdrecord:
-# 1. ATAPI DMA mode - tested OK
-# 2. ATAPI PIO mode - test failed when cdrecord finishes burning and issues MODE_SELECT to the device.
-#
-# After checking the log, it showed that MODE_SELECT caused ata_pio_complete() to return error.
-# However, the error is not handled by ata_pio_task().
-#
-# Attached please find the patch for ata_pio_task() error handling for your review.
-# (The patch is against the libata-dev-2.6 tree. )
-#
-# Changes in the patch:
-# 1. End the PIO task when PIO_ST_IDLE state is entered
-# 2. End the PIO task after PIO_ST_TMOUT and PIO_ST_ERR state handled by ata_pio_error()
-# 3. Remove the first "if" statement to handle the error condition returned from
-# ata_pio_block(), ata_pio_complete() and ata_pio_poll().
-#
-# Change #2 is not so necessary since ata_pio_error() will put the cmd to PIO_ST_IDLE state
-# after the error condition is handled. The change just saves a function call to queue_work().
-#
-# Tested OK on on my machine with pdc20275 and ASUS CD-RW drive.
-#
-# Signed-off-by: Albert Lee <albertcc@tw.ibm.com>
-#
-diff -Nru a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
---- a/drivers/scsi/libata-core.c 2005-01-04 17:44:20 -08:00
-+++ b/drivers/scsi/libata-core.c 2005-01-04 17:44:20 -08:00
-@@ -2369,6 +2369,9 @@
- unsigned long timeout = 0;
-
- switch (ap->pio_task_state) {
-+ case PIO_ST_IDLE:
-+ return;
-+
- case PIO_ST:
- ata_pio_block(ap);
- break;
-@@ -2385,18 +2388,14 @@
- case PIO_ST_TMOUT:
- case PIO_ST_ERR:
- ata_pio_error(ap);
-- break;
-+ return;
- }
-
-- if ((ap->pio_task_state != PIO_ST_IDLE) &&
-- (ap->pio_task_state != PIO_ST_TMOUT) &&
-- (ap->pio_task_state != PIO_ST_ERR)) {
-- if (timeout)
-- queue_delayed_work(ata_wq, &ap->pio_task,
-- timeout);
-- else
-- queue_work(ata_wq, &ap->pio_task);
-- }
-+ if (timeout)
-+ queue_delayed_work(ata_wq, &ap->pio_task,
-+ timeout);
-+ else
-+ queue_work(ata_wq, &ap->pio_task);
- }
-
- static void atapi_request_sense(struct ata_port *ap, struct ata_device *dev,
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/003-libata_alpha_build_fix.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/003-libata_alpha_build_fix.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/003-libata_alpha_build_fix.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,32 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [libata] add #include (fixes 2.4 alpha build)
-## DP: Patch author: stkn@gentoo.org
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2004/12/27 15:41:28-05:00 stkn@gentoo.org
-# [libata] add #include (fixes 2.4 alpha build)
-#
-# drivers/scsi/libata-core.c
-# 2004/12/27 15:41:22-05:00 stkn@gentoo.org +1 -0
-# [libata] add #include (fixes 2.4 alpha build)
-#
-diff -Nru a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
---- a/drivers/scsi/libata-core.c 2005-01-04 17:45:44 -08:00
-+++ b/drivers/scsi/libata-core.c 2005-01-04 17:45:44 -08:00
-@@ -28,6 +28,7 @@
- #include <linux/pci.h>
- #include <linux/init.h>
- #include <linux/list.h>
-+#include <linux/mm.h>
- #include <linux/highmem.h>
- #include <linux/spinlock.h>
- #include <linux/blkdev.h>
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/004-sparc64_no_i_sock.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/004-sparc64_no_i_sock.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/004-sparc64_no_i_sock.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,105 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [SPARC64]: Stop referencing i_sock directly.
-## DP: Patch author: matthew@wil.cx
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2004/12/27 20:55:17-08:00 matthew@wil.cx
-# [SPARC64]: Stop referencing i_sock directly.
-#
-# Use S_ISSOCK() instead.
-#
-# Signed-off-by: Matthew Wilcox <matthew@wil.cx>
-# Signed-off-by: David S. Miller <davem@davemloft.net>
-#
-# arch/sparc64/solaris/ioctl.c
-# 2004/12/27 20:54:56-08:00 matthew@wil.cx +2 -2
-# [SPARC64]: Stop referencing i_sock directly.
-#
-# Use S_ISSOCK() instead.
-#
-# Signed-off-by: Matthew Wilcox <matthew@wil.cx>
-# Signed-off-by: David S. Miller <davem@davemloft.net>
-#
-# arch/sparc64/solaris/socksys.c
-# 2004/12/27 20:54:56-08:00 matthew@wil.cx +1 -1
-# [SPARC64]: Stop referencing i_sock directly.
-#
-# Use S_ISSOCK() instead.
-#
-# Signed-off-by: Matthew Wilcox <matthew@wil.cx>
-# Signed-off-by: David S. Miller <davem@davemloft.net>
-#
-# arch/sparc64/solaris/timod.c
-# 2004/12/27 20:54:56-08:00 matthew@wil.cx +2 -4
-# [SPARC64]: Stop referencing i_sock directly.
-#
-# Use S_ISSOCK() instead.
-#
-# Signed-off-by: Matthew Wilcox <matthew@wil.cx>
-# Signed-off-by: David S. Miller <davem@davemloft.net>
-#
-diff -Nru a/arch/sparc64/solaris/ioctl.c b/arch/sparc64/solaris/ioctl.c
---- a/arch/sparc64/solaris/ioctl.c 2005-01-04 17:50:57 -08:00
-+++ b/arch/sparc64/solaris/ioctl.c 2005-01-04 17:50:57 -08:00
-@@ -298,7 +298,7 @@
- if (! current->files->fd[fd] ||
- ! current->files->fd[fd]->f_dentry ||
- ! (ino = current->files->fd[fd]->f_dentry->d_inode) ||
-- ! ino->i_sock) {
-+ ! S_ISSOCK(ino->i_mode)) {
- spin_unlock(¤t->files->file_lock);
- return TBADF;
- }
-@@ -478,7 +478,7 @@
- struct module_info *mi;
-
- ino = filp->f_dentry->d_inode;
-- if (! ino->i_sock)
-+ if (!S_ISSOCK(ino->i_mode))
- return -EBADF;
- sock = filp->private_data;
- if (! sock) {
-diff -Nru a/arch/sparc64/solaris/socksys.c b/arch/sparc64/solaris/socksys.c
---- a/arch/sparc64/solaris/socksys.c 2005-01-04 17:50:57 -08:00
-+++ b/arch/sparc64/solaris/socksys.c 2005-01-04 17:50:57 -08:00
-@@ -150,7 +150,7 @@
- unsigned int mask = 0;
-
- ino=filp->f_dentry->d_inode;
-- if (ino && ino->i_sock) {
-+ if (ino && S_ISSOCK(ino->i_mode)) {
- struct sol_socket_struct *sock;
- sock = (struct sol_socket_struct*)filp->private_data;
- if (sock && sock->pfirst) {
-diff -Nru a/arch/sparc64/solaris/timod.c b/arch/sparc64/solaris/timod.c
---- a/arch/sparc64/solaris/timod.c 2005-01-04 17:50:57 -08:00
-+++ b/arch/sparc64/solaris/timod.c 2005-01-04 17:50:57 -08:00
-@@ -853,9 +853,7 @@
- if(!filp) goto out;
-
- ino = filp->f_dentry->d_inode;
-- if (!ino) goto out;
--
-- if (!ino->i_sock)
-+ if (!ino || !S_ISSOCK(ino->i_mode))
- goto out;
-
- ctlptr = (struct strbuf __user *)A(arg1);
-@@ -923,7 +921,7 @@
- ino = filp->f_dentry->d_inode;
- if (!ino) goto out;
-
-- if (!ino->i_sock &&
-+ if (!IS_SOCK(ino->i_mode) &&
- (imajor(ino) != 30 || iminor(ino) != 1))
- goto out;
-
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/005-sparc64_no_i_sock.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/005-sparc64_no_i_sock.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/005-sparc64_no_i_sock.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,35 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [SPARC64]: Fix typo in previous change, s/IS_SOCK/S_ISSOCK/
-## DP: Patch author: davem@nuts.davemloft.net
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2004/12/27 21:08:40-08:00 davem@nuts.davemloft.net
-# [SPARC64]: Fix typo in previous change, s/IS_SOCK/S_ISSOCK/
-#
-# Signed-off-by: David S. Miller <davem@davemloft.net>
-#
-# arch/sparc64/solaris/timod.c
-# 2004/12/27 21:08:08-08:00 davem@nuts.davemloft.net +1 -1
-# [SPARC64]: Fix typo in previous change, s/IS_SOCK/S_ISSOCK/
-#
-diff -Nru a/arch/sparc64/solaris/timod.c b/arch/sparc64/solaris/timod.c
---- a/arch/sparc64/solaris/timod.c 2005-01-04 17:51:52 -08:00
-+++ b/arch/sparc64/solaris/timod.c 2005-01-04 17:51:52 -08:00
-@@ -921,7 +921,7 @@
- ino = filp->f_dentry->d_inode;
- if (!ino) goto out;
-
-- if (!IS_SOCK(ino->i_mode) &&
-+ if (!S_ISSOCK(ino->i_mode) &&
- (imajor(ino) != 30 || iminor(ino) != 1))
- goto out;
-
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/006-zatm_cast_fix_fix.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/006-zatm_cast_fix_fix.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/006-zatm_cast_fix_fix.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,53 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [PATCH] zatm fix
-## DP: Patch author: viro@parcelfarce.linux.theplanet.co.uk
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2004/12/29 10:40:39-08:00 viro@parcelfarce.linux.theplanet.co.uk
-# [PATCH] zatm fix
-#
-# Repairs the breakage introduced in gcc4 fixes. Original had expanded
-# to
-#
-# ((struct zatm_dev *)(dev)->dev_data) = zatm_dev;
-#
-# and that's what gcc4 had complained about (cast-as-lvalue). Proper fix is,
-# of course,
-#
-# dev->dev_data = zatm_dev;
-#
-# What we have in 2.6.10 is
-#
-# dev = (struct atm_dev *)zatm_dev;
-#
-# which doesn't cause complaints, but doesn't do anything good (leak + corruption
-# at the very least).
-#
-# Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
-# Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-#
-# drivers/atm/zatm.c
-# 2004/12/26 22:04:22-08:00 viro@parcelfarce.linux.theplanet.co.uk +1 -1
-# zatm fix
-#
-diff -Nru a/drivers/atm/zatm.c b/drivers/atm/zatm.c
---- a/drivers/atm/zatm.c 2005-01-04 18:01:25 -08:00
-+++ b/drivers/atm/zatm.c 2005-01-04 18:01:25 -08:00
-@@ -1605,7 +1605,7 @@
- goto out_disable;
-
- zatm_dev->pci_dev = pci_dev;
-- dev = (struct atm_dev *)zatm_dev;
-+ dev->dev_data = zatm_dev;
- zatm_dev->copper = (int)ent->driver_data;
- if ((ret = zatm_init(dev)) || (ret = zatm_start(dev)))
- goto out_release;
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/007-pci_ide_no_reserve.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/007-pci_ide_no_reserve.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/007-pci_ide_no_reserve.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,69 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [ide] fix return codes in the generic PCI IDE driver
-## DP: Patch author: bzolnier@trik.(none)
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2004/12/30 19:07:00+01:00 bzolnier@trik.(none)
-# [ide] fix return codes in the generic PCI IDE driver
-#
-# From: Alan Cox <alan@redhat.com>
-#
-# This patch updates ide/pci/generic.c to fix the incorrect returns
-# causing PCI devices to be left reserved wrongly by the driver.
-#
-# From: Francois Romieu <romieu@fr.zoreil.com>
-#
-# Use -ENODEV instead of -EAGAIN.
-#
-# Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
-#
-# drivers/ide/pci/generic.c
-# 2004/12/30 19:06:50+01:00 bzolnier@trik.(none) +8 -6
-# [ide] fix return codes in the generic PCI IDE driver
-#
-diff -Nru a/drivers/ide/pci/generic.c b/drivers/ide/pci/generic.c
---- a/drivers/ide/pci/generic.c 2005-01-04 18:06:08 -08:00
-+++ b/drivers/ide/pci/generic.c 2005-01-04 18:06:08 -08:00
-@@ -96,25 +96,27 @@
- {
- ide_pci_device_t *d = &generic_chipsets[id->driver_data];
- u16 command;
-+ int ret = -ENODEV;
-
- if (dev->vendor == PCI_VENDOR_ID_UMC &&
- dev->device == PCI_DEVICE_ID_UMC_UM8886A &&
- (!(PCI_FUNC(dev->devfn) & 1)))
-- return 1; /* UM8886A/BF pair */
-+ goto out; /* UM8886A/BF pair */
-
- if (dev->vendor == PCI_VENDOR_ID_OPTI &&
- dev->device == PCI_DEVICE_ID_OPTI_82C558 &&
- (!(PCI_FUNC(dev->devfn) & 1)))
-- return 1;
-+ goto out;
-
- pci_read_config_word(dev, PCI_COMMAND, &command);
-- if(!(command & PCI_COMMAND_IO))
-- {
-+ if (!(command & PCI_COMMAND_IO)) {
- printk(KERN_INFO "Skipping disabled %s IDE controller.\n", d->name);
-- return 1;
-+ goto out;
- }
-+ ret = 0;
- ide_setup_pci_device(dev, d);
-- return 0;
-+out:
-+ return ret;
- }
-
- static struct pci_device_id generic_pci_tbl[] = {
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/008-sock_without_ipv6.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/008-sock_without_ipv6.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/008-sock_without_ipv6.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,44 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [PATCH] Fix net/core/sock.o build failure
-## DP: Patch author: acme@conectiva.com.br
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2004/12/30 15:21:16-08:00 acme@conectiva.com.br
-# [PATCH] Fix net/core/sock.o build failure
-#
-# This fixes a build failure that happens when you don't select IPV6.
-#
-# Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-#
-# include/linux/ipv6.h
-# 2004/12/29 14:22:45-08:00 acme@conectiva.com.br +1 -1
-# Fix net/core/sock.o build failure
-#
-diff -Nru a/include/linux/ipv6.h b/include/linux/ipv6.h
---- a/include/linux/ipv6.h 2005-01-04 18:11:40 -08:00
-+++ b/include/linux/ipv6.h 2005-01-04 18:11:40 -08:00
-@@ -273,6 +273,7 @@
- struct ipv6_pinfo inet6;
- };
-
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
- static inline struct ipv6_pinfo * inet6_sk(const struct sock *__sk)
- {
- return inet_sk(__sk)->pinet6;
-@@ -283,7 +284,6 @@
- return &((struct raw6_sock *)__sk)->raw6;
- }
-
--#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
- #define __ipv6_only_sock(sk) (inet6_sk(sk)->ipv6only)
- #define ipv6_only_sock(sk) ((sk)->sk_family == PF_INET6 && __ipv6_only_sock(sk))
- #else
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/009-ipt_ecn_corrupt_chksum.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/009-ipt_ecn_corrupt_chksum.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/009-ipt_ecn_corrupt_chksum.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,40 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [PATCH] ipt_ECN corrupt checksum fix
-## DP: Patch author: rusty@rustcorp.com.au
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/02 09:40:33-08:00 rusty@rustcorp.com.au
-# [PATCH] ipt_ECN corrupt checksum fix
-#
-# Nasty bug, caught while writing the ECN target test. Corrupts
-# checksums of packets when target is used on them.
-#
-# Let this be a warning on the evils of casts.
-#
-# Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-#
-# net/ipv4/netfilter/ipt_ECN.c
-# 2005/01/02 02:56:47-08:00 rusty@rustcorp.com.au +1 -1
-# ipt_ECN corrupt checksum fix
-#
-diff -Nru a/net/ipv4/netfilter/ipt_ECN.c b/net/ipv4/netfilter/ipt_ECN.c
---- a/net/ipv4/netfilter/ipt_ECN.c 2005-01-04 18:16:39 -08:00
-+++ b/net/ipv4/netfilter/ipt_ECN.c 2005-01-04 18:16:39 -08:00
-@@ -67,7 +67,7 @@
-
- if (einfo->operation & IPT_ECN_OP_SET_CWR)
- th->cwr = einfo->proto.tcp.cwr;
-- diffs[1] = ((u_int16_t *)&th)[6];
-+ diffs[1] = ((u_int16_t *)th)[6];
-
- /* Only mangle if it's changed. */
- if (diffs[0] != diffs[1]) {
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/010-sparc64_macro_pmd_offset.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/010-sparc64_macro_pmd_offset.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/010-sparc64_macro_pmd_offset.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,44 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [PATCH] sparc64 pmd_offset() fix
-## DP: Patch author: akpm@osdl.org
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/02 09:45:50-08:00 akpm@osdl.org
-# [PATCH] sparc64 pmd_offset() fix
-#
-# mm/memory.c: In function `zeromap_pud_range':
-# mm/memory.c:1053: warning: suggest parentheses around + or - inside shift
-# mm/memory.c: In function `remap_pud_range':
-# mm/memory.c:1170: warning: suggest parentheses around + or - inside shift
-#
-# Parenthesize this macro arg.
-#
-# Cc: Nick Piggin <nickpiggin@yahoo.com.au>
-# Signed-off-by: Andrew Morton <akpm@osdl.org>
-# Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-#
-# include/asm-sparc64/pgtable.h
-# 2005/01/02 01:36:40-08:00 akpm@osdl.org +1 -1
-# sparc64 pmd_offset() fix
-#
-diff -Nru a/include/asm-sparc64/pgtable.h b/include/asm-sparc64/pgtable.h
---- a/include/asm-sparc64/pgtable.h 2005-01-04 18:20:52 -08:00
-+++ b/include/asm-sparc64/pgtable.h 2005-01-04 18:20:52 -08:00
-@@ -315,7 +315,7 @@
- /* Find an entry in the second-level page table.. */
- #define pmd_offset(dir, address) \
- ((pmd_t *) pgd_page(*(dir)) + \
-- ((address >> PMD_SHIFT) & (REAL_PTRS_PER_PMD-1)))
-+ (((address) >> PMD_SHIFT) & (REAL_PTRS_PER_PMD-1)))
-
- /* Find an entry in the third-level page table.. */
- #define pte_index(dir, address) \
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/011-parport_pc_module_parm_mixing.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/011-parport_pc_module_parm_mixing.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/011-parport_pc_module_parm_mixing.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,52 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [PATCH] parport_pc: don't mix module parameter styles
-## DP: Patch author: rddunlap@osdl.org
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/02 09:49:29-08:00 rddunlap@osdl.org
-# [PATCH] parport_pc: don't mix module parameter styles
-#
-# Somehow parport_pc.c ended up with mixed old-style and new-style module
-# parameters, but mixing them is not allowed.
-#
-# Use module_param() instead of MODULE_PARM() -- cannot be mixed.
-#
-# Signed-off-by: Randy Dunlap <rddunlap@osdl.org>
-# Signed-off-by: Andrew Morton <akpm@osdl.org>
-# Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-#
-# drivers/parport/parport_pc.c
-# 2005/01/02 01:37:36-08:00 rddunlap@osdl.org +2 -2
-# parport_pc: don't mix module parameter styles
-#
-diff -Nru a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c
---- a/drivers/parport/parport_pc.c 2005-01-04 18:24:07 -08:00
-+++ b/drivers/parport/parport_pc.c 2005-01-04 18:24:07 -08:00
-@@ -3176,7 +3176,6 @@
- #ifdef MODULE
- static const char *irq[PARPORT_PC_MAX_PORTS];
- static const char *dma[PARPORT_PC_MAX_PORTS];
--static char *init_mode;
-
- MODULE_PARM_DESC(io, "Base I/O address (SPP regs)");
- module_param_array(io, int, NULL, 0);
-@@ -3192,8 +3191,9 @@
- module_param(verbose_probing, int, 0644);
- #endif
- #ifdef CONFIG_PCI
-+static char *init_mode;
- MODULE_PARM_DESC(init_mode, "Initialise mode for VIA VT8231 port (spp, ps2, epp, ecp or ecpepp)");
--MODULE_PARM(init_mode, "s");
-+module_param(init_mode, charp, 0);
- #endif
-
- static int __init parse_parport_params(void)
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/012-conntrack_standalone_proc_removal.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/012-conntrack_standalone_proc_removal.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/012-conntrack_standalone_proc_removal.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,43 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [PATCH] Fix proc removal in ip_conntrack_standalone
-## DP: Patch author: rusty@rustcorp.com.au
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/02 10:46:04-08:00 rusty@rustcorp.com.au
-# [PATCH] Fix proc removal in ip_conntrack_standalone
-#
-# Someone thought it would be clever if proc code ignores removal of
-# non-existent entries. Hence, we missed that /proc/net/stat/ip_conntrack
-# is never removed on module removal or init failure.
-#
-# Found by nfsim.
-#
-# Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-#
-# net/ipv4/netfilter/ip_conntrack_standalone.c
-# 2004/12/29 22:39:53-08:00 rusty@rustcorp.com.au +2 -2
-# Fix proc removal in ip_conntrack_standalone
-#
-diff -Nru a/net/ipv4/netfilter/ip_conntrack_standalone.c b/net/ipv4/netfilter/ip_conntrack_standalone.c
---- a/net/ipv4/netfilter/ip_conntrack_standalone.c 2005-01-04 18:27:19 -08:00
-+++ b/net/ipv4/netfilter/ip_conntrack_standalone.c 2005-01-04 18:27:19 -08:00
-@@ -820,8 +820,8 @@
- nf_unregister_hook(&ip_conntrack_defrag_ops);
- cleanup_proc_stat:
- #ifdef CONFIG_PROC_FS
-- proc_net_remove("ip_conntrack_stat");
--cleanup_proc_exp:
-+ remove_proc_entry("ip_conntrack", proc_net_stat);
-+ cleanup_proc_exp:
- proc_net_remove("ip_conntrack_expect");
- cleanup_proc:
- proc_net_remove("ip_conntrack");
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/013-conntrack_standalone_sysctl.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/013-conntrack_standalone_sysctl.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/013-conntrack_standalone_sysctl.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,47 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [PATCH] Fix cleanup path when sysctl registration fails
-## DP: Patch author: rusty@rustcorp.com.au
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/02 10:47:03-08:00 rusty@rustcorp.com.au
-# [PATCH] Fix cleanup path when sysctl registration fails
-#
-# nfsim gains sysctl support, and sure enough, --failtest uncovered an
-# unregister when the registration had failed.
-#
-# Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-#
-# net/ipv4/netfilter/ip_conntrack_standalone.c
-# 2004/12/30 00:18:29-08:00 rusty@rustcorp.com.au +3 -1
-# Fix cleanup path when sysctl registration fails
-#
-diff -Nru a/net/ipv4/netfilter/ip_conntrack_standalone.c b/net/ipv4/netfilter/ip_conntrack_standalone.c
---- a/net/ipv4/netfilter/ip_conntrack_standalone.c 2005-01-04 18:29:37 -08:00
-+++ b/net/ipv4/netfilter/ip_conntrack_standalone.c 2005-01-04 18:29:37 -08:00
-@@ -791,7 +791,8 @@
- ip_ct_sysctl_header = register_sysctl_table(ip_ct_net_table, 0);
- if (ip_ct_sysctl_header == NULL) {
- printk("ip_conntrack: can't register to sysctl.\n");
-- goto cleanup;
-+ ret = -ENOMEM;
-+ goto cleanup_localinops;
- }
- #endif
-
-@@ -800,6 +801,7 @@
- cleanup:
- #ifdef CONFIG_SYSCTL
- unregister_sysctl_table(ip_ct_sysctl_header);
-+ cleanup_localinops:
- #endif
- nf_unregister_hook(&ip_conntrack_local_in_ops);
- cleanup_inoutandlocalops:
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/014-acpi_video_dev_slab_corruption.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/014-acpi_video_dev_slab_corruption.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/014-acpi_video_dev_slab_corruption.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,45 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: acpi video device enumeration: fix incorrect device list allocation
-## DP: Patch author: torvalds@evo.osdl.org
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/02 11:45:13-08:00 torvalds@evo.osdl.org
-# acpi video device enumeration: fix incorrect device list allocation
-#
-# It didn't allocate space for the final terminating entry,
-# which caused it to overwrite the next slab entry, which in turn
-# sometimes ended up being a slab array cache pointer. End result:
-# total slab cache corruption at a random time afterwards. Very
-# nasty.
-#
-# drivers/acpi/video.c
-# 2005/01/02 11:45:03-08:00 torvalds@evo.osdl.org +1 -1
-# acpi video device enumeration: fix incorrect device list allocation
-#
-# It didn't allocate space for the final terminating entry,
-# which caused it to overwrite the next slab entry, which in turn
-# sometimes ended up being a slab array cache pointer. End result:
-# total slab cache corruption at a random time afterwards. Very
-# nasty.
-#
-diff -Nru a/drivers/acpi/video.c b/drivers/acpi/video.c
---- a/drivers/acpi/video.c 2005-01-04 18:35:02 -08:00
-+++ b/drivers/acpi/video.c 2005-01-04 18:35:02 -08:00
-@@ -1524,7 +1524,7 @@
- dod->package.count));
-
- active_device_list= kmalloc(
-- dod->package.count*sizeof(struct acpi_video_enumerated_device),
-+ (1+dod->package.count)*sizeof(struct acpi_video_enumerated_device),
- GFP_KERNEL);
-
- if (!active_device_list) {
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/015-vmscan_total_scanned.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/015-vmscan_total_scanned.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/015-vmscan_total_scanned.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,38 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [PATCH] vmscan: total_scanned fix
-## DP: Patch author: akpm@osdl.org
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/03 20:13:49-08:00 akpm@osdl.org
-# [PATCH] vmscan: total_scanned fix
-#
-# We haven't been incrementing local variable total_scanned since the
-# scan_control stuff went in. That broke kswapd throttling.
-#
-# Signed-off-by: Andrew Morton <akpm@osdl.org>
-# Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-#
-# mm/vmscan.c
-# 2005/01/03 15:50:40-08:00 akpm@osdl.org +1 -0
-# vmscan: total_scanned fix
-#
-diff -Nru a/mm/vmscan.c b/mm/vmscan.c
---- a/mm/vmscan.c 2005-01-04 18:39:05 -08:00
-+++ b/mm/vmscan.c 2005-01-04 18:39:05 -08:00
-@@ -1063,6 +1063,7 @@
- shrink_slab(sc.nr_scanned, GFP_KERNEL, lru_pages);
- sc.nr_reclaimed += reclaim_state->reclaimed_slab;
- total_reclaimed += sc.nr_reclaimed;
-+ total_scanned += sc.nr_scanned;
- if (zone->all_unreclaimable)
- continue;
- if (zone->pages_scanned >= (zone->nr_active +
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/016-cs461x_gameport.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/016-cs461x_gameport.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/016-cs461x_gameport.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,43 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [PATCH] CS461x gameport code isn't being included in build
-## DP: Patch author: rjmx@rjmx.net
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/03 20:14:02-08:00 rjmx@rjmx.net
-# [PATCH] CS461x gameport code isn't being included in build
-#
-# With Cal Peake <cp@absolutedigital.net>
-#
-# I've found a typo in drivers/input/gameport/Makefile in kernel 2.6.9 which
-# effectively prevents the CS461x gameport code from being included.
-#
-# Signed-off-by: Ron Murray <rjmx@rjmx.net>
-# Signed-off-by: Cal Peake <cp@absolutedigital.net>
-# Signed-off-by: Andrew Morton <akpm@osdl.org>
-# Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-#
-# drivers/input/gameport/Makefile
-# 2005/01/03 15:49:13-08:00 rjmx@rjmx.net +1 -1
-# CS461x gameport code isn't being included in build
-#
-diff -Nru a/drivers/input/gameport/Makefile b/drivers/input/gameport/Makefile
---- a/drivers/input/gameport/Makefile 2005-01-04 18:39:49 -08:00
-+++ b/drivers/input/gameport/Makefile 2005-01-04 18:39:49 -08:00
-@@ -5,7 +5,7 @@
- # Each configuration option enables a list of files.
-
- obj-$(CONFIG_GAMEPORT) += gameport.o
--obj-$(CONFIG_GAMEPORT_CS461X) += cs461x.o
-+obj-$(CONFIG_GAMEPORT_CS461x) += cs461x.o
- obj-$(CONFIG_GAMEPORT_EMU10K1) += emu10k1-gp.o
- obj-$(CONFIG_GAMEPORT_FM801) += fm801-gp.o
- obj-$(CONFIG_GAMEPORT_L4) += lightning.o
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/017-conntrack_sctp_sysctl.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/017-conntrack_sctp_sysctl.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/017-conntrack_sctp_sysctl.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,57 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [PATCH] netfilter: Fix ip_conntrack_proto_sctp exit on sysctl fail
-## DP: Patch author: rusty@rustcorp.com.au
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/03 20:18:05-08:00 rusty@rustcorp.com.au
-# [PATCH] netfilter: Fix ip_conntrack_proto_sctp exit on sysctl fail
-#
-# On failure from register_sysctl_table, we return with exit 0. Oops. init and
-# fini should also be static. nfsim found these.
-#
-# Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
-# Signed-off-by: Andrew Morton <akpm@osdl.org>
-# Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-#
-# net/ipv4/netfilter/ip_conntrack_proto_sctp.c
-# 2005/01/03 15:49:16-08:00 rusty@rustcorp.com.au +3 -2
-# netfilter: Fix ip_conntrack_proto_sctp exit on sysctl fail
-#
-diff -Nru a/net/ipv4/netfilter/ip_conntrack_proto_sctp.c b/net/ipv4/netfilter/ip_conntrack_proto_sctp.c
---- a/net/ipv4/netfilter/ip_conntrack_proto_sctp.c 2005-01-04 18:46:31 -08:00
-+++ b/net/ipv4/netfilter/ip_conntrack_proto_sctp.c 2005-01-04 18:46:31 -08:00
-@@ -609,7 +609,7 @@
- static struct ctl_table_header *ip_ct_sysctl_header;
- #endif
-
--int __init init(void)
-+static int __init init(void)
- {
- int ret;
-
-@@ -622,6 +622,7 @@
- #ifdef CONFIG_SYSCTL
- ip_ct_sysctl_header = register_sysctl_table(ip_ct_net_table, 0);
- if (ip_ct_sysctl_header == NULL) {
-+ ret = -ENOMEM;
- printk("ip_conntrack_proto_sctp: can't register to sysctl.\n");
- goto cleanup;
- }
-@@ -639,7 +640,7 @@
- return ret;
- }
-
--void __exit fini(void)
-+static void __exit fini(void)
- {
- ip_conntrack_protocol_unregister(&ip_conntrack_protocol_sctp);
- #ifdef CONFIG_SYSCTL
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/018-ipt_recent_proc_remove.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/018-ipt_recent_proc_remove.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/018-ipt_recent_proc_remove.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,52 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [PATCH] netfilter: Fix cleanup in ipt_recent should ipt_registrater_match error
-## DP: Patch author: rusty@rustcorp.com.au
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/03 20:19:17-08:00 rusty@rustcorp.com.au
-# [PATCH] netfilter: Fix cleanup in ipt_recent should ipt_registrater_match error
-#
-# When ipt_registrater_match() fails, ipt_recent doesn't remove its proc
-# entry. Found by nfsim.
-#
-# Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
-# Signed-off-by: Andrew Morton <akpm@osdl.org>
-# Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-#
-# net/ipv4/netfilter/ipt_recent.c
-# 2005/01/03 15:49:17-08:00 rusty@rustcorp.com.au +5 -2
-# netfilter: Fix cleanup in ipt_recent should ipt_registrater_match error
-#
-diff -Nru a/net/ipv4/netfilter/ipt_recent.c b/net/ipv4/netfilter/ipt_recent.c
---- a/net/ipv4/netfilter/ipt_recent.c 2005-01-04 18:49:55 -08:00
-+++ b/net/ipv4/netfilter/ipt_recent.c 2005-01-04 18:49:55 -08:00
-@@ -959,7 +959,7 @@
- /* Kernel module initialization. */
- static int __init init(void)
- {
-- int count;
-+ int err, count;
-
- printk(version);
- #ifdef CONFIG_PROC_FS
-@@ -983,7 +983,10 @@
- if(debug) printk(KERN_INFO RECENT_NAME ": ip_list_hash_size: %d\n",ip_list_hash_size);
- #endif
-
-- return ipt_register_match(&recent_match);
-+ err = ipt_register_match(&recent_match);
-+ if (err)
-+ remove_proc_entry("ipt_recent", proc_net);
-+ return err;
- }
-
- /* Kernel module destruction. */
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/019-conntrack_tcp_RST_handling.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/019-conntrack_tcp_RST_handling.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/019-conntrack_tcp_RST_handling.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,46 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [PATCH] Fix broken RST handling in ip_conntrack
-## DP: Patch author: gandalf@netfilter.org
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/03 20:19:30-08:00 gandalf@netfilter.org
-# [PATCH] Fix broken RST handling in ip_conntrack
-#
-# Here's a patch that fixes a pretty serious bug introduced by a recent
-# "bugfix". The problem is that RST packets are ignored if they follow an
-# ACK packet, this means that the timeout of the connection isn't decreased,
-# so we get lots of old connections lingering around until the timeout
-# expires, the default timeout for state ESTABLISHED is 5 days.
-#
-# This needs to go into -bk as soon as possible. The bug is present in
-# 2.6.10 as well.
-#
-# Signed-off-by: Andrew Morton <akpm@osdl.org>
-# Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-#
-# net/ipv4/netfilter/ip_conntrack_proto_tcp.c
-# 2005/01/03 15:49:17-08:00 gandalf@netfilter.org +2 -1
-# Fix broken RST handling in ip_conntrack
-#
-diff -Nru a/net/ipv4/netfilter/ip_conntrack_proto_tcp.c b/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
---- a/net/ipv4/netfilter/ip_conntrack_proto_tcp.c 2005-01-04 18:58:34 -08:00
-+++ b/net/ipv4/netfilter/ip_conntrack_proto_tcp.c 2005-01-04 18:58:34 -08:00
-@@ -906,7 +906,8 @@
- if (index == TCP_RST_SET
- && ((test_bit(IPS_SEEN_REPLY_BIT, &conntrack->status)
- && conntrack->proto.tcp.last_index <= TCP_SYNACK_SET)
-- || conntrack->proto.tcp.last_index == TCP_ACK_SET)
-+ || (!test_bit(IPS_ASSURED_BIT, &conntrack->status)
-+ && conntrack->proto.tcp.last_index == TCP_ACK_SET))
- && after(ntohl(th->ack_seq),
- conntrack->proto.tcp.last_seq)) {
- /* Ignore RST closing down invalid SYN or ACK
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/020-clear_cyrix_mii_ecx_reg.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/020-clear_cyrix_mii_ecx_reg.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/020-clear_cyrix_mii_ecx_reg.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,110 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [PATCH] Cyrix MII cpuid returns stale %ecx
-## DP: Patch author: zwane@linuxpower.ca
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/03 20:41:13-08:00 zwane@linuxpower.ca
-# [PATCH] Cyrix MII cpuid returns stale %ecx
-#
-# This patch is for the following bug, thanks to Ondrej Zary for reporting,
-# testing and submitting a patch.
-#
-# http://bugzilla.kernel.org/show_bug.cgi?id=3767
-#
-# It appears that the Cyrix MII won't touch %ecx at all resulting in stale
-# data being returned as extended attributes, so clear ecx before issuing the
-# cpuid. I have also made the capability print code display all the
-# capability words for easier debugging in future.
-#
-# Signed-off-by: Zwane Mwaikambo <zwane@linuxpower.ca>
-# Signed-off-by: Andrew Morton <akpm@osdl.org>
-# Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-#
-# arch/i386/kernel/cpu/common.c
-# 2005/01/03 15:49:21-08:00 zwane@linuxpower.ca +13 -16
-# Cyrix MII cpuid returns stale %ecx
-#
-# include/asm-i386/processor.h
-# 2005/01/03 15:50:31-08:00 zwane@linuxpower.ca +3 -1
-# Cyrix MII cpuid returns stale %ecx
-#
-diff -Nru a/arch/i386/kernel/cpu/common.c b/arch/i386/kernel/cpu/common.c
---- a/arch/i386/kernel/cpu/common.c 2005-01-04 19:29:52 -08:00
-+++ b/arch/i386/kernel/cpu/common.c 2005-01-04 19:29:52 -08:00
-@@ -334,21 +334,19 @@
-
- generic_identify(c);
-
-- printk(KERN_DEBUG "CPU: After generic identify, caps: %08lx %08lx %08lx %08lx\n",
-- c->x86_capability[0],
-- c->x86_capability[1],
-- c->x86_capability[2],
-- c->x86_capability[3]);
-+ printk(KERN_DEBUG "CPU: After generic identify, caps:");
-+ for (i = 0; i < NCAPINTS; i++)
-+ printk(" %08lx", c->x86_capability[i]);
-+ printk("\n");
-
- if (this_cpu->c_identify) {
- this_cpu->c_identify(c);
-
-- printk(KERN_DEBUG "CPU: After vendor identify, caps: %08lx %08lx %08lx %08lx\n",
-- c->x86_capability[0],
-- c->x86_capability[1],
-- c->x86_capability[2],
-- c->x86_capability[3]);
--}
-+ printk(KERN_DEBUG "CPU: After vendor identify, caps:");
-+ for (i = 0; i < NCAPINTS; i++)
-+ printk(" %08lx", c->x86_capability[i]);
-+ printk("\n");
-+ }
-
- /*
- * Vendor-specific initialization. In this section we
-@@ -398,11 +396,10 @@
-
- /* Now the feature flags better reflect actual CPU features! */
-
-- printk(KERN_DEBUG "CPU: After all inits, caps: %08lx %08lx %08lx %08lx\n",
-- c->x86_capability[0],
-- c->x86_capability[1],
-- c->x86_capability[2],
-- c->x86_capability[3]);
-+ printk(KERN_DEBUG "CPU: After all inits, caps:");
-+ for (i = 0; i < NCAPINTS; i++)
-+ printk(" %08lx", c->x86_capability[i]);
-+ printk("\n");
-
- /*
- * On SMP, boot_cpu_data holds the common feature set between
-diff -Nru a/include/asm-i386/processor.h b/include/asm-i386/processor.h
---- a/include/asm-i386/processor.h 2005-01-04 19:29:52 -08:00
-+++ b/include/asm-i386/processor.h 2005-01-04 19:29:52 -08:00
-@@ -126,6 +126,8 @@
-
- /*
- * Generic CPUID function
-+ * clear %ecx since some cpus (Cyrix MII) do not set or clear %ecx
-+ * resulting in stale register contents being returned.
- */
- static inline void cpuid(int op, int *eax, int *ebx, int *ecx, int *edx)
- {
-@@ -134,7 +136,7 @@
- "=b" (*ebx),
- "=c" (*ecx),
- "=d" (*edx)
-- : "0" (op));
-+ : "0" (op), "c"(0));
- }
-
- /*
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/021-sunrpc_check_before_kill.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/021-sunrpc_check_before_kill.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/021-sunrpc_check_before_kill.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,71 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: RPC: Fix a bug in rpc_killall_tasks().
-## DP: Patch author: trond.myklebust@fys.uio.no
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/04 19:35:12+01:00 trond.myklebust@fys.uio.no
-# RPC: Fix a bug in rpc_killall_tasks().
-#
-# Shirly Ma reported seeing problems with rpc_killall_tasks() causing
-# the task->tk_magic debugging test to trigger. It turns out we may be
-# killing tasks that are not yet running or even initialized.
-#
-# Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
-#
-# net/sunrpc/sched.c
-# 2005/01/04 01:00:00+01:00 trond.myklebust@fys.uio.no +9 -6
-# RPC: Fix a bug in rpc_killall_tasks().
-#
-diff -Nru a/net/sunrpc/sched.c b/net/sunrpc/sched.c
---- a/net/sunrpc/sched.c 2005-01-04 19:45:47 -08:00
-+++ b/net/sunrpc/sched.c 2005-01-04 19:45:47 -08:00
-@@ -762,11 +762,6 @@
- if (!RPC_IS_ASYNC(task))
- init_waitqueue_head(&task->u.tk_wait.waitq);
-
-- /* Add to global list of all tasks */
-- spin_lock(&rpc_sched_lock);
-- list_add(&task->tk_task, &all_tasks);
-- spin_unlock(&rpc_sched_lock);
--
- if (clnt) {
- atomic_inc(&clnt->cl_users);
- if (clnt->cl_softrtry)
-@@ -779,6 +774,11 @@
- task->tk_magic = 0xf00baa;
- task->tk_pid = rpc_task_id++;
- #endif
-+ /* Add to global list of all tasks */
-+ spin_lock(&rpc_sched_lock);
-+ list_add_tail(&task->tk_task, &all_tasks);
-+ spin_unlock(&rpc_sched_lock);
-+
- dprintk("RPC: %4d new task procpid %d\n", task->tk_pid,
- current->pid);
- }
-@@ -952,12 +952,15 @@
- * Spin lock all_tasks to prevent changes...
- */
- spin_lock(&rpc_sched_lock);
-- alltask_for_each(rovr, le, &all_tasks)
-+ alltask_for_each(rovr, le, &all_tasks) {
-+ if (! RPC_IS_ACTIVATED(rovr))
-+ continue;
- if (!clnt || rovr->tk_client == clnt) {
- rovr->tk_flags |= RPC_TASK_KILLED;
- rpc_exit(rovr, -EIO);
- rpc_wake_up_task(rovr);
- }
-+ }
- spin_unlock(&rpc_sched_lock);
- }
-
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/022-sunrpc_xdr_flush_pages.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/022-sunrpc_xdr_flush_pages.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/022-sunrpc_xdr_flush_pages.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,57 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: RPC: Add missing calls to flush_dcache_page() in net/sunrpc/xdr.c
-## DP: Patch author: trond.myklebust@fys.uio.no
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/04 19:36:01+01:00 trond.myklebust@fys.uio.no
-# RPC: Add missing calls to flush_dcache_page() in net/sunrpc/xdr.c
-#
-# Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
-#
-# net/sunrpc/xdr.c
-# 2005/01/04 01:00:00+01:00 trond.myklebust@fys.uio.no +4 -0
-# RPC: Add missing calls to flush_dcache_page() in net/sunrpc/xdr.c
-#
-diff -Nru a/net/sunrpc/xdr.c b/net/sunrpc/xdr.c
---- a/net/sunrpc/xdr.c 2005-01-04 19:53:04 -08:00
-+++ b/net/sunrpc/xdr.c 2005-01-04 19:53:04 -08:00
-@@ -371,6 +371,7 @@
- do {
- /* Are any pointers crossing a page boundary? */
- if (pgto_base == 0) {
-+ flush_dcache_page(*pgto);
- pgto_base = PAGE_CACHE_SIZE;
- pgto--;
- }
-@@ -394,6 +395,7 @@
- kunmap_atomic(vto, KM_USER0);
-
- } while ((len -= copy) != 0);
-+ flush_dcache_page(*pgto);
- }
-
- /*
-@@ -427,12 +429,14 @@
-
- pgbase += copy;
- if (pgbase == PAGE_CACHE_SIZE) {
-+ flush_dcache_page(*pgto);
- pgbase = 0;
- pgto++;
- }
- p += copy;
-
- } while ((len -= copy) != 0);
-+ flush_dcache_page(*pgto);
- }
-
- /*
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/023-nfs_dentry_refcount.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/023-nfs_dentry_refcount.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/023-nfs_dentry_refcount.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,49 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: NFS: Fix dentry refcount accounting error which causes unnecessary
-## DP: Patch author: trond.myklebust@fys.uio.no
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/04 19:43:24+01:00 trond.myklebust@fys.uio.no
-# NFS: Fix dentry refcount accounting error which causes unnecessary
-# sillyrenames when renaming to an existing file.
-#
-# Signed-off-by: Greg Banks <gnb@melbourne.sgi.com>
-# Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>
-#
-# fs/nfs/dir.c
-# 2005/01/04 01:00:00+01:00 trond.myklebust@fys.uio.no +2 -4
-# NFS: Fix dentry refcount accounting error which causes unnecessary
-#
-diff -Nru a/fs/nfs/dir.c b/fs/nfs/dir.c
---- a/fs/nfs/dir.c 2005-01-04 19:56:57 -08:00
-+++ b/fs/nfs/dir.c 2005-01-04 19:56:57 -08:00
-@@ -1382,7 +1382,7 @@
- goto go_ahead;
- if (S_ISDIR(new_inode->i_mode))
- goto out;
-- else if (atomic_read(&new_dentry->d_count) > 1) {
-+ else if (atomic_read(&new_dentry->d_count) > 2) {
- int err;
- /* copy the target dentry's name */
- dentry = d_alloc(new_dentry->d_parent,
-@@ -1397,10 +1397,8 @@
- new_inode = NULL;
- /* instantiate the replacement target */
- d_instantiate(new_dentry, NULL);
-- }
--
-+ } else if (atomic_read(&new_dentry->d_count) > 1) {
- /* dentry still busy? */
-- if (atomic_read(&new_dentry->d_count) > 1) {
- #ifdef NFS_PARANOIA
- printk("nfs_rename: target %s/%s busy, d_count=%d\n",
- new_dentry->d_parent->d_name.name,
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/024-nfs_incorrect_df_output.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/024-nfs_incorrect_df_output.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/024-nfs_incorrect_df_output.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,60 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: Subject: [PATCH] NFS: incorrect "df" results
-## DP: Patch author: trond.myklebust@fys.uio.no
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/04 19:48:45+01:00 trond.myklebust@fys.uio.no
-# Subject: [PATCH] NFS: incorrect "df" results
-#
-# Description:
-# Fix an NFS client bug introduced in 2.6.9-rc1. The "df" command was
-# reporting the size of NFS file systems incorrectly.
-#
-# Signed-off-by: Chuck Lever <cel@netapp.com>
-# Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>
-#
-# fs/nfs/inode.c
-# 2005/01/04 01:00:00+01:00 trond.myklebust@fys.uio.no +15 -1
-# Subject: [PATCH] NFS: incorrect "df" results
-#
-diff -Nru a/fs/nfs/inode.c b/fs/nfs/inode.c
---- a/fs/nfs/inode.c 2005-01-04 19:59:27 -08:00
-+++ b/fs/nfs/inode.c 2005-01-04 19:59:27 -08:00
-@@ -486,13 +486,27 @@
- if (error < 0)
- goto out_err;
-
-- buf->f_frsize = server->wtmult;
-+ /*
-+ * Current versions of glibc do not correctly handle the
-+ * case where f_frsize != f_bsize. Eventually we want to
-+ * report the value of wtmult in this field.
-+ */
-+ buf->f_frsize = sb->s_blocksize;
-+
-+ /*
-+ * On most *nix systems, f_blocks, f_bfree, and f_bavail
-+ * are reported in units of f_frsize. Linux hasn't had
-+ * an f_frsize field in its statfs struct until recently,
-+ * thus historically Linux's sys_statfs reports these
-+ * fields in units of f_bsize.
-+ */
- buf->f_bsize = sb->s_blocksize;
- blockbits = sb->s_blocksize_bits;
- blockres = (1 << blockbits) - 1;
- buf->f_blocks = (res.tbytes + blockres) >> blockbits;
- buf->f_bfree = (res.fbytes + blockres) >> blockbits;
- buf->f_bavail = (res.abytes + blockres) >> blockbits;
-+
- buf->f_files = res.tfiles;
- buf->f_ffree = res.afiles;
-
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/025-track_dummy_capability.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/025-track_dummy_capability.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/025-track_dummy_capability.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,61 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [PATCH] track capabilities in default dummy security module code
-## DP: Patch author: chrisw@osdl.org
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/04 13:54:13-08:00 chrisw@osdl.org
-# [PATCH] track capabilities in default dummy security module code
-#
-# Switch dummy logic around to set cap_* bits during exec and set*uid based
-# on basic uid check. Then check cap_* bits during capable() (rather than
-# doing basic uid check). This ensures that capability bits are properly
-# initialized in case the capability module is later loaded.
-#
-# Signed-off-by: Chris Wright <chrisw@osdl.org>
-# Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-#
-# security/dummy.c
-# 2005/01/04 13:14:10-08:00 chrisw@osdl.org +3 -4
-# track capabilities in default dummy security module code
-#
-diff -Nru a/security/dummy.c b/security/dummy.c
---- a/security/dummy.c 2005-01-04 20:00:14 -08:00
-+++ b/security/dummy.c 2005-01-04 20:00:14 -08:00
-@@ -74,11 +74,8 @@
-
- static int dummy_capable (struct task_struct *tsk, int cap)
- {
-- if (cap_is_fs_cap (cap) ? tsk->fsuid == 0 : tsk->euid == 0)
-- /* capability granted */
-+ if (cap_raised (tsk->cap_effective, cap))
- return 0;
--
-- /* capability denied */
- return -EPERM;
- }
-
-@@ -183,6 +180,7 @@
-
- static void dummy_bprm_free_security (struct linux_binprm *bprm)
- {
-+ dummy_capget(current, ¤t->cap_effective, ¤t->cap_inheritable, ¤t->cap_permitted);
- return;
- }
-
-@@ -558,6 +556,7 @@
-
- static int dummy_task_post_setuid (uid_t id0, uid_t id1, uid_t id2, int flags)
- {
-+ dummy_capget(current, ¤t->cap_effective, ¤t->cap_inheritable, ¤t->cap_permitted);
- return 0;
- }
-
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/026-nfs_o_direct_error.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/026-nfs_o_direct_error.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/026-nfs_o_direct_error.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,45 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [PATCH] NFS client O_DIRECT error case fix
-## DP: Patch author: brugolsky@telemetry-investments.com
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/04 15:57:25-08:00 brugolsky@telemetry-investments.com
-# [PATCH] NFS client O_DIRECT error case fix
-#
-# The NFS direct-io error return path for request sizes greater than
-# MAX_DIRECTIO_SIZE fails to initialize the returned page struct array
-# pointer to NULL.
-#
-# Discovered using AKPM's ext3-tools: odwrite -ko 0 16385 foo
-#
-# Signed-off-by: Bill Rugolsky <brugolsky@telemetry-investments.com>
-# Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-#
-# fs/nfs/direct.c
-# 2005/01/04 13:55:37-08:00 brugolsky@telemetry-investments.com +3 -1
-# NFS client O_DIRECT error case fix
-#
-diff -Nru a/fs/nfs/direct.c b/fs/nfs/direct.c
---- a/fs/nfs/direct.c 2005-01-04 20:03:28 -08:00
-+++ b/fs/nfs/direct.c 2005-01-04 20:03:28 -08:00
-@@ -72,8 +72,10 @@
- size_t array_size;
-
- /* set an arbitrary limit to prevent arithmetic overflow */
-- if (size > MAX_DIRECTIO_SIZE)
-+ if (size > MAX_DIRECTIO_SIZE) {
-+ *pages = NULL;
- return -EFBIG;
-+ }
-
- page_count = (user_addr + size + PAGE_SIZE - 1) >> PAGE_SHIFT;
- page_count -= user_addr >> PAGE_SHIFT;
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/027-track_dummy_capability.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/027-track_dummy_capability.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/027-track_dummy_capability.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,50 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [PATCH] fix up dummy security module code merge
-## DP: Patch author: chrisw@osdl.org
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/04 15:59:03-08:00 chrisw@osdl.org
-# [PATCH] fix up dummy security module code merge
-#
-# OK, somehow I managed to botch this one. It happens to work fine, but I
-# should have been more careful with forward porting this 1+ year old patch.
-# The exec-time calc should go in bprm_apply_creds, not bprm_free_security.
-#
-# Thanks to Stephen for spotting my mistake.
-#
-# Signed-off-by: Chris Wright <chrisw@osdl.org>
-# Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-#
-# security/dummy.c
-# 2005/01/04 14:45:31-08:00 chrisw@osdl.org +2 -1
-# fix up dummy security module code merge
-#
-diff -Nru a/security/dummy.c b/security/dummy.c
---- a/security/dummy.c 2005-01-04 20:05:02 -08:00
-+++ b/security/dummy.c 2005-01-04 20:05:02 -08:00
-@@ -180,7 +180,6 @@
-
- static void dummy_bprm_free_security (struct linux_binprm *bprm)
- {
-- dummy_capget(current, ¤t->cap_effective, ¤t->cap_inheritable, ¤t->cap_permitted);
- return;
- }
-
-@@ -197,6 +196,8 @@
-
- current->suid = current->euid = current->fsuid = bprm->e_uid;
- current->sgid = current->egid = current->fsgid = bprm->e_gid;
-+
-+ dummy_capget(current, ¤t->cap_effective, ¤t->cap_inheritable, ¤t->cap_permitted);
- }
-
- static int dummy_bprm_set_security (struct linux_binprm *bprm)
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/031-sg_scsi_ioctl_int_overflows.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/031-sg_scsi_ioctl_int_overflows.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/031-sg_scsi_ioctl_int_overflows.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,43 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [SECURITY] Fix exploitable hole in sg_scsi_ioctl
-## DP: Patch author: James Bottomley <James.Bottomley@SteelEye.com>
-## DP: Upstream status: backported from scsi-misc
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/07 16:38:51-05:00 jejb@mulgrave.(none)
-# Fix exploitable hole in sg_scsi_ioctl
-#
-# in_len and out_len are signed quantites copied from
-# user space but are only checked to see if they're >
-# PAGE_SIZE. The exploit would be to pass in a negative
-# quantity which would pass the check.
-#
-# Fix by making them unsigned.
-#
-# Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
-#
-# drivers/block/scsi_ioctl.c
-# 2005/01/07 16:36:05-05:00 jejb@mulgrave.(none) +2 -1
-# Fix exploitable hole in sg_scsi_ioctl
-#
-diff -Nru a/drivers/block/scsi_ioctl.c b/drivers/block/scsi_ioctl.c
---- a/drivers/block/scsi_ioctl.c 2005-01-07 17:24:38 -08:00
-+++ b/drivers/block/scsi_ioctl.c 2005-01-07 17:24:38 -08:00
-@@ -339,7 +339,8 @@
- struct gendisk *bd_disk, Scsi_Ioctl_Command __user *sic)
- {
- struct request *rq;
-- int err, in_len, out_len, bytes, opcode, cmdlen;
-+ int err;
-+ unsigned int in_len, out_len, bytes, opcode, cmdlen;
- char *buffer = NULL, sense[SCSI_SENSE_BUFFERSIZE];
-
- /*
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/032-do_brk_security_fixes.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/032-do_brk_security_fixes.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/032-do_brk_security_fixes.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,58 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: Fix do_brk() locking in library loader
-## DP: Patch author: torvalds@ppc970.osdl.org
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/07 15:58:52-08:00 torvalds@ppc970.osdl.org
-# Fix do_brk() locking in library loader
-#
-# The regular executable loader path doesn't need the locking,
-# because it's the only user of its VM. But the same is not true
-# at library load time. So get the mmap semaphore.
-#
-# fs/binfmt_aout.c
-# 2005/01/07 15:58:44-08:00 torvalds@ppc970.osdl.org +2 -0
-# Fix do_brk() locking in library loader
-#
-# fs/binfmt_elf.c
-# 2005/01/07 15:58:45-08:00 torvalds@ppc970.osdl.org +4 -1
-# Fix do_brk() locking in library loader
-#
-diff -Nru a/fs/binfmt_aout.c b/fs/binfmt_aout.c
---- a/fs/binfmt_aout.c 2005-01-08 01:41:21 -08:00
-+++ b/fs/binfmt_aout.c 2005-01-08 01:41:21 -08:00
-@@ -512,7 +512,9 @@
- len = PAGE_ALIGN(ex.a_text + ex.a_data);
- bss = ex.a_text + ex.a_data + ex.a_bss;
- if (bss > len) {
-+ down_write(¤t->mm->mmap_sem);
- error = do_brk(start_addr + len, bss - len);
-+ up_write(¤t->mm->mmap_sem);
- retval = error;
- if (error != start_addr + len)
- goto out;
-diff -Nru a/fs/binfmt_elf.c b/fs/binfmt_elf.c
---- a/fs/binfmt_elf.c 2005-01-08 01:41:21 -08:00
-+++ b/fs/binfmt_elf.c 2005-01-08 01:41:21 -08:00
-@@ -1024,8 +1024,11 @@
-
- len = ELF_PAGESTART(elf_phdata->p_filesz + elf_phdata->p_vaddr + ELF_MIN_ALIGN - 1);
- bss = elf_phdata->p_memsz + elf_phdata->p_vaddr;
-- if (bss > len)
-+ if (bss > len) {
-+ down_write(¤t->mm->mmap_sem);
- do_brk(len, bss - len);
-+ up_write(¤t->mm->mmap_sem);
-+ }
- error = 0;
-
- out_free_ph:
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/033-rlimit_memlock_check.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/033-rlimit_memlock_check.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/033-rlimit_memlock_check.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,182 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: Clean up stack growth checks and move them into a common function.
-## DP: Patch author: torvalds@ppc970.osdl.org
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/10 11:23:42-08:00 torvalds@ppc970.osdl.org
-# Clean up stack growth checks and move them into a common function.
-#
-# The grows-up and grows-down cases had all the same issues, but
-# differered in the details. Additionlly, historical evolution of
-# the tests had caused the result to be pretty unreadable with some
-# rather long and complex conditionals.
-#
-# Fix it all up in a more readable helper function.
-#
-# This also adds the missing RLIMIT_MEMLOCK test.
-#
-# mm/mmap.c
-# 2005/01/10 11:23:35-08:00 torvalds@ppc970.osdl.org +61 -44
-# Clean up stack growth checks and move them into a common function.
-#
-# The grows-up and grows-down cases had all the same issues, but
-# differered in the details. Additionlly, historical evolution of
-# the tests had caused the result to be pretty unreadable with some
-# rather long and complex conditionals.
-#
-# Fix it all up in a more readable helper function.
-#
-# This also adds the missing RLIMIT_MEMLOCK test.
-#
-diff -Nru a/mm/mmap.c b/mm/mmap.c
---- a/mm/mmap.c 2005-01-12 20:21:10 -08:00
-+++ b/mm/mmap.c 2005-01-12 20:21:10 -08:00
-@@ -1335,13 +1335,58 @@
- return prev ? prev->vm_next : vma;
- }
-
-+/*
-+ * Verify that the stack growth is acceptable and
-+ * update accounting. This is shared with both the
-+ * grow-up and grow-down cases.
-+ */
-+static int acct_stack_growth(struct vm_area_struct * vma, unsigned long size, unsigned long grow)
-+{
-+ struct mm_struct *mm = vma->vm_mm;
-+ struct rlimit *rlim = current->signal->rlim;
-+
-+ /* address space limit tests */
-+ rlim = current->signal->rlim;
-+ if (mm->total_vm + grow > rlim[RLIMIT_AS].rlim_cur >> PAGE_SHIFT)
-+ return -ENOMEM;
-+
-+ /* Stack limit test */
-+ if (size > rlim[RLIMIT_STACK].rlim_cur)
-+ return -ENOMEM;
-+
-+ /* mlock limit tests */
-+ if (vma->vm_flags & VM_LOCKED) {
-+ unsigned long locked;
-+ unsigned long limit;
-+ locked = mm->locked_vm + grow;
-+ limit = rlim[RLIMIT_MEMLOCK].rlim_cur >> PAGE_SHIFT;
-+ if (locked > limit)
-+ return -ENOMEM;
-+ }
-+
-+ /*
-+ * Overcommit.. This must be the final test, as it will
-+ * update security statistics.
-+ */
-+ if (security_vm_enough_memory(grow))
-+ return -ENOMEM;
-+
-+ /* Ok, everything looks good - let it rip */
-+ mm->total_vm += grow;
-+ if (vma->vm_flags & VM_LOCKED)
-+ mm->locked_vm += grow;
-+ __vm_stat_account(mm, vma->vm_flags, vma->vm_file, grow);
-+ return 0;
-+}
-+
- #ifdef CONFIG_STACK_GROWSUP
- /*
- * vma is the first one with address > vma->vm_end. Have to extend vma.
- */
- int expand_stack(struct vm_area_struct * vma, unsigned long address)
- {
-- unsigned long grow;
-+ int error;
-+ unsigned long size, grow;
-
- if (!(vma->vm_flags & VM_GROWSUP))
- return -EFAULT;
-@@ -1361,28 +1406,14 @@
- */
- address += 4 + PAGE_SIZE - 1;
- address &= PAGE_MASK;
-+ size = address - vma->vm_start;
- grow = (address - vma->vm_end) >> PAGE_SHIFT;
-
-- /* Overcommit.. */
-- if (security_vm_enough_memory(grow)) {
-- anon_vma_unlock(vma);
-- return -ENOMEM;
-- }
--
-- if (address - vma->vm_start > current->signal->rlim[RLIMIT_STACK].rlim_cur ||
-- ((vma->vm_mm->total_vm + grow) << PAGE_SHIFT) >
-- current->signal->rlim[RLIMIT_AS].rlim_cur) {
-- anon_vma_unlock(vma);
-- vm_unacct_memory(grow);
-- return -ENOMEM;
-- }
-- vma->vm_end = address;
-- vma->vm_mm->total_vm += grow;
-- if (vma->vm_flags & VM_LOCKED)
-- vma->vm_mm->locked_vm += grow;
-- __vm_stat_account(vma->vm_mm, vma->vm_flags, vma->vm_file, grow);
-+ error = acct_stack_growth(vma, size, grow);
-+ if (!error)
-+ vma->vm_end = address;
- anon_vma_unlock(vma);
-- return 0;
-+ return error;
- }
-
- struct vm_area_struct *
-@@ -1409,7 +1440,8 @@
- */
- int expand_stack(struct vm_area_struct *vma, unsigned long address)
- {
-- unsigned long grow;
-+ int error;
-+ unsigned long size, grow;
-
- /*
- * We must make sure the anon_vma is allocated
-@@ -1425,29 +1457,16 @@
- * anon_vma lock to serialize against concurrent expand_stacks.
- */
- address &= PAGE_MASK;
-+ size = vma->vm_end - address;
- grow = (vma->vm_start - address) >> PAGE_SHIFT;
-
-- /* Overcommit.. */
-- if (security_vm_enough_memory(grow)) {
-- anon_vma_unlock(vma);
-- return -ENOMEM;
-- }
--
-- if (vma->vm_end - address > current->signal->rlim[RLIMIT_STACK].rlim_cur ||
-- ((vma->vm_mm->total_vm + grow) << PAGE_SHIFT) >
-- current->signal->rlim[RLIMIT_AS].rlim_cur) {
-- anon_vma_unlock(vma);
-- vm_unacct_memory(grow);
-- return -ENOMEM;
-+ error = acct_stack_growth(vma, size, grow);
-+ if (!error) {
-+ vma->vm_start = address;
-+ vma->vm_pgoff -= grow;
- }
-- vma->vm_start = address;
-- vma->vm_pgoff -= grow;
-- vma->vm_mm->total_vm += grow;
-- if (vma->vm_flags & VM_LOCKED)
-- vma->vm_mm->locked_vm += grow;
-- __vm_stat_account(vma->vm_mm, vma->vm_flags, vma->vm_file, grow);
- anon_vma_unlock(vma);
-- return 0;
-+ return error;
- }
-
- struct vm_area_struct *
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/034-stack_resize_exploit.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/034-stack_resize_exploit.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/034-stack_resize_exploit.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,101 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: Handle two threads both trying to expand their stack simultaneously.
-## DP: Patch author: torvalds@ppc970.osdl.org
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/12 08:09:20-08:00 torvalds@ppc970.osdl.org
-# Handle two threads both trying to expand their stack simultaneously.
-#
-# We had all the locking right, but we didn't check whether one of the
-# threads now no longer needed to expand, so we could incorrectly _shrink_
-# the stack in the other thread instead (not only causing segfaults, but
-# since we didn't do a proper unmap, we'd possibly leak pages too).
-#
-# So re-check the need for expand after getting the lock.
-#
-# Noticed by Paul Starzetz.
-#
-# mm/mmap.c
-# 2005/01/12 08:09:12-08:00 torvalds@ppc970.osdl.org +25 -13
-# Handle two threads both trying to expand their stack simultaneously.
-#
-diff -Nru a/mm/mmap.c b/mm/mmap.c
---- a/mm/mmap.c 2005-01-12 20:22:12 -08:00
-+++ b/mm/mmap.c 2005-01-12 20:22:12 -08:00
-@@ -1475,7 +1475,6 @@
- int expand_stack(struct vm_area_struct * vma, unsigned long address)
- {
- int error;
-- unsigned long size, grow;
-
- if (!(vma->vm_flags & VM_GROWSUP))
- return -EFAULT;
-@@ -1495,12 +1494,19 @@
- */
- address += 4 + PAGE_SIZE - 1;
- address &= PAGE_MASK;
-- size = address - vma->vm_start;
-- grow = (address - vma->vm_end) >> PAGE_SHIFT;
-+ error = 0;
-
-- error = acct_stack_growth(vma, size, grow);
-- if (!error)
-- vma->vm_end = address;
-+ /* Somebody else might have raced and expanded it already */
-+ if (address > vma->vm_end) {
-+ unsigned long size, grow;
-+
-+ size = address - vma->vm_start;
-+ grow = (address - vma->vm_end) >> PAGE_SHIFT;
-+
-+ error = acct_stack_growth(vma, size, grow);
-+ if (!error)
-+ vma->vm_end = address;
-+ }
- anon_vma_unlock(vma);
- return error;
- }
-@@ -1528,7 +1534,6 @@
- int expand_stack(struct vm_area_struct *vma, unsigned long address)
- {
- int error;
-- unsigned long size, grow;
-
- /*
- * We must make sure the anon_vma is allocated
-@@ -1544,13 +1549,20 @@
- * anon_vma lock to serialize against concurrent expand_stacks.
- */
- address &= PAGE_MASK;
-- size = vma->vm_end - address;
-- grow = (vma->vm_start - address) >> PAGE_SHIFT;
-+ error = 0;
-
-- error = acct_stack_growth(vma, size, grow);
-- if (!error) {
-- vma->vm_start = address;
-- vma->vm_pgoff -= grow;
-+ /* Somebody else might have raced and expanded it already */
-+ if (address < vma->vm_start) {
-+ unsigned long size, grow;
-+
-+ size = vma->vm_end - address;
-+ grow = (vma->vm_start - address) >> PAGE_SHIFT;
-+
-+ error = acct_stack_growth(vma, size, grow);
-+ if (!error) {
-+ vma->vm_start = address;
-+ vma->vm_pgoff -= grow;
-+ }
- }
- anon_vma_unlock(vma);
- return error;
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/035-do_brk_security_fixes.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/035-do_brk_security_fixes.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/035-do_brk_security_fixes.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,334 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [PATCH] do_brk() needs mmap_sem write-locked
-## DP: Patch author: marcelo.tosatti@cyclades.com
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/12 08:12:09-08:00 marcelo.tosatti@cyclades.com
-# [PATCH] do_brk() needs mmap_sem write-locked
-#
-# It seems to be general consensus that its safer to require all do_brk() callers
-# to grab mmap_sem, and have do_brk to warn otherwise. This is what the following
-# patch does.
-#
-# Similar version has been changed to in v2.4.
-#
-# Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-#
-# arch/mips/kernel/irixelf.c
-# 2005/01/11 17:35:36-08:00 marcelo.tosatti@cyclades.com +10 -1
-# do_brk() needs mmap_sem write-locked
-#
-# arch/sparc64/kernel/binfmt_aout32.c
-# 2005/01/11 17:37:28-08:00 marcelo.tosatti@cyclades.com +12 -0
-# do_brk() needs mmap_sem write-locked
-#
-# arch/x86_64/ia32/ia32_aout.c
-# 2005/01/11 17:34:26-08:00 marcelo.tosatti@cyclades.com +11 -1
-# do_brk() needs mmap_sem write-locked
-#
-# fs/binfmt_aout.c
-# 2005/01/11 17:31:51-08:00 marcelo.tosatti@cyclades.com +14 -3
-# do_brk() needs mmap_sem write-locked
-#
-# fs/binfmt_elf.c
-# 2005/01/11 18:07:01-08:00 marcelo.tosatti@cyclades.com +11 -1
-# do_brk() needs mmap_sem write-locked
-#
-# mm/mmap.c
-# 2005/01/11 17:43:11-08:00 marcelo.tosatti@cyclades.com +6 -0
-# do_brk() needs mmap_sem write-locked
-#
-diff -Nru a/arch/mips/kernel/irixelf.c b/arch/mips/kernel/irixelf.c
---- a/arch/mips/kernel/irixelf.c 2005-01-12 20:26:27 -08:00
-+++ b/arch/mips/kernel/irixelf.c 2005-01-12 20:26:27 -08:00
-@@ -127,7 +127,9 @@
- end = PAGE_ALIGN(end);
- if (end <= start)
- return;
-+ down_write(¤t->mm->mmap_sem);
- do_brk(start, end - start);
-+ up_write(¤t->mm->mmap_sem);
- }
-
-
-@@ -375,7 +377,9 @@
-
- /* Map the last of the bss segment */
- if (last_bss > len) {
-+ down_write(¤t->mm->mmap_sem);
- do_brk(len, (last_bss - len));
-+ up_write(¤t->mm->mmap_sem);
- }
- kfree(elf_phdata);
-
-@@ -562,7 +566,9 @@
- unsigned long v;
- struct prda *pp;
-
-+ down_write(¤t->mm->mmap_sem);
- v = do_brk (PRDA_ADDRESS, PAGE_SIZE);
-+ up_write(¤t->mm->mmap_sem);
-
- if (v < 0)
- return;
-@@ -852,8 +858,11 @@
-
- len = (elf_phdata->p_filesz + elf_phdata->p_vaddr+ 0xfff) & 0xfffff000;
- bss = elf_phdata->p_memsz + elf_phdata->p_vaddr;
-- if (bss > len)
-+ if (bss > len) {
-+ down_write(¤t->mm->mmap_sem);
- do_brk(len, bss-len);
-+ up_write(¤t->mm->mmap_sem);
-+ }
- kfree(elf_phdata);
- return 0;
- }
-diff -Nru a/arch/sparc64/kernel/binfmt_aout32.c b/arch/sparc64/kernel/binfmt_aout32.c
---- a/arch/sparc64/kernel/binfmt_aout32.c 2005-01-12 20:26:27 -08:00
-+++ b/arch/sparc64/kernel/binfmt_aout32.c 2005-01-12 20:26:27 -08:00
-@@ -49,7 +49,9 @@
- end = PAGE_ALIGN(end);
- if (end <= start)
- return;
-+ down_write(¤t->mm->mmap_sem);
- do_brk(start, end - start);
-+ up_write(¤t->mm->mmap_sem);
- }
-
- /*
-@@ -246,10 +248,14 @@
- if (N_MAGIC(ex) == NMAGIC) {
- loff_t pos = fd_offset;
- /* Fuck me plenty... */
-+ down_write(¤t->mm->mmap_sem);
- error = do_brk(N_TXTADDR(ex), ex.a_text);
-+ up_write(¤t->mm->mmap_sem);
- bprm->file->f_op->read(bprm->file, (char __user *)N_TXTADDR(ex),
- ex.a_text, &pos);
-+ down_write(¤t->mm->mmap_sem);
- error = do_brk(N_DATADDR(ex), ex.a_data);
-+ up_write(¤t->mm->mmap_sem);
- bprm->file->f_op->read(bprm->file, (char __user *)N_DATADDR(ex),
- ex.a_data, &pos);
- goto beyond_if;
-@@ -257,8 +263,10 @@
-
- if (N_MAGIC(ex) == OMAGIC) {
- loff_t pos = fd_offset;
-+ down_write(¤t->mm->mmap_sem);
- do_brk(N_TXTADDR(ex) & PAGE_MASK,
- ex.a_text+ex.a_data + PAGE_SIZE - 1);
-+ up_write(¤t->mm->mmap_sem);
- bprm->file->f_op->read(bprm->file, (char __user *)N_TXTADDR(ex),
- ex.a_text+ex.a_data, &pos);
- } else {
-@@ -272,7 +280,9 @@
-
- if (!bprm->file->f_op->mmap) {
- loff_t pos = fd_offset;
-+ down_write(¤t->mm->mmap_sem);
- do_brk(0, ex.a_text+ex.a_data);
-+ up_write(¤t->mm->mmap_sem);
- bprm->file->f_op->read(bprm->file,
- (char __user *)N_TXTADDR(ex),
- ex.a_text+ex.a_data, &pos);
-@@ -389,7 +399,9 @@
- len = PAGE_ALIGN(ex.a_text + ex.a_data);
- bss = ex.a_text + ex.a_data + ex.a_bss;
- if (bss > len) {
-+ down_write(¤t->mm->mmap_sem);
- error = do_brk(start_addr + len, bss - len);
-+ up_write(¤t->mm->mmap_sem);
- retval = error;
- if (error != start_addr + len)
- goto out;
-diff -Nru a/arch/x86_64/ia32/ia32_aout.c b/arch/x86_64/ia32/ia32_aout.c
---- a/arch/x86_64/ia32/ia32_aout.c 2005-01-12 20:26:27 -08:00
-+++ b/arch/x86_64/ia32/ia32_aout.c 2005-01-12 20:26:27 -08:00
-@@ -115,7 +115,9 @@
- end = PAGE_ALIGN(end);
- if (end <= start)
- return;
-+ down_write(¤t->mm->mmap_sem);
- do_brk(start, end - start);
-+ up_write(¤t->mm->mmap_sem);
- }
-
- #if CORE_DUMP
-@@ -325,7 +327,10 @@
- pos = 32;
- map_size = ex.a_text+ex.a_data;
-
-+ down_write(¤t->mm->mmap_sem);
- error = do_brk(text_addr & PAGE_MASK, map_size);
-+ up_write(¤t->mm->mmap_sem);
-+
- if (error != (text_addr & PAGE_MASK)) {
- send_sig(SIGKILL, current, 0);
- return error;
-@@ -361,7 +366,9 @@
-
- if (!bprm->file->f_op->mmap||((fd_offset & ~PAGE_MASK) != 0)) {
- loff_t pos = fd_offset;
-+ down_write(¤t->mm->mmap_sem);
- do_brk(N_TXTADDR(ex), ex.a_text+ex.a_data);
-+ up_write(¤t->mm->mmap_sem);
- bprm->file->f_op->read(bprm->file,(char *)N_TXTADDR(ex),
- ex.a_text+ex.a_data, &pos);
- flush_icache_range((unsigned long) N_TXTADDR(ex),
-@@ -469,8 +476,9 @@
- error_time = jiffies;
- }
- #endif
--
-+ down_write(¤t->mm->mmap_sem);
- do_brk(start_addr, ex.a_text + ex.a_data + ex.a_bss);
-+ up_write(¤t->mm->mmap_sem);
-
- file->f_op->read(file, (char *)start_addr,
- ex.a_text + ex.a_data, &pos);
-@@ -494,7 +502,9 @@
- len = PAGE_ALIGN(ex.a_text + ex.a_data);
- bss = ex.a_text + ex.a_data + ex.a_bss;
- if (bss > len) {
-+ down_write(¤t->mm->mmap_sem);
- error = do_brk(start_addr + len, bss - len);
-+ up_write(¤t->mm->mmap_sem);
- retval = error;
- if (error != start_addr + len)
- goto out;
-diff -Nru a/fs/binfmt_aout.c b/fs/binfmt_aout.c
---- a/fs/binfmt_aout.c 2005-01-12 20:26:27 -08:00
-+++ b/fs/binfmt_aout.c 2005-01-12 20:26:27 -08:00
-@@ -50,7 +50,10 @@
- start = PAGE_ALIGN(start);
- end = PAGE_ALIGN(end);
- if (end > start) {
-- unsigned long addr = do_brk(start, end - start);
-+ unsigned long addr;
-+ down_write(¤t->mm->mmap_sem);
-+ addr = do_brk(start, end - start);
-+ up_write(¤t->mm->mmap_sem);
- if (BAD_ADDR(addr))
- return addr;
- }
-@@ -323,10 +326,14 @@
- loff_t pos = fd_offset;
- /* Fuck me plenty... */
- /* <AOL></AOL> */
-+ down_write(¤t->mm->mmap_sem);
- error = do_brk(N_TXTADDR(ex), ex.a_text);
-+ up_write(¤t->mm->mmap_sem);
- bprm->file->f_op->read(bprm->file, (char *) N_TXTADDR(ex),
- ex.a_text, &pos);
-+ down_write(¤t->mm->mmap_sem);
- error = do_brk(N_DATADDR(ex), ex.a_data);
-+ up_write(¤t->mm->mmap_sem);
- bprm->file->f_op->read(bprm->file, (char *) N_DATADDR(ex),
- ex.a_data, &pos);
- goto beyond_if;
-@@ -346,8 +353,9 @@
- pos = 32;
- map_size = ex.a_text+ex.a_data;
- #endif
--
-+ down_write(¤t->mm->mmap_sem);
- error = do_brk(text_addr & PAGE_MASK, map_size);
-+ up_write(¤t->mm->mmap_sem);
- if (error != (text_addr & PAGE_MASK)) {
- send_sig(SIGKILL, current, 0);
- return error;
-@@ -382,7 +390,9 @@
-
- if (!bprm->file->f_op->mmap||((fd_offset & ~PAGE_MASK) != 0)) {
- loff_t pos = fd_offset;
-+ down_write(¤t->mm->mmap_sem);
- do_brk(N_TXTADDR(ex), ex.a_text+ex.a_data);
-+ up_write(¤t->mm->mmap_sem);
- bprm->file->f_op->read(bprm->file,
- (char __user *)N_TXTADDR(ex),
- ex.a_text+ex.a_data, &pos);
-@@ -487,8 +497,9 @@
- file->f_dentry->d_name.name);
- error_time = jiffies;
- }
--
-+ down_write(¤t->mm->mmap_sem);
- do_brk(start_addr, ex.a_text + ex.a_data + ex.a_bss);
-+ up_write(¤t->mm->mmap_sem);
-
- file->f_op->read(file, (char __user *)start_addr,
- ex.a_text + ex.a_data, &pos);
-diff -Nru a/fs/binfmt_elf.c b/fs/binfmt_elf.c
---- a/fs/binfmt_elf.c 2005-01-12 20:26:27 -08:00
-+++ b/fs/binfmt_elf.c 2005-01-12 20:26:27 -08:00
-@@ -88,7 +88,10 @@
- start = ELF_PAGEALIGN(start);
- end = ELF_PAGEALIGN(end);
- if (end > start) {
-- unsigned long addr = do_brk(start, end - start);
-+ unsigned long addr;
-+ down_write(¤t->mm->mmap_sem);
-+ addr = do_brk(start, end - start);
-+ up_write(¤t->mm->mmap_sem);
- if (BAD_ADDR(addr))
- return addr;
- }
-@@ -409,7 +412,9 @@
-
- /* Map the last of the bss segment */
- if (last_bss > elf_bss) {
-+ down_write(¤t->mm->mmap_sem);
- error = do_brk(elf_bss, last_bss - elf_bss);
-+ up_write(¤t->mm->mmap_sem);
- if (BAD_ADDR(error))
- goto out_close;
- }
-@@ -449,7 +454,9 @@
- goto out;
- }
-
-+ down_write(¤t->mm->mmap_sem);
- do_brk(0, text_data);
-+ up_write(¤t->mm->mmap_sem);
- if (!interpreter->f_op || !interpreter->f_op->read)
- goto out;
- if (interpreter->f_op->read(interpreter, addr, text_data, &offset) < 0)
-@@ -457,8 +464,11 @@
- flush_icache_range((unsigned long)addr,
- (unsigned long)addr + text_data);
-
-+
-+ down_write(¤t->mm->mmap_sem);
- do_brk(ELF_PAGESTART(text_data + ELF_MIN_ALIGN - 1),
- interp_ex->a_bss);
-+ up_write(¤t->mm->mmap_sem);
- elf_entry = interp_ex->a_entry;
-
- out:
-diff -Nru a/mm/mmap.c b/mm/mmap.c
---- a/mm/mmap.c 2005-01-12 20:26:27 -08:00
-+++ b/mm/mmap.c 2005-01-12 20:26:27 -08:00
-@@ -1903,6 +1903,12 @@
- }
-
- /*
-+ * mm->mmap_sem is required to protect against another thread
-+ * changing the mappings in case we sleep.
-+ */
-+ WARN_ON(down_read_trylock(&mm->mmap_sem));
-+
-+ /*
- * Clear old maps. this also does some error checking for us
- */
- munmap_back:
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/036-rlimit_memlock_check.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/036-rlimit_memlock_check.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/036-rlimit_memlock_check.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,39 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [PATCH] acct_stack_growth nitpicks
-## DP: Patch author: chrisw@osdl.org
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/11 07:40:07-08:00 chrisw@osdl.org
-# [PATCH] acct_stack_growth nitpicks
-#
-# - allow CAP_IPC_LOCK to override mlock rlimit during stack expansion as
-# in all other cases
-#
-# Signed-off-by: Chris Wright <chrisw@osdl.org>
-# Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-#
-# mm/mmap.c
-# 2005/01/10 19:34:05-08:00 chrisw@osdl.org +1 -1
-# acct_stack_growth nitpicks
-#
-diff -Nru a/mm/mmap.c b/mm/mmap.c
---- a/mm/mmap.c 2005-01-15 13:03:38 -08:00
-+++ b/mm/mmap.c 2005-01-15 13:03:38 -08:00
-@@ -1359,7 +1359,7 @@
- unsigned long limit;
- locked = mm->locked_vm + grow;
- limit = rlim[RLIMIT_MEMLOCK].rlim_cur >> PAGE_SHIFT;
-- if (locked > limit)
-+ if (locked > limit && !capable(CAP_IPC_LOCK))
- return -ENOMEM;
- }
-
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/037-sctp_err_lookup_oops.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/037-sctp_err_lookup_oops.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/037-sctp_err_lookup_oops.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,41 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [SCTP] Fix potential null pointer dereference in sctp_err_lookup().
-## DP: Patch author: sri@us.ibm.com
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2004/12/24 22:33:13-08:00 sri@us.ibm.com
-# [SCTP] Fix potential null pointer dereference in sctp_err_lookup().
-#
-# Signed-off-by: Vladislav Yasevich <vladislav.yasevich@hp.com>
-# Signed-off-by: Sridhar Samudrala <sri@us.ibm.com>
-#
-# net/sctp/input.c
-# 2004/12/24 22:33:04-08:00 sri@us.ibm.com +2 -1
-# [SCTP] Fix potential null pointer dereference in sctp_err_lookup().
-#
-diff -Nru a/net/sctp/input.c b/net/sctp/input.c
---- a/net/sctp/input.c 2005-01-15 13:40:55 -08:00
-+++ b/net/sctp/input.c 2005-01-15 13:40:55 -08:00
-@@ -326,11 +326,12 @@
- }
-
- if (asoc) {
-+ sk = asoc->base.sk;
-+
- if (ntohl(sctphdr->vtag) != asoc->c.peer_vtag) {
- ICMP_INC_STATS_BH(ICMP_MIB_INERRORS);
- goto out;
- }
-- sk = asoc->base.sk;
- } else
- sk = ep->base.sk;
-
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/038-ftdi_sio_debug_output.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/038-ftdi_sio_debug_output.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/038-ftdi_sio_debug_output.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,41 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: USB: change warning level in ftdi_sio driver of a debug message.
-## DP: Patch author: greg@kroah.com
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2004/12/20 10:37:42-08:00 greg@kroah.com
-# USB: change warning level in ftdi_sio driver of a debug message.
-#
-# This keeps users happy as it really isn't an error.
-#
-# Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
-#
-# drivers/usb/serial/ftdi_sio.c
-# 2004/12/20 10:37:18-08:00 greg@kroah.com +1 -1
-# USB: change warning level in ftdi_sio driver of a debug message.
-#
-# This keeps users happy as it really isn't an error.
-#
-# Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
-#
-diff -Nru a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
---- a/drivers/usb/serial/ftdi_sio.c 2005-01-15 15:16:48 -08:00
-+++ b/drivers/usb/serial/ftdi_sio.c 2005-01-15 15:16:48 -08:00
-@@ -1651,7 +1651,7 @@
- dbg("%s port %d, %d bytes", __FUNCTION__, port->number, count);
-
- if (count == 0) {
-- err("write request of 0 bytes");
-+ dbg("write request of 0 bytes");
- return 0;
- }
-
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/039-serial_console_resume.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/039-serial_console_resume.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/039-serial_console_resume.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,55 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [SERIAL] Fix serial console resume
-## DP: Patch author: rmk@flint.arm.linux.org.uk
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/15 11:42:19+00:00 rmk@flint.arm.linux.org.uk
-# [SERIAL] Fix serial console resume
-#
-# Don't use uart_change_speed() when trying to restore the serial
-# console settings - the port may not have a tty associated with
-# it.
-#
-# Signed-off-by: Russell King <rmk@arm.linux.org.uk>
-#
-# drivers/serial/serial_core.c
-# 2005/01/15 11:37:07+00:00 rmk@flint.arm.linux.org.uk +15 -1
-# Don't use uart_change_speed() when trying to restore the serial
-# console settings - the port may not have a tty associated with
-# it.
-#
-diff -Nru a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c
---- a/drivers/serial/serial_core.c 2005-01-15 15:47:37 -08:00
-+++ b/drivers/serial/serial_core.c 2005-01-15 15:47:37 -08:00
-@@ -1877,7 +1877,21 @@
- * Re-enable the console device after suspending.
- */
- if (uart_console(port)) {
-- uart_change_speed(state, NULL);
-+ struct termios termios;
-+
-+ /*
-+ * First try to use the console cflag setting.
-+ */
-+ memset(&termios, 0, sizeof(struct termios));
-+ termios.c_cflag = port->cons->cflag;
-+
-+ /*
-+ * If that's unset, use the tty termios setting.
-+ */
-+ if (state->info && state->info->tty && termios.c_cflag == 0)
-+ termios = *state->info->tty->termios;
-+
-+ port->ops->set_termios(port, &termios, NULL);
- console_start(port->cons);
- }
-
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/040-sk_forward_alloc_underflow.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/040-sk_forward_alloc_underflow.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/040-sk_forward_alloc_underflow.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,64 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [TCP]: Do not underflow sk_forward_alloc in sendpage().
-## DP: Patch author: davem@nuts.davemloft.net
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/14 20:38:32-08:00 davem@nuts.davemloft.net
-# [TCP]: Do not underflow sk_forward_alloc in sendpage().
-#
-# We need to do the proper checks before we try to
-# pull space out of it, just like sendmsg() does.
-#
-# Signed-off-by: David S. Miller <davem@davemloft.net>
-#
-# net/ipv4/tcp.c
-# 2005/01/14 20:37:59-08:00 davem@nuts.davemloft.net +12 -6
-# [TCP]: Do not underflow sk_forward_alloc in sendpage().
-#
-diff -Nru a/net/ipv4/tcp.c b/net/ipv4/tcp.c
---- a/net/ipv4/tcp.c 2005-01-15 16:09:47 -08:00
-+++ b/net/ipv4/tcp.c 2005-01-15 16:09:47 -08:00
-@@ -655,7 +655,7 @@
- while (psize > 0) {
- struct sk_buff *skb = sk->sk_write_queue.prev;
- struct page *page = pages[poffset / PAGE_SIZE];
-- int copy, i;
-+ int copy, i, can_coalesce;
- int offset = poffset % PAGE_SIZE;
- int size = min_t(size_t, psize, PAGE_SIZE - offset);
-
-@@ -677,14 +677,20 @@
- copy = size;
-
- i = skb_shinfo(skb)->nr_frags;
-- if (skb_can_coalesce(skb, i, page, offset)) {
-+ can_coalesce = skb_can_coalesce(skb, i, page, offset);
-+ if (!can_coalesce && i >= MAX_SKB_FRAGS) {
-+ tcp_mark_push(tp, skb);
-+ goto new_segment;
-+ }
-+ if (sk->sk_forward_alloc < copy &&
-+ !sk_stream_mem_schedule(sk, copy, 0))
-+ goto wait_for_memory;
-+
-+ if (can_coalesce) {
- skb_shinfo(skb)->frags[i - 1].size += copy;
-- } else if (i < MAX_SKB_FRAGS) {
-+ } else {
- get_page(page);
- skb_fill_page_desc(skb, i, page, offset, copy);
-- } else {
-- tcp_mark_push(tp, skb);
-- goto new_segment;
- }
-
- skb->len += copy;
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/041-ide_hwif_supress_busy.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/041-ide_hwif_supress_busy.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/041-ide_hwif_supress_busy.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,44 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [ide] suppress output of error messages for non-existant interfaces
-## DP: Patch author: bzolnier@trik.(none)
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/15 02:31:51+01:00 bzolnier@trik.(none)
-# [ide] suppress output of error messages for non-existant interfaces
-#
-# From: Prarit Bhargava <prarit@sgi.com>
-#
-# Suppress output of "Wait for ready failed before probe !" messages for
-# non-existant interfaces.
-#
-# Please see
-# http://marc.theaimsgroup.com/?l=linux-ide&m=110553792013649&w=2 for
-# further context on this patch.
-#
-# Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
-#
-# drivers/ide/ide-probe.c
-# 2005/01/12 15:01:25+01:00 bzolnier@trik.(none) +1 -1
-# [ide] suppress output of error messages for non-existant interfaces
-#
-diff -Nru a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
---- a/drivers/ide/ide-probe.c 2005-01-15 16:59:15 -08:00
-+++ b/drivers/ide/ide-probe.c 2005-01-15 16:59:15 -08:00
-@@ -749,7 +749,7 @@
- *
- * BenH.
- */
-- if (wait_hwif_ready(hwif))
-+ if (wait_hwif_ready(hwif) == -EBUSY)
- printk(KERN_DEBUG "%s: Wait for ready failed before probe !\n", hwif->name);
-
- /*
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/042-gx_get_cpuspeed_return_value.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/042-gx_get_cpuspeed_return_value.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/042-gx_get_cpuspeed_return_value.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,47 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [CPUFREQ] gx-suspmod: fix gx_suspmod_get
-## DP: Patch author: davej@redhat.com
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/14 16:07:58-05:00 davej@redhat.com
-# [CPUFREQ] gx-suspmod: fix gx_suspmod_get
-#
-# Fix to return a proper cpu speed. it is caused by mistaking the meaning
-# of on and off.
-#
-# Signed-Off-by: Hiroshi Miura <miura@da-cha.org>
-# Signed-off-by: Dominik Brodowski <linux@brodo.de>
-# Signed-off-by: Dave Jones <davej@redhat.com>
-#
-# arch/i386/kernel/cpu/cpufreq/gx-suspmod.c
-# 2005/01/14 16:07:49-05:00 davej@redhat.com +1 -1
-# [CPUFREQ] gx-suspmod: fix gx_suspmod_get
-#
-# Fix to return a proper cpu speed. it is caused by mistaking the meaning
-# of on and off.
-#
-# Signed-Off-by: Hiroshi Miura <miura@da-cha.org>
-# Signed-off-by: Dominik Brodowski <linux@brodo.de>
-# Signed-off-by: Dave Jones <davej@redhat.com>
-#
-diff -Nru a/arch/i386/kernel/cpu/cpufreq/gx-suspmod.c b/arch/i386/kernel/cpu/cpufreq/gx-suspmod.c
---- a/arch/i386/kernel/cpu/cpufreq/gx-suspmod.c 2005-01-15 17:17:58 -08:00
-+++ b/arch/i386/kernel/cpu/cpufreq/gx-suspmod.c 2005-01-15 17:17:58 -08:00
-@@ -209,7 +209,7 @@
- if ((gx_params->pci_suscfg & SUSMOD) == 0)
- return stock_freq;
-
-- return (stock_freq * gx_params->on_duration)
-+ return (stock_freq * gx_params->off_duration)
- / (gx_params->on_duration + gx_params->off_duration);
- }
-
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/043-dothan_p4_get_frequency.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/043-dothan_p4_get_frequency.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/043-dothan_p4_get_frequency.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,47 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [CPUFREQ] p4-clockmod: Dothan is 13 not 0x13
-## DP: Patch author: davej@redhat.com
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/14 16:05:45-05:00 davej@redhat.com
-# [CPUFREQ] p4-clockmod: Dothan is 13 not 0x13
-#
-# Dothan is stepping 13 == 0x0D instead of 0x13 == 19
-#
-# This bug crept bag in the shadows caused by the debug overhauling patch.
-#
-# Signed-off-by: Dominik Brodowski <linux@brodo.de>
-# Signed-off-by: Dave Jones <davej@redhat.com>
-#
-# arch/i386/kernel/cpu/cpufreq/p4-clockmod.c
-# 2005/01/14 16:05:36-05:00 davej@redhat.com +1 -1
-# [CPUFREQ] p4-clockmod: Dothan is 13 not 0x13
-#
-# Dothan is stepping 13 == 0x0D instead of 0x13 == 19
-#
-# This bug crept bag in the shadows caused by the debug overhauling patch.
-#
-# Signed-off-by: Dominik Brodowski <linux@brodo.de>
-# Signed-off-by: Dave Jones <davej@redhat.com>
-#
-diff -Nru a/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c b/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c
---- a/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c 2005-01-15 17:22:12 -08:00
-+++ b/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c 2005-01-15 17:22:12 -08:00
-@@ -171,7 +171,7 @@
- return speedstep_get_processor_frequency(SPEEDSTEP_PROCESSOR_PM);
- }
-
-- if ((c->x86 == 0x06) && (c->x86_model == 0x13)) {
-+ if ((c->x86 == 0x06) && (c->x86_model == 0x0D)) {
- /* Pentium M (Dothan) */
- printk(KERN_WARNING PFX "Warning: Pentium M detected. "
- "The speedstep_centrino module offers voltage scaling"
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/044-elevator_noop_add_request.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/044-elevator_noop_add_request.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/044-elevator_noop_add_request.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,47 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [PATCH] noop-iosched: fix insertion point
-## DP: Patch author: axboe@suse.de
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/14 10:26:02-08:00 axboe@suse.de
-# [PATCH] noop-iosched: fix insertion point
-#
-# noop doesn't follow the instructions on where to insert a request,
-# because it uses q->queue_head instead of the *insert assigned. Clean it
-# up so it's easier to read.
-#
-# Signed-off-by: Jens Axboe <axboe@suse.de>
-# Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-#
-# drivers/block/noop-iosched.c
-# 2005/01/14 08:35:40-08:00 axboe@suse.de +3 -5
-# noop-iosched: fix insertion point
-#
-diff -Nru a/drivers/block/noop-iosched.c b/drivers/block/noop-iosched.c
---- a/drivers/block/noop-iosched.c 2005-01-15 19:22:09 -08:00
-+++ b/drivers/block/noop-iosched.c 2005-01-15 19:22:09 -08:00
-@@ -52,12 +52,10 @@
- static void elevator_noop_add_request(request_queue_t *q, struct request *rq,
- int where)
- {
-- struct list_head *insert = q->queue_head.prev;
--
- if (where == ELEVATOR_INSERT_FRONT)
-- insert = &q->queue_head;
--
-- list_add_tail(&rq->queuelist, &q->queue_head);
-+ list_add(&rq->queuelist, &q->queue_head);
-+ else
-+ list_add_tail(&rq->queuelist, &q->queue_head);
-
- /*
- * new merges must not precede this barrier
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/045-pci_psycho_brainfart.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/045-pci_psycho_brainfart.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/045-pci_psycho_brainfart.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,43 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [SPARC64]: Fix brainfart in pci_psycho.c
-## DP: Patch author: grundler@parisc-linux.org
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/13 21:19:16-08:00 grundler@parisc-linux.org
-# [SPARC64]: Fix brainfart in pci_psycho.c
-#
-# Signed-off-by: Grant Grundler <grundler@parisc-linux.org>
-# Signed-off-by: David S. Miller <davem@davemloft.net>
-#
-# arch/sparc64/kernel/pci_psycho.c
-# 2005/01/13 21:18:51-08:00 grundler@parisc-linux.org +3 -3
-# [SPARC64]: Fix brainfart in pci_psycho.c
-#
-# Signed-off-by: Grant Grundler <grundler@parisc-linux.org>
-# Signed-off-by: David S. Miller <davem@davemloft.net>
-#
-diff -Nru a/arch/sparc64/kernel/pci_psycho.c b/arch/sparc64/kernel/pci_psycho.c
---- a/arch/sparc64/kernel/pci_psycho.c 2005-01-15 19:42:49 -08:00
-+++ b/arch/sparc64/kernel/pci_psycho.c 2005-01-15 19:42:49 -08:00
-@@ -453,9 +453,9 @@
- tag_base = regbase + PSYCHO_STC_TAG_A;
- line_base = regbase + PSYCHO_STC_LINE_A;
- } else {
-- err_base = regbase + PSYCHO_STC_ERR_A;
-- tag_base = regbase + PSYCHO_STC_TAG_A;
-- line_base = regbase + PSYCHO_STC_LINE_A;
-+ err_base = regbase + PSYCHO_STC_ERR_B;
-+ tag_base = regbase + PSYCHO_STC_TAG_B;
-+ line_base = regbase + PSYCHO_STC_LINE_B;
- }
-
- spin_lock(&stc_buf_lock);
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/046-ipv6_sit_lock.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/046-ipv6_sit_lock.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/046-ipv6_sit_lock.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,43 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [IPV6]: Fix tunnel list locking in sit.c
-## DP: Patch author: yoshfuji@linux-ipv6.org
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/13 20:34:08-08:00 yoshfuji@linux-ipv6.org
-# [IPV6]: Fix tunnel list locking in sit.c
-#
-# Signed-off-by: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
-# Signed-off-by: David S. Miller <davem@davemloft.net>
-#
-# net/ipv6/sit.c
-# 2005/01/13 20:33:48-08:00 yoshfuji@linux-ipv6.org +2 -2
-# [IPV6]: Fix tunnel list locking in sit.c
-#
-# Signed-off-by: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
-# Signed-off-by: David S. Miller <davem@davemloft.net>
-#
-diff -Nru a/net/ipv6/sit.c b/net/ipv6/sit.c
---- a/net/ipv6/sit.c 2005-01-15 19:58:24 -08:00
-+++ b/net/ipv6/sit.c 2005-01-15 19:58:24 -08:00
-@@ -135,10 +135,10 @@
- {
- struct ip_tunnel **tp = ipip6_bucket(t);
-
-- write_lock_bh(&ipip6_lock);
- t->next = *tp;
-- write_unlock_bh(&ipip6_lock);
-+ write_lock_bh(&ipip6_lock);
- *tp = t;
-+ write_unlock_bh(&ipip6_lock);
- }
-
- static struct ip_tunnel * ipip6_tunnel_locate(struct ip_tunnel_parm *parms, int create)
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/047-do_tcp_sendpages_tso_assertion.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/047-do_tcp_sendpages_tso_assertion.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/047-do_tcp_sendpages_tso_assertion.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,71 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [TCP]: Fix sk_forward_alloc assertion failures with TSO.
-## DP: Patch author: davem@nuts.davemloft.net
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/13 20:02:46-08:00 davem@nuts.davemloft.net
-# [TCP]: Fix sk_forward_alloc assertion failures with TSO.
-#
-# do_tcp_sendpages() needs to do skb->truesize et al.
-# accounting just like tcp_sendmsg() does.
-#
-# tcp_sendmsg() works by gradually adjusting these
-# accounting knobs as user data is copied into the
-# packet.
-#
-# do_tcp_sendpages() works differently, when it allocates
-# a new SKB it optimistically adds in tp->mss_cache to
-# these values and then makes no adjustments at all as
-# pages are tacked onto the packet.
-#
-# This does not work at all if tcp_sendmsg() queues a
-# packet onto the send queue, and then do_tcp_sendpages()
-# attaches pages onto the end of that SKB. We are left
-# with a very inaccurate skb->truesize in that case.
-#
-# Consequently, if we were building a TSO frame and it
-# gets partially ACK'd, then since skb->truesize is too
-# small tcp_trim_skb() will potentially underflow it's
-# value and all the accounting becomes corrupted.
-#
-# This is usually seen as sk->sk_forward_alloc being
-# negative at socket destroy time, which triggers an
-# assertion check.
-#
-# Signed-off-by: David S. Miller <davem@davemloft.net>
-#
-# net/ipv4/tcp.c
-# 2005/01/13 19:57:57-08:00 davem@nuts.davemloft.net +4 -1
-# [TCP]: Fix sk_forward_alloc assertion failures with TSO.
-#
-diff -Nru a/net/ipv4/tcp.c b/net/ipv4/tcp.c
---- a/net/ipv4/tcp.c 2005-01-15 20:08:45 -08:00
-+++ b/net/ipv4/tcp.c 2005-01-15 20:08:45 -08:00
-@@ -664,7 +664,7 @@
- if (!sk_stream_memory_free(sk))
- goto wait_for_sndbuf;
-
-- skb = sk_stream_alloc_pskb(sk, 0, tp->mss_cache,
-+ skb = sk_stream_alloc_pskb(sk, 0, 0,
- sk->sk_allocation);
- if (!skb)
- goto wait_for_memory;
-@@ -689,6 +689,9 @@
-
- skb->len += copy;
- skb->data_len += copy;
-+ skb->truesize += copy;
-+ sk->sk_wmem_queued += copy;
-+ sk->sk_forward_alloc -= copy;
- skb->ip_summed = CHECKSUM_HW;
- tp->write_seq += copy;
- TCP_SKB_CB(skb)->end_seq += copy;
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/048-matroxfb_mtrr_ifdef.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/048-matroxfb_mtrr_ifdef.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/048-matroxfb_mtrr_ifdef.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,41 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [PATCH] matroxfb driver broken on non-x86.
-## DP: Patch author: davej@redhat.com
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/12 20:04:43-08:00 davej@redhat.com
-# [PATCH] matroxfb driver broken on non-x86.
-#
-# This broke since the recent MODULE_PARAM conversion on
-# architectures that don't have CONFIG_MTRR
-#
-# Signed-off-by: Dave Jones <davej@redhat.com>
-# Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-#
-# drivers/video/matrox/matroxfb_base.c
-# 2005/01/12 13:48:54-08:00 davej@redhat.com +2 -0
-# matroxfb driver broken on non-x86.
-#
-diff -Nru a/drivers/video/matrox/matroxfb_base.c b/drivers/video/matrox/matroxfb_base.c
---- a/drivers/video/matrox/matroxfb_base.c 2005-01-15 20:26:33 -08:00
-+++ b/drivers/video/matrox/matroxfb_base.c 2005-01-15 20:26:33 -08:00
-@@ -2477,8 +2477,10 @@
- MODULE_PARM_DESC(noinit, "Disables W/SG/SD-RAM and bus interface initialization (0 or 1=do not initialize) (default=0)");
- MODULE_PARM(memtype, "i");
- MODULE_PARM_DESC(memtype, "Memory type for G200/G400 (see Documentation/fb/matroxfb.txt for explanation) (default=3 for G200, 0 for G400)");
-+#ifdef CONFIG_MTRR
- MODULE_PARM(mtrr, "i");
- MODULE_PARM_DESC(mtrr, "This speeds up video memory accesses (0=disabled or 1) (default=1)");
-+#endif
- MODULE_PARM(sgram, "i");
- MODULE_PARM_DESC(sgram, "Indicates that G100/G200/G400 has SGRAM memory (0=SDRAM, 1=SGRAM) (default=0)");
- MODULE_PARM(inv24, "i");
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/050-cfq_requeue_request_accounting.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/050-cfq_requeue_request_accounting.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/050-cfq_requeue_request_accounting.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,43 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [PATCH] cfq-iosched: fix scsi requeue accounting
-## DP: Patch author: axboe@suse.de
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/12 08:49:02-08:00 axboe@suse.de
-# [PATCH] cfq-iosched: fix scsi requeue accounting
-#
-# The accounting can go bad in the requeue hook, it must check the
-# accounted flag to make sure it was previously considered in the driver.
-#
-# Signed-off-by: Jens Axboe <axboe@suse.de>
-# Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-#
-# drivers/block/cfq-iosched.c
-# 2005/01/11 01:03:17-08:00 axboe@suse.de +4 -2
-# cfq-iosched: fix scsi requeue accounting
-#
-diff -Nru a/drivers/block/cfq-iosched.c b/drivers/block/cfq-iosched.c
---- a/drivers/block/cfq-iosched.c 2005-01-15 20:41:34 -08:00
-+++ b/drivers/block/cfq-iosched.c 2005-01-15 20:41:34 -08:00
-@@ -622,8 +622,10 @@
- cfq_sort_rr_list(cfqq, 0);
- }
-
-- crq->accounted = 0;
-- cfqq->cfqd->rq_in_driver--;
-+ if (crq->accounted) {
-+ crq->accounted = 0;
-+ cfqq->cfqd->rq_in_driver--;
-+ }
- }
- list_add(&rq->queuelist, &q->queue_head);
- }
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/051-md_sync_page_io_max_vecs.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/051-md_sync_page_io_max_vecs.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/051-md_sync_page_io_max_vecs.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,74 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [PATCH] Fix md using bio on stack with bio clones
-## DP: Patch author: axboe@suse.de
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/21 10:27:36-08:00 axboe@suse.de
-# [PATCH] Fix md using bio on stack with bio clones
-#
-# If md resides on top of a driver using bio_clone() (such as dm), it will
-# oops the kernel due to md submitting a botched bio that has a veclist but
-# doesn't have bio->bi_max_vecs set.
-#
-# Signed-off-by: Jens Axboe <axboe@suse.de>
-# Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-#
-# drivers/md/md.c
-# 2005/01/19 04:23:30-08:00 axboe@suse.de +13 -16
-# Fix md using bio on stack with bio clones
-#
-diff -Nru a/drivers/md/md.c b/drivers/md/md.c
---- a/drivers/md/md.c 2005-01-22 00:16:02 -08:00
-+++ b/drivers/md/md.c 2005-01-22 00:16:02 -08:00
-@@ -332,29 +332,26 @@
- static int sync_page_io(struct block_device *bdev, sector_t sector, int size,
- struct page *page, int rw)
- {
-- struct bio bio;
-- struct bio_vec vec;
-+ struct bio *bio = bio_alloc(GFP_KERNEL, 1);
- struct completion event;
-+ int ret;
-+
-+ bio_get(bio);
-
- rw |= (1 << BIO_RW_SYNC);
-
-- bio_init(&bio);
-- bio.bi_io_vec = &vec;
-- vec.bv_page = page;
-- vec.bv_len = size;
-- vec.bv_offset = 0;
-- bio.bi_vcnt = 1;
-- bio.bi_idx = 0;
-- bio.bi_size = size;
-- bio.bi_bdev = bdev;
-- bio.bi_sector = sector;
-+ bio->bi_bdev = bdev;
-+ bio->bi_sector = sector;
-+ bio_add_page(bio, page, size, 0);
- init_completion(&event);
-- bio.bi_private = &event;
-- bio.bi_end_io = bi_complete;
-- submit_bio(rw, &bio);
-+ bio->bi_private = &event;
-+ bio->bi_end_io = bi_complete;
-+ submit_bio(rw, bio);
- wait_for_completion(&event);
-
-- return test_bit(BIO_UPTODATE, &bio.bi_flags);
-+ ret = test_bit(BIO_UPTODATE, &bio->bi_flags);
-+ bio_put(bio);
-+ return ret;
- }
-
- static int read_disk_sb(mdk_rdev_t * rdev)
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/052-vfat_valid_longname_proper_return.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/052-vfat_valid_longname_proper_return.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/052-vfat_valid_longname_proper_return.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,80 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [PATCH] fat: Return better error codes from vfat_valid_longname()
-## DP: Patch author: hirofumi@mail.parknet.co.jp
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/21 08:12:30-08:00 hirofumi@mail.parknet.co.jp
-# [PATCH] fat: Return better error codes from vfat_valid_longname()
-#
-# From Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
-#
-# Fix error code.
-#
-# Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
-# Signed-off-by: Andrew Morton <akpm@osdl.org>
-# Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-#
-# fs/vfat/namei.c
-# 2005/01/20 21:29:21-08:00 hirofumi@mail.parknet.co.jp +9 -8
-# fat: Return better error codes from vfat_valid_longname()
-#
-diff -Nru a/fs/vfat/namei.c b/fs/vfat/namei.c
---- a/fs/vfat/namei.c 2005-01-22 01:00:37 -08:00
-+++ b/fs/vfat/namei.c 2005-01-22 01:00:37 -08:00
-@@ -189,10 +189,10 @@
-
- static int vfat_valid_longname(const unsigned char *name, unsigned int len)
- {
-- if (len && name[len-1] == ' ')
-- return 0;
-+ if (name[len - 1] == ' ')
-+ return -EINVAL;
- if (len >= 256)
-- return 0;
-+ return -ENAMETOOLONG;
-
- /* MS-DOS "device special files" */
- if (len == 3 || (len > 3 && name[3] == '.')) { /* basename == 3 */
-@@ -200,18 +200,18 @@
- !strnicmp(name, "con", 3) ||
- !strnicmp(name, "nul", 3) ||
- !strnicmp(name, "prn", 3))
-- return 0;
-+ return -EINVAL;
- }
- if (len == 4 || (len > 4 && name[4] == '.')) { /* basename == 4 */
- /* "com1", "com2", ... */
- if ('1' <= name[3] && name[3] <= '9') {
- if (!strnicmp(name, "com", 3) ||
- !strnicmp(name, "lpt", 3))
-- return 0;
-+ return -EINVAL;
- }
- }
-
-- return 1;
-+ return 0;
- }
-
- static int vfat_find_form(struct inode *dir, unsigned char *name)
-@@ -614,8 +614,9 @@
- loff_t offset;
-
- *slots = 0;
-- if (!vfat_valid_longname(name, len))
-- return -EINVAL;
-+ res = vfat_valid_longname(name, len);
-+ if (res)
-+ return res;
-
- if(!(page = __get_free_page(GFP_KERNEL)))
- return -ENOMEM;
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/053-ipmi_unhandled_message_counting.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/053-ipmi_unhandled_message_counting.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/053-ipmi_unhandled_message_counting.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,89 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [PATCH] Minor IPMI driver updates
-## DP: Patch author: minyard@acm.org
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/21 08:08:29-08:00 minyard@acm.org
-# [PATCH] Minor IPMI driver updates
-#
-# This patch fixes counting of unhandled messages. Messages that were
-# handled internally by the driver (to the NULL user) were miscounted as
-# unhanlded responses. This counts them properly.
-#
-# This patch also fixes the DMI 16-byte setting, which was set as a 16-bit
-# setting.
-#
-# It also uses the right value to initilize the address memory when using a
-# memory-based interface.
-#
-# Signed-off-by: Corey Minyard <minyard@acm.org>
-# Signed-off-by: Andrew Morton <akpm@osdl.org>
-# Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-#
-# drivers/char/ipmi/ipmi_msghandler.c
-# 2005/01/20 21:00:51-08:00 minyard@acm.org +10 -5
-# Minor IPMI driver updates
-#
-# drivers/char/ipmi/ipmi_si_intf.c
-# 2005/01/20 21:00:51-08:00 minyard@acm.org +4 -3
-# Minor IPMI driver updates
-#
-diff -Nru a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
---- a/drivers/char/ipmi/ipmi_msghandler.c 2005-01-22 01:17:55 -08:00
-+++ b/drivers/char/ipmi/ipmi_msghandler.c 2005-01-22 01:17:55 -08:00
-@@ -2301,12 +2301,17 @@
-
- if (!found) {
- /* Special handling for NULL users. */
-- if (!recv_msg->user && intf->null_user_handler)
-+ if (!recv_msg->user && intf->null_user_handler){
- intf->null_user_handler(intf, msg);
-- /* The user for the message went away, so give up. */
-- spin_lock_irqsave(&intf->counter_lock, flags);
-- intf->unhandled_local_responses++;
-- spin_unlock_irqrestore(&intf->counter_lock, flags);
-+ spin_lock_irqsave(&intf->counter_lock, flags);
-+ intf->handled_local_responses++;
-+ spin_unlock_irqrestore(&intf->counter_lock, flags);
-+ }else{
-+ /* The user for the message went away, so give up. */
-+ spin_lock_irqsave(&intf->counter_lock, flags);
-+ intf->unhandled_local_responses++;
-+ spin_unlock_irqrestore(&intf->counter_lock, flags);
-+ }
- ipmi_free_recv_msg(recv_msg);
- } else {
- struct ipmi_system_interface_addr *smi_addr;
-diff -Nru a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
---- a/drivers/char/ipmi/ipmi_si_intf.c 2005-01-22 01:17:55 -08:00
-+++ b/drivers/char/ipmi/ipmi_si_intf.c 2005-01-22 01:17:55 -08:00
-@@ -1299,7 +1299,7 @@
- memset(info, 0, sizeof(*info));
-
- info->io_setup = mem_setup;
-- info->io.info = (void *) addrs[intf_num];
-+ info->io.info = &addrs[intf_num];
- info->io.addr = NULL;
- info->io.regspacing = regspacings[intf_num];
- if (!info->io.regspacing)
-@@ -1587,8 +1587,9 @@
- case 0x01: /* 32-bit boundaries */
- ipmi_data->offset = 4;
- break;
-- case 0x02: /* 16-bit boundaries */
-- ipmi_data->offset = 2;
-+ case 0x02: /* 16-byte boundaries */
-+ ipmi_data->offset = 16;
-+ break;
- default:
- printk("ipmi_si: Unknown SMBIOS IPMI Base Addr"
- " Modifier: 0x%x\n", reg_spacing);
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/054-ext3_journal_abort_before_panic.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/054-ext3_journal_abort_before_panic.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/054-ext3_journal_abort_before_panic.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,55 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [PATCH] ext3: commit superblock before panicking
-## DP: Patch author: eric@lammerts.org
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/21 08:07:09-08:00 eric@lammerts.org
-# [PATCH] ext3: commit superblock before panicking
-#
-# I have a problem with errors=panic on ext3. When a panic occurs, the error
-# event is not recorded anywhere. So after the reboot, e2fsck doesn't kick
-# in, the file system gets mounted again and the box panics again...
-#
-# Patch below moves the ERRORS_PANIC test down a bit so the journal is
-# aborted before panic() is called.
-#
-# Signed-off-by: Eric Lammerts <eric@lammerts.org>
-# Signed-off-by: Andrew Morton <akpm@osdl.org>
-# Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-#
-# fs/ext3/super.c
-# 2005/01/20 21:00:50-08:00 eric@lammerts.org +3 -3
-# ext3: commit superblock before panicking
-#
-diff -Nru a/fs/ext3/super.c b/fs/ext3/super.c
---- a/fs/ext3/super.c 2005-01-22 01:32:54 -08:00
-+++ b/fs/ext3/super.c 2005-01-22 01:32:54 -08:00
-@@ -155,9 +155,6 @@
- if (sb->s_flags & MS_RDONLY)
- return;
-
-- if (test_opt (sb, ERRORS_PANIC))
-- panic ("EXT3-fs (device %s): panic forced after error\n",
-- sb->s_id);
- if (test_opt (sb, ERRORS_RO)) {
- printk (KERN_CRIT "Remounting filesystem read-only\n");
- sb->s_flags |= MS_RDONLY;
-@@ -168,6 +165,9 @@
- if (journal)
- journal_abort(journal, -EIO);
- }
-+ if (test_opt(sb, ERRORS_PANIC))
-+ panic("EXT3-fs (device %s): panic forced after error\n",
-+ sb->s_id);
- ext3_commit_super(sb, es, 1);
- }
-
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/055-uml_new_thread_race.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/055-uml_new_thread_race.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/055-uml_new_thread_race.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,44 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [PATCH] uml: fix a stack corruption crash
-## DP: Patch author: jdike@addtoit.com
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/21 08:03:15-08:00 jdike@addtoit.com
-# [PATCH] uml: fix a stack corruption crash
-#
-# Fix a race where signals could be handled to the parent of a new process on
-# the kernel stack of the child, corrupting that stack, and crashing UML when
-# the next first runs.
-#
-# Signed-off-by: Jeff Dike <jdike@addtoit.com>
-# Signed-off-by: Andrew Morton <akpm@osdl.org>
-# Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-#
-# arch/um/kernel/skas/process.c
-# 2005/01/20 20:59:16-08:00 jdike@addtoit.com +2 -1
-# uml: fix a stack corruption crash
-#
-diff -Nru a/arch/um/kernel/skas/process.c b/arch/um/kernel/skas/process.c
---- a/arch/um/kernel/skas/process.c 2005-01-22 01:49:12 -08:00
-+++ b/arch/um/kernel/skas/process.c 2005-01-22 01:49:12 -08:00
-@@ -224,9 +224,10 @@
- block_signals();
- if(sigsetjmp(fork_buf, 1) == 0)
- new_thread_proc(stack, handler);
-- set_signals(flags);
-
- remove_sigstack();
-+
-+ set_signals(flags);
- }
-
- void thread_wait(void *sw, void *fb)
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/056-x86_64_acpi_do_suspend_lowlevel_arg.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/056-x86_64_acpi_do_suspend_lowlevel_arg.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/056-x86_64_acpi_do_suspend_lowlevel_arg.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,41 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [PATCH] x86-64: Fix do_suspend_lowlevel
-## DP: Patch author: venkatesh.pallipadi@intel.com
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/21 07:59:42-08:00 venkatesh.pallipadi@intel.com
-# [PATCH] x86-64: Fix do_suspend_lowlevel
-#
-# do_suspend_lowlevel doesn't have an argument anymore, but the assembly code
-# would still test it and fail randomly. Remove the bogus test.
-#
-# Signed-off-by: Andi Kleen <ak@suse.de>
-# Signed-off-by: Andrew Morton <akpm@osdl.org>
-# Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-#
-# arch/x86_64/kernel/acpi/wakeup.S
-# 2005/01/20 20:59:14-08:00 venkatesh.pallipadi@intel.com +0 -3
-# x86-64: Fix do_suspend_lowlevel
-#
-diff -Nru a/arch/x86_64/kernel/acpi/wakeup.S b/arch/x86_64/kernel/acpi/wakeup.S
---- a/arch/x86_64/kernel/acpi/wakeup.S 2005-01-22 02:09:01 -08:00
-+++ b/arch/x86_64/kernel/acpi/wakeup.S 2005-01-22 02:09:01 -08:00
-@@ -429,9 +429,6 @@
- do_suspend_lowlevel:
- .LFB5:
- subq $8, %rsp
--.LCFI2:
-- testl %edi, %edi
-- jne .L99
- xorl %eax, %eax
- call save_processor_state
-
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/058-ia64_binfmt_elf_bug_out.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/058-ia64_binfmt_elf_bug_out.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/058-ia64_binfmt_elf_bug_out.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,60 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [IA64] binfmt_elf32.c: BUG if insert_vm_struct fails
-## DP: Patch author: tony.luck@intel.com
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/22 12:18:41-08:00 tony.luck@intel.com
-# [IA64] binfmt_elf32.c: BUG if insert_vm_struct fails
-#
-# It seems that in ia64_elf32_init, instead of calling return, if we insert
-# an overlapping vma, we should instead BUG(). We should never get into this
-# code path, because the vma's are set above PAGE_OFFSET, and thus a
-# Xmalicious user can not trigger this code path. This change is being
-# suggested mainly for clarity. Thanks to Stephen Tweedie for pointing out
-# that returning early in ia64_elf32_init could have unpredictable results.
-#
-# Signed-off-by: Tony Luck <tony.luck@intel.com>
-#
-# arch/ia64/ia32/binfmt_elf32.c
-# 2005/01/22 12:16:29-08:00 tony.luck@intel.com +3 -3
-# BUG if insert_vm_struct fails
-#
-diff -Nru a/arch/ia64/ia32/binfmt_elf32.c b/arch/ia64/ia32/binfmt_elf32.c
---- a/arch/ia64/ia32/binfmt_elf32.c 2005-01-22 23:35:01 -08:00
-+++ b/arch/ia64/ia32/binfmt_elf32.c 2005-01-22 23:35:01 -08:00
-@@ -103,7 +103,7 @@
- if (insert_vm_struct(current->mm, vma)) {
- kmem_cache_free(vm_area_cachep, vma);
- up_write(¤t->mm->mmap_sem);
-- return;
-+ BUG();
- }
- }
- up_write(¤t->mm->mmap_sem);
-@@ -130,7 +130,7 @@
- if (insert_vm_struct(current->mm, vma)) {
- kmem_cache_free(vm_area_cachep, vma);
- up_write(¤t->mm->mmap_sem);
-- return;
-+ BUG();
- }
- }
- up_write(¤t->mm->mmap_sem);
-@@ -153,7 +153,7 @@
- if (insert_vm_struct(current->mm, vma)) {
- kmem_cache_free(vm_area_cachep, vma);
- up_write(¤t->mm->mmap_sem);
-- return;
-+ BUG();
- }
- }
- up_write(¤t->mm->mmap_sem);
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/060-alsa_cs4231_lib_ifdef_typo.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/060-alsa_cs4231_lib_ifdef_typo.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/060-alsa_cs4231_lib_ifdef_typo.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,52 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [ALSA] ifdef typos: sound_isa_cs423x_cs4231_lib.c
-## DP: Patch author: perex@suse.cz
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/03 09:08:30+01:00 perex@suse.cz
-# [ALSA] ifdef typos: sound_isa_cs423x_cs4231_lib.c
-#
-# CS4231 driver
-# Funny typo.
-#
-# Acked-by: Randy Dunlap <rddunlap@osdl.org>
-#
-# Signed-off-by: Domen Puncer <domen@coderock.org>
-# Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
-# Signed-off-by: Takashi Iwai <tiwai@suse.de>
-#
-# sound/isa/cs423x/cs4231_lib.c
-# 2004/11/30 07:33:24+01:00 perex@suse.cz +1 -1
-# [ALSA] ifdef typos: sound_isa_cs423x_cs4231_lib.c
-#
-# D:2004/11/30 14:33:24
-# C:CS4231 driver
-# F:isa/cs423x/cs4231_lib.c:1.45->1.46
-# L:Funny typo.
-# L:
-# L:Acked-by: Randy Dunlap <rddunlap@osdl.org>
-# Signed-off-by: Domen Puncer <domen@coderock.org>
-# Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
-# Signed-off-by: Takashi Iwai <tiwai@suse.de>
-#
-diff -Nru a/sound/isa/cs423x/cs4231_lib.c b/sound/isa/cs423x/cs4231_lib.c
---- a/sound/isa/cs423x/cs4231_lib.c 2005-01-22 23:37:19 -08:00
-+++ b/sound/isa/cs423x/cs4231_lib.c 2005-01-22 23:37:19 -08:00
-@@ -685,7 +685,7 @@
-
- snd_cs4231_mce_down(chip);
-
--#ifdef SNDRV_DEBUGq_MCE
-+#ifdef SNDRV_DEBUG_MCE
- snd_printk("init: (1)\n");
- #endif
- snd_cs4231_mce_up(chip);
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/061-alsa_es18xx_ifdef_typo.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/061-alsa_es18xx_ifdef_typo.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/061-alsa_es18xx_ifdef_typo.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,57 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [ALSA] ifdef typos: sound_isa_es18xx.c
-## DP: Patch author: perex@suse.cz
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/03 09:10:09+01:00 perex@suse.cz
-# [ALSA] ifdef typos: sound_isa_es18xx.c
-#
-# ES18xx driver
-# Changed CONFIG_PNP_ to CONFIG_PNP, also fixed a comment related to
-# another CONFIG_PNP.
-#
-# Signed-off-by: Domen Puncer <domen@coderock.org>
-# Signed-off-by: Takashi Iwai <tiwai@suse.de>
-#
-# sound/isa/es18xx.c
-# 2004/11/30 07:34:07+01:00 perex@suse.cz +2 -2
-# [ALSA] ifdef typos: sound_isa_es18xx.c
-#
-# D:2004/11/30 14:34:07
-# C:ES18xx driver
-# F:isa/es18xx.c:1.51->1.52
-# L:Changed CONFIG_PNP_ to CONFIG_PNP, also fixed a comment related to
-# L:another CONFIG_PNP.
-# Signed-off-by: Domen Puncer <domen@coderock.org>
-# Signed-off-by: Takashi Iwai <tiwai@suse.de>
-#
-diff -Nru a/sound/isa/es18xx.c b/sound/isa/es18xx.c
---- a/sound/isa/es18xx.c 2005-01-22 23:12:29 -08:00
-+++ b/sound/isa/es18xx.c 2005-01-22 23:12:29 -08:00
-@@ -1849,7 +1849,7 @@
- static int isapnp[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};
- #endif
- static long port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; /* 0x220,0x240,0x260,0x280 */
--#ifndef CONFIG_PNP_
-+#ifndef CONFIG_PNP
- static long mpu_port[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = -1};
- #else
- static long mpu_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;
-@@ -1988,7 +1988,7 @@
- kfree(cfg);
- return 0;
- }
--#endif /* CONFIG_PNP_ */
-+#endif /* CONFIG_PNP */
-
- static int __devinit snd_audiodrive_probe(int dev, struct pnp_card_link *pcard,
- const struct pnp_card_device_id *pid)
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/062-alsa_sscape_user_copy_check.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/062-alsa_sscape_user_copy_check.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/062-alsa_sscape_user_copy_check.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,49 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [ALSA] check __copy_to_user in sscape_upload_bootblock()
-## DP: Patch author: perex@suse.cz
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/03 09:11:10+01:00 perex@suse.cz
-# [ALSA] check __copy_to_user in sscape_upload_bootblock()
-#
-# Sound Scape driver
-# __copy_to_user() is called without checking its return value in
-# sound/isa/sscape.c::sscape_upload_bootblock .
-#
-# Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
-# Signed-off-by: Takashi Iwai <tiwai@suse.de>
-#
-# sound/isa/sscape.c
-# 2004/11/30 07:37:33+01:00 perex@suse.cz +2 -1
-# [ALSA] check __copy_to_user in sscape_upload_bootblock()
-#
-# D:2004/11/30 14:37:33
-# C:Sound Scape driver
-# F:isa/sscape.c:1.17->1.18
-# L:__copy_to_user() is called without checking its return value in
-# L:sound/isa/sscape.c::sscape_upload_bootblock .
-# Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
-# Signed-off-by: Takashi Iwai <tiwai@suse.de>
-#
-diff -Nru a/sound/isa/sscape.c b/sound/isa/sscape.c
---- a/sound/isa/sscape.c 2005-01-22 23:12:45 -08:00
-+++ b/sound/isa/sscape.c 2005-01-22 23:12:45 -08:00
-@@ -572,7 +572,8 @@
- snd_printk(KERN_ERR "sscape: timeout reading firmware version\n");
- ret = -EAGAIN;
- } else {
-- __copy_to_user(&bb->version, &data, sizeof(bb->version));
-+ if (__copy_to_user(&bb->version, &data, sizeof(bb->version)))
-+ ret = -EFAULT;
- }
- }
-
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/063-alsa_opl4_build_fix.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/063-alsa_opl4_build_fix.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/063-alsa_opl4_build_fix.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,45 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [ALSA] opl4 depends on opl3
-## DP: Patch author: perex@suse.cz
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/03 11:00:47+01:00 perex@suse.cz
-# [ALSA] opl4 depends on opl3
-#
-# OPL3
-# Compiling OPL4 doesn't include the snd-opl3-lib. This change in the
-# Makefile enables now the compiling of snd-opl3-lib.o for OPL4 soundcards.
-#
-# Signed-off-by: Martin Langer <martin-langer@gmx.de>
-# Signed-off-by: Takashi Iwai <tiwai@suse.de>
-#
-# sound/drivers/opl3/Makefile
-# 2004/12/06 12:46:27+01:00 perex@suse.cz +1 -0
-# [ALSA] opl4 depends on opl3
-#
-# D:2004/12/06 19:46:27
-# C:OPL3
-# F:drivers/opl3/Makefile:1.22->1.23
-# L:Compiling OPL4 doesn't include the snd-opl3-lib. This change in the
-# L:Makefile enables now the compiling of snd-opl3-lib.o for OPL4 soundcards.
-# Signed-off-by: Martin Langer <martin-langer@gmx.de>
-# Signed-off-by: Takashi Iwai <tiwai@suse.de>
-#
-diff -Nru a/sound/drivers/opl3/Makefile b/sound/drivers/opl3/Makefile
---- a/sound/drivers/opl3/Makefile 2005-01-22 22:49:12 -08:00
-+++ b/sound/drivers/opl3/Makefile 2005-01-22 22:49:12 -08:00
-@@ -18,4 +18,5 @@
- sequencer = $(if $(subst y,,$(CONFIG_SND_SEQUENCER)),$(if $(1),m),$(if $(CONFIG_SND_SEQUENCER),$(1)))
-
- obj-$(CONFIG_SND_OPL3_LIB) += snd-opl3-lib.o
-+obj-$(CONFIG_SND_OPL4_LIB) += snd-opl3-lib.o
- obj-$(call sequencer,$(CONFIG_SND_OPL3_LIB)) += snd-opl3-synth.o
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/064-alsa_usbaudio_disconnect.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/064-alsa_usbaudio_disconnect.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/064-alsa_usbaudio_disconnect.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,54 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [ALSA] Return -EBADFD when the device is disconnected
-## DP: Patch author: perex@suse.cz
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/03 11:18:07+01:00 perex@suse.cz
-# [ALSA] Return -EBADFD when the device is disconnected
-#
-# USB generic driver
-# The trigger callback returns -EBADFD when the device is disconnected.
-#
-# Signed-off-by: Takashi Iwai <tiwai@suse.de>
-#
-# sound/usb/usbaudio.c
-# 2004/12/16 09:12:51+01:00 perex@suse.cz +4 -1
-# [ALSA] Return -EBADFD when the device is disconnected
-#
-# D:2004/12/16 16:12:51
-# C:USB generic driver
-# F:usb/usbaudio.c:1.112->1.113
-# L:The trigger callback returns -EBADFD when the device is disconnected.
-# Signed-off-by: Takashi Iwai <tiwai@suse.de>
-#
-diff -Nru a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c
---- a/sound/usb/usbaudio.c 2005-01-22 22:17:09 -08:00
-+++ b/sound/usb/usbaudio.c 2005-01-22 22:17:09 -08:00
-@@ -725,7 +725,7 @@
- subs->running = 0;
-
- if (!force && subs->stream->chip->shutdown) /* to be sure... */
-- return 0;
-+ return -EBADFD;
-
- async = !can_sleep && async_unlink;
-
-@@ -769,6 +769,9 @@
- {
- unsigned int i;
- int err;
-+
-+ if (subs->stream->chip->shutdown)
-+ return -EBADFD;
-
- for (i = 0; i < subs->nurbs; i++) {
- snd_assert(subs->dataurb[i].urb, return -EINVAL);
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/065-alsa_vx_kcalloc.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/065-alsa_vx_kcalloc.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/065-alsa_vx_kcalloc.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,44 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [ALSA] Fix memory corruption
-## DP: Patch author: perex@suse.cz
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/03 11:19:17+01:00 perex@suse.cz
-# [ALSA] Fix memory corruption
-#
-# Digigram VX core
-# Fixed the memory corruption by the wrong sized kmalloc.
-#
-# Signed-off-by: Takashi Iwai <tiwai@suse.de>
-#
-# sound/drivers/vx/vx_core.c
-# 2004/12/20 04:03:54+01:00 perex@suse.cz +1 -1
-# [ALSA] Fix memory corruption
-#
-# D:2004/12/20 11:03:54
-# C:Digigram VX core
-# F:drivers/vx/vx_core.c:1.9->1.10
-# L:Fixed the memory corruption by the wrong sized kmalloc.
-# Signed-off-by: Takashi Iwai <tiwai@suse.de>
-#
-diff -Nru a/sound/drivers/vx/vx_core.c b/sound/drivers/vx/vx_core.c
---- a/sound/drivers/vx/vx_core.c 2005-01-22 22:17:34 -08:00
-+++ b/sound/drivers/vx/vx_core.c 2005-01-22 22:17:34 -08:00
-@@ -734,7 +734,7 @@
-
- snd_assert(card && hw && ops, return NULL);
-
-- chip = kcalloc(1, sizeof(chip) + extra_size, GFP_KERNEL);
-+ chip = kcalloc(1, sizeof(*chip) + extra_size, GFP_KERNEL);
- if (! chip) {
- snd_printk(KERN_ERR "vx_core: no memory\n");
- return NULL;
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/066-ibmvscsi_probe_delay_loop_fix.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/066-ibmvscsi_probe_delay_loop_fix.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/066-ibmvscsi_probe_delay_loop_fix.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,39 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [PATCH] ibmvscsi: fix loop exit condition
-## DP: Patch author: sleddog@us.ibm.com
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2004/12/31 13:29:49-06:00 sleddog@us.ibm.com
-# [PATCH] ibmvscsi: fix loop exit condition
-#
-# Fix a bug where we could fall out of our delay loop and then forget to
-# scan for drives.
-#
-# Signed-off-by: Dave Boutcher <boutcher@us.ibm.com>
-# Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
-#
-# drivers/scsi/ibmvscsi/ibmvscsi.c
-# 2004/12/31 09:59:39-06:00 sleddog@us.ibm.com +2 -2
-# ibmvscsi: fix loop exit condition
-#
-diff -Nru a/drivers/scsi/ibmvscsi/ibmvscsi.c b/drivers/scsi/ibmvscsi/ibmvscsi.c
---- a/drivers/scsi/ibmvscsi/ibmvscsi.c 2005-01-22 21:53:57 -08:00
-+++ b/drivers/scsi/ibmvscsi/ibmvscsi.c 2005-01-22 21:53:57 -08:00
-@@ -1332,6 +1332,6 @@
- */
- for (wait_switch = jiffies + (init_timeout * HZ);
- time_before(jiffies, wait_switch) &&
-- atomic_read(&hostdata->request_limit) < 0;) {
-+ atomic_read(&hostdata->request_limit) < 2;) {
-
- set_current_state(TASK_UNINTERRUPTIBLE);
- schedule_timeout(HZ / 100);
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/067-scsi_gdth_pci_map_sg.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/067-scsi_gdth_pci_map_sg.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/067-scsi_gdth_pci_map_sg.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,89 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [PATCH] gdth buggy page mapping
-## DP: Patch author: axboe@suse.de
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/03 10:07:16-06:00 axboe@suse.de
-# [PATCH] gdth buggy page mapping
-#
-# Just tripped over a bug report for the SUSE kernel where gdth would
-# crash on a 32G opteron, turned out that the gdth_internal_copy() sg
-# handling was really buggy. After fixing this I wanted to do the same for
-# mainline, but I can see that a vain attempt was already made to fix it.
-# Unfortunately it wasn't complete, and on top of that there's room for
-# improvement.
-#
-# The current code is buggy on highmem, as page_address() will not yield a
-# valid kernel address causing a NULL pointer dereference. The current
-# code also doesn't unmap the sg list if it sees a NULL sl->page. In fact,
-# the whole sg mapping looks really strange, why on earth would you be
-# mapping the sglist for dma when you are only going to copy from it?
-#
-# This patch corrects both errors - correctly maps in the page, and kills
-# the pci_map_sg/pci_unmap_sg calls completely. If someone could test
-# this, that would be great.
-#
-# Signed-off-by: Jens Axboe <axboe@suse.de>
-# Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
-#
-# drivers/scsi/gdth.c
-# 2004/11/23 13:13:04-06:00 axboe@suse.de +9 -9
-# gdth buggy page mapping
-#
-diff -Nru a/drivers/scsi/gdth.c b/drivers/scsi/gdth.c
---- a/drivers/scsi/gdth.c 2005-01-22 21:28:53 -08:00
-+++ b/drivers/scsi/gdth.c 2005-01-22 21:28:53 -08:00
-@@ -2708,7 +2708,6 @@
- ushort cpsum,cpnow;
- struct scatterlist *sl;
- gdth_ha_str *ha;
-- int sgcnt;
- char *address;
-
- cpcount = count<=(ushort)scp->bufflen ? count:(ushort)scp->bufflen;
-@@ -2717,9 +2716,9 @@
- if (scp->use_sg) {
- sl = (struct scatterlist *)scp->request_buffer;
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,13)
-- sgcnt = pci_map_sg(ha->pdev,sl,scp->use_sg,PCI_DMA_FROMDEVICE);
-- for (i=0,cpsum=0; i<sgcnt; ++i,++sl) {
-- cpnow = (ushort)sg_dma_len(sl);
-+ for (i=0,cpsum=0; i<scp->use_sg; ++i,++sl) {
-+ unsigned long flags;
-+ cpnow = (ushort)sl->length;
- TRACE(("copy_internal() now %d sum %d count %d %d\n",
- cpnow,cpsum,cpcount,(ushort)scp->bufflen));
- if (cpsum+cpnow > cpcount)
-@@ -2730,17 +2729,18 @@
- hanum);
- return;
- }
-- address = (char *)(page_address(sl->page) + sl->offset);
-+ local_irq_save(flags);
-+ address = kmap_atomic(sl->page, KM_BIO_SRC_IRQ) + sl->offset;
- memcpy(address,buffer,cpnow);
-+ flush_dcache_page(sl->page);
-+ kunmap_atomic(address, KM_BIO_SRC_IRQ);
-+ local_irq_restore(flags);
- if (cpsum == cpcount)
- break;
- buffer += cpnow;
- }
-- pci_unmap_sg(ha->pdev,scp->request_buffer,
-- scp->use_sg,PCI_DMA_FROMDEVICE);
- #else
-- sgcnt = scp->use_sg;
-- for (i=0,cpsum=0; i<sgcnt; ++i,++sl) {
-+ for (i=0,cpsum=0; i<scp->use_sg; ++i,++sl) {
- cpnow = (ushort)sl->length;
- TRACE(("copy_internal() now %d sum %d count %d %d\n",
- cpnow,cpsum,cpcount,(ushort)scp->bufflen));
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/068-scsi_sd_read_capacity_LBD_bail.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/068-scsi_sd_read_capacity_LBD_bail.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/068-scsi_sd_read_capacity_LBD_bail.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,45 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [PATCH] fix read capacity for large disks when CONFIG_LBD=n
-## DP: Patch author: tonyb@cybernetics.com
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/06 15:48:50-05:00 tonyb@cybernetics.com
-# [PATCH] fix read capacity for large disks when CONFIG_LBD=n
-#
-# We shouldn't configure an device that requires LBD if the kernel
-# doesn't suppoprt it (because we won't be able to see most of it), so
-# set the capacity to zero in this case.
-#
-# Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
-#
-# drivers/scsi/sd.c
-# 2005/01/04 08:03:59-05:00 tonyb@cybernetics.com +5 -2
-# fix read capacity for large disks when CONFIG_LBD=n
-#
-diff -Nru a/drivers/scsi/sd.c b/drivers/scsi/sd.c
---- a/drivers/scsi/sd.c 2005-01-22 21:31:47 -08:00
-+++ b/drivers/scsi/sd.c 2005-01-22 21:31:47 -08:00
-@@ -1082,9 +1082,12 @@
- " READ CAPACITY(16).\n", diskname);
- longrc = 1;
- goto repeat;
-- } else {
-- printk(KERN_ERR "%s: too big for kernel. Assuming maximum 2Tb\n", diskname);
- }
-+ printk(KERN_ERR "%s: too big for this kernel. Use a "
-+ "kernel compiled with support for large block "
-+ "devices.\n", diskname);
-+ sdkp->capacity = 0;
-+ goto got_data;
- }
- sdkp->capacity = 1 + (((sector_t)buffer[0] << 24) |
- (buffer[1] << 16) |
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/069-alsa_sscape_upload_firmware_len.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/069-alsa_sscape_upload_firmware_len.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/069-alsa_sscape_upload_firmware_len.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,116 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [ALSA] Update user-space access from sscape driver
-## DP: Patch author: perex@suse.cz
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/03 10:59:39+01:00 perex@suse.cz
-# [ALSA] Update user-space access from sscape driver
-#
-# Sound Scape driver
-# I see that the copy_to/from_user() functions have been updated across
-# Linux 2.4 and 2.6, and that verify_read/write() has been replaced by
-# access_ok(). I have patched the SoundScape driver accordingly.
-#
-# Signed-off-by: Chris Rankin <rankincj@yahoo.com>
-# Signed-off-by: Takashi Iwai <tiwai@suse.de>
-#
-# sound/isa/sscape.c
-# 2004/12/06 08:32:12+01:00 perex@suse.cz +13 -14
-# [ALSA] Update user-space access from sscape driver
-#
-# D:2004/12/06 15:32:12
-# C:Sound Scape driver
-# F:isa/sscape.c:1.18->1.19
-# L:I see that the copy_to/from_user() functions have been updated across
-# L:Linux 2.4 and 2.6, and that verify_read/write() has been replaced by
-# L: access_ok(). I have patched the SoundScape driver accordingly.
-# Signed-off-by: Chris Rankin <rankincj@yahoo.com>
-# Signed-off-by: Takashi Iwai <tiwai@suse.de>
-#
-diff -Nru a/sound/isa/sscape.c b/sound/isa/sscape.c
---- a/sound/isa/sscape.c 2005-01-22 23:15:48 -08:00
-+++ b/sound/isa/sscape.c 2005-01-22 23:15:48 -08:00
-@@ -487,7 +487,7 @@
- * the userspace pointer ...
- */
- len = min(size, dma.bytes);
-- __copy_from_user(dma.area, data, len);
-+ len -= __copy_from_user(dma.area, data, len);
- data += len;
- size -= len;
-
-@@ -571,9 +571,9 @@
- if (data < 0) {
- snd_printk(KERN_ERR "sscape: timeout reading firmware version\n");
- ret = -EAGAIN;
-- } else {
-- if (__copy_to_user(&bb->version, &data, sizeof(bb->version)))
-- ret = -EFAULT;
-+ }
-+ else if (__copy_to_user(&bb->version, &data, sizeof(bb->version))) {
-+ ret = -EFAULT;
- }
- }
-
-@@ -592,7 +592,7 @@
- {
- unsigned long flags;
- char __user *code;
-- int err, ret;
-+ int err;
-
- /*
- * We are going to have to copy this data into a special
-@@ -602,12 +602,11 @@
- * NOTE: This buffer is 64K long! That's WAY too big to
- * copy into a stack-temporary anyway.
- */
-- if (get_user(code, &mc->code))
-+ if ( get_user(code, &mc->code) ||
-+ !access_ok(VERIFY_READ, code, SSCAPE_MICROCODE_SIZE) )
- return -EFAULT;
-- if ((err = verify_area(VERIFY_READ, code, SSCAPE_MICROCODE_SIZE)) != 0)
-- return err;
-
-- if ((ret = upload_dma_data(sscape, code, SSCAPE_MICROCODE_SIZE)) == 0) {
-+ if ((err = upload_dma_data(sscape, code, SSCAPE_MICROCODE_SIZE)) == 0) {
- snd_printk(KERN_INFO "sscape: MIDI firmware loaded\n");
- }
-
-@@ -617,7 +616,7 @@
-
- initialise_mpu401(sscape->mpu);
-
-- return ret;
-+ return err;
- }
-
- /*
-@@ -674,14 +673,14 @@
- * DMA-able buffer before we can upload it. We shall therefore
- * just check that the data pointer is valid for now ...
- */
-- if ((err = verify_area(VERIFY_READ, bb->code, sizeof(bb->code))) != 0)
-- return err;
-+ if ( !access_ok(VERIFY_READ, bb->code, sizeof(bb->code)) )
-+ return -EFAULT;
-
- /*
- * Now check that we can write the firmware version number too...
- */
-- if ((err = verify_area(VERIFY_WRITE, &bb->version, sizeof(bb->version))) != 0)
-- return err;
-+ if ( !access_ok(VERIFY_WRITE, &bb->version, sizeof(bb->version)) )
-+ return -EFAULT;
-
- err = sscape_upload_bootblock(sscape, bb);
- }
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/070-alsa_rme9652_hdsp_get_autosync.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/070-alsa_rme9652_hdsp_get_autosync.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/070-alsa_rme9652_hdsp_get_autosync.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,54 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [ALSA] Fix invalid 'AutoSync Reference' value
-## DP: Patch author: perex@suse.cz
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/03 11:28:17+01:00 perex@suse.cz
-# [ALSA] Fix invalid 'AutoSync Reference' value
-#
-# RME HDSP driver
-# The value returned by controllers for control number 14 ('AutoSync
-# Reference') is incorrect and different from that reported by doing
-# a cat /proc/asound/card0/hdsp.
-# The value reported is not 'AutoSync Reference' but 'Preferred Sync
-# Reference' instead.
-#
-# Signed-off-by: Remy Bruno <remy.bruno@trinnov.com>
-# Signed-off-by: Takashi Iwai <tiwai@suse.de>
-#
-# sound/pci/rme9652/hdsp.c
-# 2004/12/21 10:59:41+01:00 perex@suse.cz +1 -1
-# [ALSA] Fix invalid 'AutoSync Reference' value
-#
-# D:2004/12/21 17:59:41
-# C:RME HDSP driver
-# F:pci/rme9652/hdsp.c:1.76->1.77
-# L:The value returned by controllers for control number 14 ('AutoSync
-# L:Reference') is incorrect and different from that reported by doing
-# L:a cat /proc/asound/card0/hdsp.
-# L:The value reported is not 'AutoSync Reference' but 'Preferred Sync
-# L:Reference' instead.
-# Signed-off-by: Remy Bruno <remy.bruno@trinnov.com>
-# Signed-off-by: Takashi Iwai <tiwai@suse.de>
-#
-diff -Nru a/sound/pci/rme9652/hdsp.c b/sound/pci/rme9652/hdsp.c
---- a/sound/pci/rme9652/hdsp.c 2005-01-22 21:54:51 -08:00
-+++ b/sound/pci/rme9652/hdsp.c 2005-01-22 21:54:51 -08:00
-@@ -2729,7 +2729,7 @@
- {
- hdsp_t *hdsp = snd_kcontrol_chip(kcontrol);
-
-- ucontrol->value.enumerated.item[0] = hdsp_pref_sync_ref(hdsp);
-+ ucontrol->value.enumerated.item[0] = hdsp_autosync_ref(hdsp);
- return 0;
- }
-
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/071-alsa_creation_order_fixes.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/071-alsa_creation_order_fixes.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/071-alsa_creation_order_fixes.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,663 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [ALSA] Fix the order of creation of instances
-## DP: Patch author: perex@suse.cz
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/03 14:14:10+01:00 perex@suse.cz
-# [ALSA] Fix the order of creation of instances
-#
-# AZT3328 driver,CMIPCI driver,CS4281 driver,ENS1370/1+ driver
-# Maestro3 driver,SonicVibes driver,CS46xx driver,KORG1212 driver
-# NM256 driver,Trident driver,YMFPCI driver
-# Make sure that the chip instance is created at first before other components.
-# This will fix occasional oops at unloading due to the access to the released
-# resources.
-#
-# Signed-off-by: Takashi Iwai <tiwai@suse.de>
-#
-# sound/pci/azt3328.c
-# 2005/01/03 04:45:31+01:00 perex@suse.cz +4 -4
-# [ALSA] Fix the order of creation of instances
-#
-# D:2005/01/03 11:45:31
-# C:AZT3328 driver,CMIPCI driver,CS4281 driver,ENS1370/1+ driver
-# C:Maestro3 driver,SonicVibes driver,CS46xx driver,KORG1212 driver
-# C:NM256 driver,Trident driver,YMFPCI driver
-# F:pci/azt3328.c:1.23->1.24
-# F:pci/cmipci.c:1.76->1.77
-# F:pci/cs4281.c:1.68->1.69
-# F:pci/ens1370.c:1.73->1.74
-# F:pci/maestro3.c:1.67->1.68
-# F:pci/sonicvibes.c:1.44->1.45
-# F:pci/cs46xx/cs46xx_lib.c:1.92->1.93
-# F:pci/korg1212/korg1212.c:1.52->1.53
-# F:pci/nm256/nm256.c:1.57->1.58
-# F:pci/trident/trident_main.c:1.68->1.69
-# F:pci/ymfpci/ymfpci_main.c:1.63->1.64
-# L:Make sure that the chip instance is created at first before other components.
-# L:This will fix occasional oops at unloading due to the access to the released
-# L:resources.
-# Signed-off-by: Takashi Iwai <tiwai@suse.de>
-#
-# sound/pci/cmipci.c
-# 2005/01/03 04:45:31+01:00 perex@suse.cz +11 -14
-# [ALSA] Fix the order of creation of instances
-#
-# D:2005/01/03 11:45:31
-# C:AZT3328 driver,CMIPCI driver,CS4281 driver,ENS1370/1+ driver
-# C:Maestro3 driver,SonicVibes driver,CS46xx driver,KORG1212 driver
-# C:NM256 driver,Trident driver,YMFPCI driver
-# F:pci/azt3328.c:1.23->1.24
-# F:pci/cmipci.c:1.76->1.77
-# F:pci/cs4281.c:1.68->1.69
-# F:pci/ens1370.c:1.73->1.74
-# F:pci/maestro3.c:1.67->1.68
-# F:pci/sonicvibes.c:1.44->1.45
-# F:pci/cs46xx/cs46xx_lib.c:1.92->1.93
-# F:pci/korg1212/korg1212.c:1.52->1.53
-# F:pci/nm256/nm256.c:1.57->1.58
-# F:pci/trident/trident_main.c:1.68->1.69
-# F:pci/ymfpci/ymfpci_main.c:1.63->1.64
-# L:Make sure that the chip instance is created at first before other components.
-# L:This will fix occasional oops at unloading due to the access to the released
-# L:resources.
-# Signed-off-by: Takashi Iwai <tiwai@suse.de>
-#
-# sound/pci/cs4281.c
-# 2005/01/03 04:45:31+01:00 perex@suse.cz +4 -4
-# [ALSA] Fix the order of creation of instances
-#
-# D:2005/01/03 11:45:31
-# C:AZT3328 driver,CMIPCI driver,CS4281 driver,ENS1370/1+ driver
-# C:Maestro3 driver,SonicVibes driver,CS46xx driver,KORG1212 driver
-# C:NM256 driver,Trident driver,YMFPCI driver
-# F:pci/azt3328.c:1.23->1.24
-# F:pci/cmipci.c:1.76->1.77
-# F:pci/cs4281.c:1.68->1.69
-# F:pci/ens1370.c:1.73->1.74
-# F:pci/maestro3.c:1.67->1.68
-# F:pci/sonicvibes.c:1.44->1.45
-# F:pci/cs46xx/cs46xx_lib.c:1.92->1.93
-# F:pci/korg1212/korg1212.c:1.52->1.53
-# F:pci/nm256/nm256.c:1.57->1.58
-# F:pci/trident/trident_main.c:1.68->1.69
-# F:pci/ymfpci/ymfpci_main.c:1.63->1.64
-# L:Make sure that the chip instance is created at first before other components.
-# L:This will fix occasional oops at unloading due to the access to the released
-# L:resources.
-# Signed-off-by: Takashi Iwai <tiwai@suse.de>
-#
-# sound/pci/cs46xx/cs46xx_lib.c
-# 2005/01/03 04:45:32+01:00 perex@suse.cz +4 -4
-# [ALSA] Fix the order of creation of instances
-#
-# D:2005/01/03 11:45:31
-# C:AZT3328 driver,CMIPCI driver,CS4281 driver,ENS1370/1+ driver
-# C:Maestro3 driver,SonicVibes driver,CS46xx driver,KORG1212 driver
-# C:NM256 driver,Trident driver,YMFPCI driver
-# F:pci/azt3328.c:1.23->1.24
-# F:pci/cmipci.c:1.76->1.77
-# F:pci/cs4281.c:1.68->1.69
-# F:pci/ens1370.c:1.73->1.74
-# F:pci/maestro3.c:1.67->1.68
-# F:pci/sonicvibes.c:1.44->1.45
-# F:pci/cs46xx/cs46xx_lib.c:1.92->1.93
-# F:pci/korg1212/korg1212.c:1.52->1.53
-# F:pci/nm256/nm256.c:1.57->1.58
-# F:pci/trident/trident_main.c:1.68->1.69
-# F:pci/ymfpci/ymfpci_main.c:1.63->1.64
-# L:Make sure that the chip instance is created at first before other components.
-# L:This will fix occasional oops at unloading due to the access to the released
-# L:resources.
-# Signed-off-by: Takashi Iwai <tiwai@suse.de>
-#
-# sound/pci/ens1370.c
-# 2005/01/03 04:45:32+01:00 perex@suse.cz +2 -1
-# [ALSA] Fix the order of creation of instances
-#
-# D:2005/01/03 11:45:31
-# C:AZT3328 driver,CMIPCI driver,CS4281 driver,ENS1370/1+ driver
-# C:Maestro3 driver,SonicVibes driver,CS46xx driver,KORG1212 driver
-# C:NM256 driver,Trident driver,YMFPCI driver
-# F:pci/azt3328.c:1.23->1.24
-# F:pci/cmipci.c:1.76->1.77
-# F:pci/cs4281.c:1.68->1.69
-# F:pci/ens1370.c:1.73->1.74
-# F:pci/maestro3.c:1.67->1.68
-# F:pci/sonicvibes.c:1.44->1.45
-# F:pci/cs46xx/cs46xx_lib.c:1.92->1.93
-# F:pci/korg1212/korg1212.c:1.52->1.53
-# F:pci/nm256/nm256.c:1.57->1.58
-# F:pci/trident/trident_main.c:1.68->1.69
-# F:pci/ymfpci/ymfpci_main.c:1.63->1.64
-# L:Make sure that the chip instance is created at first before other components.
-# L:This will fix occasional oops at unloading due to the access to the released
-# L:resources.
-# Signed-off-by: Takashi Iwai <tiwai@suse.de>
-#
-# sound/pci/korg1212/korg1212.c
-# 2005/01/03 04:45:32+01:00 perex@suse.cz +8 -14
-# [ALSA] Fix the order of creation of instances
-#
-# D:2005/01/03 11:45:31
-# C:AZT3328 driver,CMIPCI driver,CS4281 driver,ENS1370/1+ driver
-# C:Maestro3 driver,SonicVibes driver,CS46xx driver,KORG1212 driver
-# C:NM256 driver,Trident driver,YMFPCI driver
-# F:pci/azt3328.c:1.23->1.24
-# F:pci/cmipci.c:1.76->1.77
-# F:pci/cs4281.c:1.68->1.69
-# F:pci/ens1370.c:1.73->1.74
-# F:pci/maestro3.c:1.67->1.68
-# F:pci/sonicvibes.c:1.44->1.45
-# F:pci/cs46xx/cs46xx_lib.c:1.92->1.93
-# F:pci/korg1212/korg1212.c:1.52->1.53
-# F:pci/nm256/nm256.c:1.57->1.58
-# F:pci/trident/trident_main.c:1.68->1.69
-# F:pci/ymfpci/ymfpci_main.c:1.63->1.64
-# L:Make sure that the chip instance is created at first before other components.
-# L:This will fix occasional oops at unloading due to the access to the released
-# L:resources.
-# Signed-off-by: Takashi Iwai <tiwai@suse.de>
-#
-# sound/pci/maestro3.c
-# 2005/01/03 04:45:32+01:00 perex@suse.cz +13 -19
-# [ALSA] Fix the order of creation of instances
-#
-# D:2005/01/03 11:45:31
-# C:AZT3328 driver,CMIPCI driver,CS4281 driver,ENS1370/1+ driver
-# C:Maestro3 driver,SonicVibes driver,CS46xx driver,KORG1212 driver
-# C:NM256 driver,Trident driver,YMFPCI driver
-# F:pci/azt3328.c:1.23->1.24
-# F:pci/cmipci.c:1.76->1.77
-# F:pci/cs4281.c:1.68->1.69
-# F:pci/ens1370.c:1.73->1.74
-# F:pci/maestro3.c:1.67->1.68
-# F:pci/sonicvibes.c:1.44->1.45
-# F:pci/cs46xx/cs46xx_lib.c:1.92->1.93
-# F:pci/korg1212/korg1212.c:1.52->1.53
-# F:pci/nm256/nm256.c:1.57->1.58
-# F:pci/trident/trident_main.c:1.68->1.69
-# F:pci/ymfpci/ymfpci_main.c:1.63->1.64
-# L:Make sure that the chip instance is created at first before other components.
-# L:This will fix occasional oops at unloading due to the access to the released
-# L:resources.
-# Signed-off-by: Takashi Iwai <tiwai@suse.de>
-#
-# sound/pci/nm256/nm256.c
-# 2005/01/03 04:45:32+01:00 perex@suse.cz +6 -6
-# [ALSA] Fix the order of creation of instances
-#
-# D:2005/01/03 11:45:31
-# C:AZT3328 driver,CMIPCI driver,CS4281 driver,ENS1370/1+ driver
-# C:Maestro3 driver,SonicVibes driver,CS46xx driver,KORG1212 driver
-# C:NM256 driver,Trident driver,YMFPCI driver
-# F:pci/azt3328.c:1.23->1.24
-# F:pci/cmipci.c:1.76->1.77
-# F:pci/cs4281.c:1.68->1.69
-# F:pci/ens1370.c:1.73->1.74
-# F:pci/maestro3.c:1.67->1.68
-# F:pci/sonicvibes.c:1.44->1.45
-# F:pci/cs46xx/cs46xx_lib.c:1.92->1.93
-# F:pci/korg1212/korg1212.c:1.52->1.53
-# F:pci/nm256/nm256.c:1.57->1.58
-# F:pci/trident/trident_main.c:1.68->1.69
-# F:pci/ymfpci/ymfpci_main.c:1.63->1.64
-# L:Make sure that the chip instance is created at first before other components.
-# L:This will fix occasional oops at unloading due to the access to the released
-# L:resources.
-# Signed-off-by: Takashi Iwai <tiwai@suse.de>
-#
-# sound/pci/sonicvibes.c
-# 2005/01/03 04:45:32+01:00 perex@suse.cz +2 -1
-# [ALSA] Fix the order of creation of instances
-#
-# D:2005/01/03 11:45:31
-# C:AZT3328 driver,CMIPCI driver,CS4281 driver,ENS1370/1+ driver
-# C:Maestro3 driver,SonicVibes driver,CS46xx driver,KORG1212 driver
-# C:NM256 driver,Trident driver,YMFPCI driver
-# F:pci/azt3328.c:1.23->1.24
-# F:pci/cmipci.c:1.76->1.77
-# F:pci/cs4281.c:1.68->1.69
-# F:pci/ens1370.c:1.73->1.74
-# F:pci/maestro3.c:1.67->1.68
-# F:pci/sonicvibes.c:1.44->1.45
-# F:pci/cs46xx/cs46xx_lib.c:1.92->1.93
-# F:pci/korg1212/korg1212.c:1.52->1.53
-# F:pci/nm256/nm256.c:1.57->1.58
-# F:pci/trident/trident_main.c:1.68->1.69
-# F:pci/ymfpci/ymfpci_main.c:1.63->1.64
-# L:Make sure that the chip instance is created at first before other components.
-# L:This will fix occasional oops at unloading due to the access to the released
-# L:resources.
-# Signed-off-by: Takashi Iwai <tiwai@suse.de>
-#
-# sound/pci/trident/trident_main.c
-# 2005/01/03 04:45:32+01:00 perex@suse.cz +5 -7
-# [ALSA] Fix the order of creation of instances
-#
-# D:2005/01/03 11:45:31
-# C:AZT3328 driver,CMIPCI driver,CS4281 driver,ENS1370/1+ driver
-# C:Maestro3 driver,SonicVibes driver,CS46xx driver,KORG1212 driver
-# C:NM256 driver,Trident driver,YMFPCI driver
-# F:pci/azt3328.c:1.23->1.24
-# F:pci/cmipci.c:1.76->1.77
-# F:pci/cs4281.c:1.68->1.69
-# F:pci/ens1370.c:1.73->1.74
-# F:pci/maestro3.c:1.67->1.68
-# F:pci/sonicvibes.c:1.44->1.45
-# F:pci/cs46xx/cs46xx_lib.c:1.92->1.93
-# F:pci/korg1212/korg1212.c:1.52->1.53
-# F:pci/nm256/nm256.c:1.57->1.58
-# F:pci/trident/trident_main.c:1.68->1.69
-# F:pci/ymfpci/ymfpci_main.c:1.63->1.64
-# L:Make sure that the chip instance is created at first before other components.
-# L:This will fix occasional oops at unloading due to the access to the released
-# L:resources.
-# Signed-off-by: Takashi Iwai <tiwai@suse.de>
-#
-# sound/pci/ymfpci/ymfpci_main.c
-# 2005/01/03 04:45:33+01:00 perex@suse.cz +2 -2
-# [ALSA] Fix the order of creation of instances
-#
-# D:2005/01/03 11:45:31
-# C:AZT3328 driver,CMIPCI driver,CS4281 driver,ENS1370/1+ driver
-# C:Maestro3 driver,SonicVibes driver,CS46xx driver,KORG1212 driver
-# C:NM256 driver,Trident driver,YMFPCI driver
-# F:pci/azt3328.c:1.23->1.24
-# F:pci/cmipci.c:1.76->1.77
-# F:pci/cs4281.c:1.68->1.69
-# F:pci/ens1370.c:1.73->1.74
-# F:pci/maestro3.c:1.67->1.68
-# F:pci/sonicvibes.c:1.44->1.45
-# F:pci/cs46xx/cs46xx_lib.c:1.92->1.93
-# F:pci/korg1212/korg1212.c:1.52->1.53
-# F:pci/nm256/nm256.c:1.57->1.58
-# F:pci/trident/trident_main.c:1.68->1.69
-# F:pci/ymfpci/ymfpci_main.c:1.63->1.64
-# L:Make sure that the chip instance is created at first before other components.
-# L:This will fix occasional oops at unloading due to the access to the released
-# L:resources.
-# Signed-off-by: Takashi Iwai <tiwai@suse.de>
-#
-diff -Nru a/sound/pci/azt3328.c b/sound/pci/azt3328.c
---- a/sound/pci/azt3328.c 2005-01-22 23:23:00 -08:00
-+++ b/sound/pci/azt3328.c 2005-01-22 23:23:00 -08:00
-@@ -1344,14 +1344,14 @@
- for (tmp=0; tmp <= 0x01; tmp += 1)
- snd_azf3328_dbgmisc("0x%02x: opl 0x%04x, mpu300 0x%04x, mpu310 0x%04x, mpu320 0x%04x, mpu330 0x%04x\n", tmp, inb(0x388 + tmp), inb(0x300 + tmp), inb(0x310 + tmp), inb(0x320 + tmp), inb(0x330 + tmp));
-
-- /* create mixer interface & switches */
-- if ((err = snd_azf3328_mixer_new(chip)) < 0)
-- return err;
--
- if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0) {
- snd_azf3328_free(chip);
- return err;
- }
-+
-+ /* create mixer interface & switches */
-+ if ((err = snd_azf3328_mixer_new(chip)) < 0)
-+ return err;
-
- #if 0
- /* set very low bitrate to reduce noise and power consumption? */
-diff -Nru a/sound/pci/cmipci.c b/sound/pci/cmipci.c
---- a/sound/pci/cmipci.c 2005-01-22 23:23:00 -08:00
-+++ b/sound/pci/cmipci.c 2005-01-22 23:23:00 -08:00
-@@ -2608,8 +2608,8 @@
-
- if (request_irq(pci->irq, snd_cmipci_interrupt, SA_INTERRUPT|SA_SHIRQ, card->driver, (void *)cm)) {
- snd_printk("unable to grab IRQ %d\n", pci->irq);
-- err = -EBUSY;
-- goto __error;
-+ snd_cmipci_free(cm);
-+ return -EBUSY;
- }
- cm->irq = pci->irq;
-
-@@ -2662,6 +2662,11 @@
- break;
- }
-
-+ if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, cm, &ops)) < 0) {
-+ snd_cmipci_free(cm);
-+ return err;
-+ }
-+
- /* set MPU address */
- switch (iomidi) {
- case 0x320: val = CM_VMPU_320; break;
-@@ -2717,22 +2722,22 @@
- /* create pcm devices */
- pcm_index = pcm_spdif_index = 0;
- if ((err = snd_cmipci_pcm_new(cm, pcm_index)) < 0)
-- goto __error;
-+ return err;
- pcm_index++;
- if (cm->has_dual_dac) {
- if ((err = snd_cmipci_pcm2_new(cm, pcm_index)) < 0)
-- goto __error;
-+ return err;
- pcm_index++;
- }
- if (cm->can_ac3_hw || cm->can_ac3_sw) {
- pcm_spdif_index = pcm_index;
- if ((err = snd_cmipci_pcm_spdif_new(cm, pcm_index)) < 0)
-- goto __error;
-+ return err;
- }
-
- /* create mixer interface & switches */
- if ((err = snd_cmipci_mixer_new(cm, pcm_spdif_index)) < 0)
-- goto __error;
-+ return err;
-
- if (iomidi > 0) {
- if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_CMIPCI,
-@@ -2742,10 +2747,6 @@
- }
- }
-
-- if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, cm, &ops)) < 0) {
-- snd_cmipci_free(cm);
-- return err;
-- }
- #ifdef USE_VAR48KRATE
- for (val = 0; val < ARRAY_SIZE(rates); val++)
- snd_cmipci_set_pll(cm, rates[val], val);
-@@ -2785,10 +2786,6 @@
-
- *rcmipci = cm;
- return 0;
--
-- __error:
-- snd_cmipci_free(cm);
-- return err;
- }
-
- /*
-diff -Nru a/sound/pci/cs4281.c b/sound/pci/cs4281.c
---- a/sound/pci/cs4281.c 2005-01-22 23:23:00 -08:00
-+++ b/sound/pci/cs4281.c 2005-01-22 23:23:00 -08:00
-@@ -1439,14 +1439,14 @@
- return tmp;
- }
-
-- snd_cs4281_proc_init(chip);
--
-- snd_card_set_pm_callback(card, cs4281_suspend, cs4281_resume, chip);
--
- if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0) {
- snd_cs4281_free(chip);
- return err;
- }
-+
-+ snd_cs4281_proc_init(chip);
-+
-+ snd_card_set_pm_callback(card, cs4281_suspend, cs4281_resume, chip);
-
- snd_card_set_dev(card, &pci->dev);
-
-diff -Nru a/sound/pci/cs46xx/cs46xx_lib.c b/sound/pci/cs46xx/cs46xx_lib.c
---- a/sound/pci/cs46xx/cs46xx_lib.c 2005-01-22 23:23:00 -08:00
-+++ b/sound/pci/cs46xx/cs46xx_lib.c 2005-01-22 23:23:00 -08:00
-@@ -3909,15 +3909,15 @@
- return err;
- }
-
-- snd_cs46xx_proc_init(card, chip);
--
-- snd_card_set_pm_callback(card, snd_cs46xx_suspend, snd_cs46xx_resume, chip);
--
- if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0) {
- snd_cs46xx_free(chip);
- return err;
- }
-
-+ snd_cs46xx_proc_init(card, chip);
-+
-+ snd_card_set_pm_callback(card, snd_cs46xx_suspend, snd_cs46xx_resume, chip);
-+
- chip->active_ctrl(chip, -1); /* disable CLKRUN */
-
- snd_card_set_dev(card, &pci->dev);
-diff -Nru a/sound/pci/ens1370.c b/sound/pci/ens1370.c
---- a/sound/pci/ens1370.c 2005-01-22 23:23:00 -08:00
-+++ b/sound/pci/ens1370.c 2005-01-22 23:23:00 -08:00
-@@ -1924,7 +1924,6 @@
- ensoniq->subsystem_vendor_id = cmdw;
- pci_read_config_word(pci, PCI_SUBSYSTEM_ID, &cmdw);
- ensoniq->subsystem_device_id = cmdw;
-- snd_ensoniq_proc_init(ensoniq);
- #ifdef CHIP1370
- #if 0
- ensoniq->ctrl = ES_1370_CDC_EN | ES_1370_SERR_DISABLE | ES_1370_PCLKDIVO(ES_1370_SRTODIV(8000));
-@@ -2016,6 +2015,8 @@
- snd_ensoniq_free(ensoniq);
- return err;
- }
-+
-+ snd_ensoniq_proc_init(ensoniq);
-
- snd_card_set_dev(card, &pci->dev);
-
-diff -Nru a/sound/pci/korg1212/korg1212.c b/sound/pci/korg1212/korg1212.c
---- a/sound/pci/korg1212/korg1212.c 2005-01-22 23:23:00 -08:00
-+++ b/sound/pci/korg1212/korg1212.c 2005-01-22 23:23:00 -08:00
-@@ -2412,14 +2412,17 @@
- if (rc) K1212_DEBUG_PRINTK("K1212_DEBUG: Reboot Card - RC = %d [%s]\n", rc, stateName[korg1212->cardState]);
- #endif
-
-+ if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, korg1212, &ops)) < 0) {
-+ snd_korg1212_free(korg1212);
-+ return err;
-+ }
-+
- snd_korg1212_EnableCardInterrupts(korg1212);
-
- mdelay(CARD_BOOT_DELAY_IN_MS);
-
-- if (snd_korg1212_downloadDSPCode(korg1212)) {
-- snd_korg1212_free(korg1212);
-+ if (snd_korg1212_downloadDSPCode(korg1212))
- return -EBUSY;
-- }
-
- printk(KERN_INFO "dspMemPhy = %08x U[%08x]\n"
- "PlayDataPhy = %08x L[%08x]\n"
-@@ -2434,10 +2437,8 @@
- korg1212->RoutingTablePhy, LowerWordSwap(korg1212->RoutingTablePhy),
- korg1212->AdatTimeCodePhy, LowerWordSwap(korg1212->AdatTimeCodePhy));
-
-- if ((err = snd_pcm_new(korg1212->card, "korg1212", 0, 1, 1, &korg1212->pcm)) < 0) {
-- snd_korg1212_free(korg1212);
-+ if ((err = snd_pcm_new(korg1212->card, "korg1212", 0, 1, 1, &korg1212->pcm)) < 0)
- return err;
-- }
-
- korg1212->pcm->private_data = korg1212;
- korg1212->pcm->private_free = snd_korg1212_free_pcm;
-@@ -2454,18 +2455,11 @@
-
- for (i = 0; i < ARRAY_SIZE(snd_korg1212_controls); i++) {
- err = snd_ctl_add(korg1212->card, snd_ctl_new1(&snd_korg1212_controls[i], korg1212));
-- if (err < 0) {
-- snd_korg1212_free(korg1212);
-+ if (err < 0)
- return err;
-- }
- }
-
- snd_korg1212_proc_init(korg1212);
--
-- if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, korg1212, &ops)) < 0) {
-- snd_korg1212_free(korg1212);
-- return err;
-- }
-
- snd_card_set_dev(card, &pci->dev);
-
-diff -Nru a/sound/pci/maestro3.c b/sound/pci/maestro3.c
---- a/sound/pci/maestro3.c 2005-01-22 23:23:00 -08:00
-+++ b/sound/pci/maestro3.c 2005-01-22 23:23:00 -08:00
-@@ -2564,26 +2564,7 @@
-
- snd_m3_assp_init(chip);
- snd_m3_amp_enable(chip, 1);
--
-- if ((err = snd_m3_mixer(chip)) < 0) {
-- snd_m3_free(chip);
-- return err;
-- }
-
-- for (i = 0; i < chip->num_substreams; i++) {
-- m3_dma_t *s = &chip->substreams[i];
-- s->chip = chip;
-- if ((err = snd_m3_assp_client_init(chip, s, i)) < 0) {
-- snd_m3_free(chip);
-- return err;
-- }
-- }
--
-- if ((err = snd_m3_pcm(chip, 0)) < 0) {
-- snd_m3_free(chip);
-- return err;
-- }
--
- if (request_irq(pci->irq, snd_m3_interrupt, SA_INTERRUPT|SA_SHIRQ,
- card->driver, (void *)chip)) {
- snd_printk("unable to grab IRQ %d\n", pci->irq);
-@@ -2605,6 +2586,19 @@
- return err;
- }
-
-+ if ((err = snd_m3_mixer(chip)) < 0)
-+ return err;
-+
-+ for (i = 0; i < chip->num_substreams; i++) {
-+ m3_dma_t *s = &chip->substreams[i];
-+ s->chip = chip;
-+ if ((err = snd_m3_assp_client_init(chip, s, i)) < 0)
-+ return err;
-+ }
-+
-+ if ((err = snd_m3_pcm(chip, 0)) < 0)
-+ return err;
-+
- snd_m3_enable_ints(chip);
- snd_m3_assp_continue(chip);
-
-diff -Nru a/sound/pci/nm256/nm256.c b/sound/pci/nm256/nm256.c
---- a/sound/pci/nm256/nm256.c 2005-01-22 23:23:00 -08:00
-+++ b/sound/pci/nm256/nm256.c 2005-01-22 23:23:00 -08:00
-@@ -1486,12 +1486,6 @@
-
- snd_nm256_init_chip(chip);
-
-- if ((err = snd_nm256_pcm(chip, 0)) < 0)
-- goto __error;
--
-- if ((err = snd_nm256_mixer(chip)) < 0)
-- goto __error;
--
- // pci_set_master(pci); /* needed? */
-
- snd_card_set_pm_callback(card, nm256_suspend, nm256_resume, chip);
-@@ -1610,6 +1604,12 @@
- if (reset_workaround[dev]) {
- snd_printdd(KERN_INFO "nm256: reset_workaround activated\n");
- chip->reset_workaround = 1;
-+ }
-+
-+ if ((err = snd_nm256_pcm(chip, 0)) < 0 ||
-+ (err = snd_nm256_mixer(chip)) < 0) {
-+ snd_card_free(card);
-+ return err;
- }
-
- sprintf(card->shortname, "NeoMagic %s", card->driver);
-diff -Nru a/sound/pci/sonicvibes.c b/sound/pci/sonicvibes.c
---- a/sound/pci/sonicvibes.c 2005-01-22 23:23:00 -08:00
-+++ b/sound/pci/sonicvibes.c 2005-01-22 23:23:00 -08:00
-@@ -1333,12 +1333,13 @@
- #endif
- sonic->revision = snd_sonicvibes_in(sonic, SV_IREG_REVISION);
- snd_ctl_add(card, snd_ctl_new1(&snd_sonicvibes_game_control, sonic));
-- snd_sonicvibes_proc_init(sonic);
-
- if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, sonic, &ops)) < 0) {
- snd_sonicvibes_free(sonic);
- return err;
- }
-+
-+ snd_sonicvibes_proc_init(sonic);
-
- snd_card_set_dev(card, &pci->dev);
-
-diff -Nru a/sound/pci/trident/trident_main.c b/sound/pci/trident/trident_main.c
---- a/sound/pci/trident/trident_main.c 2005-01-22 23:23:00 -08:00
-+++ b/sound/pci/trident/trident_main.c 2005-01-22 23:23:00 -08:00
-@@ -3614,10 +3614,13 @@
- return err;
- }
-
-- if ((err = snd_trident_mixer(trident, pcm_spdif_device)) < 0) {
-+ if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, trident, &ops)) < 0) {
- snd_trident_free(trident);
- return err;
- }
-+
-+ if ((err = snd_trident_mixer(trident, pcm_spdif_device)) < 0)
-+ return err;
-
- /* initialise synth voices */
- for (i = 0; i < 64; i++) {
-@@ -3638,12 +3641,7 @@
-
-
- snd_card_set_pm_callback(card, snd_trident_suspend, snd_trident_resume, trident);
--
- snd_trident_proc_init(trident);
-- if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, trident, &ops)) < 0) {
-- snd_trident_free(trident);
-- return err;
-- }
- snd_card_set_dev(card, &pci->dev);
- *rtrident = trident;
- return 0;
-@@ -3653,7 +3651,7 @@
- snd_trident_free
-
- Description: This routine will free the device specific class for
-- q the 4DWave card.
-+ the 4DWave card.
-
- Paramters: trident - device specific private data for 4DWave card
-
-diff -Nru a/sound/pci/ymfpci/ymfpci_main.c b/sound/pci/ymfpci/ymfpci_main.c
---- a/sound/pci/ymfpci/ymfpci_main.c 2005-01-22 23:23:00 -08:00
-+++ b/sound/pci/ymfpci/ymfpci_main.c 2005-01-22 23:23:00 -08:00
-@@ -2266,12 +2266,12 @@
- snd_card_set_pm_callback(card, snd_ymfpci_suspend, snd_ymfpci_resume, chip);
- #endif
-
-- snd_ymfpci_proc_init(card, chip);
--
- if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0) {
- snd_ymfpci_free(chip);
- return err;
- }
-+
-+ snd_ymfpci_proc_init(card, chip);
-
- snd_card_set_dev(card, &pci->dev);
-
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/072-sctp_do_bind_random_port.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/072-sctp_do_bind_random_port.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/072-sctp_do_bind_random_port.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,46 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [SCTP] Fix bug in setting ephemeral port in the bind address.
-## DP: Patch author: sri@us.ibm.com
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2004/12/28 17:04:30-08:00 sri@us.ibm.com
-# [SCTP] Fix bug in setting ephemeral port in the bind address.
-#
-# Signed-off-by: Sridhar Samudrala <sri@us.ibm.com>
-#
-# net/sctp/socket.c
-# 2004/12/28 17:04:18-08:00 sri@us.ibm.com +2 -4
-# [SCTP] Fix bug in setting ephemeral port in the bind address.
-#
-diff -Nru a/net/sctp/socket.c b/net/sctp/socket.c
---- a/net/sctp/socket.c 2005-01-22 23:21:40 -08:00
-+++ b/net/sctp/socket.c 2005-01-22 23:21:40 -08:00
-@@ -343,8 +343,8 @@
- }
-
- /* Refresh ephemeral port. */
-- if (!snum)
-- snum = inet_sk(sk)->num;
-+ if (!bp->port)
-+ bp->port = inet_sk(sk)->num;
-
- /* Add the address to the bind address list. */
- sctp_local_bh_disable();
-@@ -354,8 +354,6 @@
- addr->v4.sin_port = ntohs(addr->v4.sin_port);
- ret = sctp_add_bind_addr(bp, addr, GFP_ATOMIC);
- addr->v4.sin_port = htons(addr->v4.sin_port);
-- if (!ret && !bp->port)
-- bp->port = snum;
- sctp_write_unlock(&ep->base.addr_lock);
- sctp_local_bh_enable();
-
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/073-usb_gadget_serial_free_ports.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/073-usb_gadget_serial_free_ports.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/073-usb_gadget_serial_free_ports.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,43 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [PATCH] USB: fix serial gadget oops during enumeration
-## DP: Patch author: david-b@pacbell.net
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/06 17:27:58-08:00 david-b@pacbell.net
-# [PATCH] USB: fix serial gadget oops during enumeration
-#
-# This prevents the serial gadget driver from oopsing during enumeration
-# when spinlocks are configured, and slab poisoning is active...
-#
-# Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
-# Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
-#
-# drivers/usb/gadget/serial.c
-# 2005/01/06 12:29:34-08:00 david-b@pacbell.net +1 -1
-# USB: fix serial gadget oops during enumeration
-#
-diff -Nru a/drivers/usb/gadget/serial.c b/drivers/usb/gadget/serial.c
---- a/drivers/usb/gadget/serial.c 2005-01-22 21:43:13 -08:00
-+++ b/drivers/usb/gadget/serial.c 2005-01-22 21:43:13 -08:00
-@@ -2322,11 +2322,11 @@
- wake_up_interruptible(&port->port_tty->read_wait);
- wake_up_interruptible(&port->port_tty->write_wait);
- }
-+ spin_unlock_irqrestore(&port->port_lock, flags);
- } else {
- kfree(port);
- }
-
-- spin_unlock_irqrestore(&port->port_lock, flags);
- }
- }
- }
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/074-usb_makefile_fixes.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/074-usb_makefile_fixes.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/074-usb_makefile_fixes.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,46 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [PATCH] USB: usb makefile tweaks
-## DP: Patch author: david-b@pacbell.net
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/07 08:46:29-08:00 david-b@pacbell.net
-# [PATCH] USB: usb makefile tweaks
-#
-# Two minor Makefile fixes, catching up to some driver removals.
-#
-# Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
-# Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
-#
-# drivers/usb/Makefile
-# 2005/01/05 12:21:54-08:00 david-b@pacbell.net +1 -2
-# USB: usb makefile tweaks
-#
-diff -Nru a/drivers/usb/Makefile b/drivers/usb/Makefile
---- a/drivers/usb/Makefile 2005-01-22 21:15:50 -08:00
-+++ b/drivers/usb/Makefile 2005-01-22 21:15:50 -08:00
-@@ -9,7 +9,7 @@
- obj-$(CONFIG_USB_EHCI_HCD) += host/
- obj-$(CONFIG_USB_OHCI_HCD) += host/
- obj-$(CONFIG_USB_UHCI_HCD) += host/
--obj-$(CONFIG_USB_SL811HS) += host/
-+obj-$(CONFIG_USB_SL811_HCD) += host/
- obj-$(CONFIG_ETRAX_USB_HOST) += host/
-
- obj-$(CONFIG_USB_ACM) += class/
-@@ -49,7 +49,6 @@
- obj-$(CONFIG_USB_RTL8150) += net/
- obj-$(CONFIG_USB_USBNET) += net/
-
--obj-$(CONFIG_USB_DC2XX) += image/
- obj-$(CONFIG_USB_HPUSBSCSI) += image/
- obj-$(CONFIG_USB_MDC800) += image/
- obj-$(CONFIG_USB_MICROTEK) += image/
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/075-acpiphp_ibm_module_parm_perm.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/075-acpiphp_ibm_module_parm_perm.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/075-acpiphp_ibm_module_parm_perm.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,39 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [PATCH] hotplug/acpiphp_ibm: module_param fix
-## DP: Patch author: domen@coderock.org
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/07 10:32:39-08:00 domen@coderock.org
-# [PATCH] hotplug/acpiphp_ibm: module_param fix
-#
-# File permissins should be octal number.
-#
-#
-# Signed-off-by: Domen Puncer <domen@coderock.org>
-# Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
-#
-# drivers/pci/hotplug/acpiphp_ibm.c
-# 2004/12/29 01:48:10-08:00 domen@coderock.org +1 -1
-# hotplug/acpiphp_ibm: module_param fix
-#
-diff -Nru a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c
---- a/drivers/pci/hotplug/acpiphp_ibm.c 2005-01-22 22:58:50 -08:00
-+++ b/drivers/pci/hotplug/acpiphp_ibm.c 2005-01-22 22:58:50 -08:00
-@@ -47,7 +47,7 @@
- MODULE_DESCRIPTION(DRIVER_DESC);
- MODULE_LICENSE("GPL");
- MODULE_VERSION(DRIVER_VERSION);
--module_param(debug, bool, 644);
-+module_param(debug, bool, 0644);
- MODULE_PARM_DESC(debug, " Debugging mode enabled or not");
- #define MY_NAME "acpiphp_ibm"
-
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/076-i2c_ali1563_devinit_fixes.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/076-i2c_ali1563_devinit_fixes.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/076-i2c_ali1563_devinit_fixes.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,67 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [PATCH] i2c-ali1563: fix init & exit section usage
-## DP: Patch author: rddunlap@osdl.org
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/07 11:16:13-08:00 rddunlap@osdl.org
-# [PATCH] i2c-ali1563: fix init & exit section usage
-#
-# Fix init & exit section usages, beginning with this diagnostic
-# from reference_discarded.pl (make buildcheck):
-# Error: ./drivers/i2c/busses/i2c-ali1563.o .data refers to 00000278 R_386_32 .exit.text
-#
-# Signed-off-by: Randy Dunlap <rddunlap@osdl.org>
-# Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
-#
-# drivers/i2c/busses/i2c-ali1563.c
-# 2005/01/06 21:42:07-08:00 rddunlap@osdl.org +4 -4
-# i2c-ali1563: fix init & exit section usage
-#
-diff -Nru a/drivers/i2c/busses/i2c-ali1563.c b/drivers/i2c/busses/i2c-ali1563.c
---- a/drivers/i2c/busses/i2c-ali1563.c 2005-01-22 23:45:29 -08:00
-+++ b/drivers/i2c/busses/i2c-ali1563.c 2005-01-22 23:45:29 -08:00
-@@ -306,7 +306,7 @@
- pci_write_config_word(dev,ALI1563_SMBBA,ctrl);
- }
-
--static int __init ali1563_setup(struct pci_dev * dev)
-+static int __devinit ali1563_setup(struct pci_dev * dev)
- {
- u16 ctrl;
-
-@@ -362,7 +362,7 @@
- .algo = &ali1563_algorithm,
- };
-
--static int __init ali1563_probe(struct pci_dev * dev,
-+static int __devinit ali1563_probe(struct pci_dev * dev,
- const struct pci_device_id * id_table)
- {
- int error;
-@@ -378,7 +378,7 @@
- return error;
- }
-
--static void __exit ali1563_remove(struct pci_dev * dev)
-+static void __devexit ali1563_remove(struct pci_dev * dev)
- {
- i2c_del_adapter(&ali1563_adapter);
- ali1563_shutdown(dev);
-@@ -395,7 +395,7 @@
- .name = "ali1563_i2c",
- .id_table = ali1563_id_table,
- .probe = ali1563_probe,
-- .remove = ali1563_remove,
-+ .remove = __devexit_p(ali1563_remove),
- };
-
- static int __init ali1563_init(void)
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/077-ext3_journal_abort_handle_silence.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/077-ext3_journal_abort_handle_silence.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/077-ext3_journal_abort_handle_silence.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,64 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [PATCH] ext3: cleanup handling of aborted transactions.
-## DP: Patch author: sct@redhat.com
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/04 21:27:23-08:00 sct@redhat.com
-# [PATCH] ext3: cleanup handling of aborted transactions.
-#
-# This patch improves ext3's error logging when we encounter an on-disk
-# corruption. Previously, a transaction (such as a truncate) which encountered
-# many corruptions (eg. a single highly-corrupt indirect block) would emit
-# copious "aborting transaction" errors to the log.
-#
-# Even worse, encountering an aborted journal can count as such an error,
-# leading to a flood of spurious "aborting transaction: Journal has aborted"
-# errors.
-#
-# With the fix, only emit that message on the first error. The patch also
-# restores a missing \n in that printk path.
-#
-# Signed-off-by: Stephen Tweedie <sct@redhat.com>
-# Signed-off-by: Andrew Morton <akpm@osdl.org>
-# Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-#
-# fs/ext3/super.c
-# 2005/01/04 20:24:30-08:00 sct@redhat.com +9 -4
-# ext3: cleanup handling of aborted transactions.
-#
-diff -Nru a/fs/ext3/super.c b/fs/ext3/super.c
---- a/fs/ext3/super.c 2005-01-22 22:55:48 -08:00
-+++ b/fs/ext3/super.c 2005-01-22 22:55:48 -08:00
-@@ -108,14 +108,19 @@
- char nbuf[16];
- const char *errstr = ext3_decode_error(NULL, err, nbuf);
-
-- printk(KERN_ERR "%s: aborting transaction: %s in %s",
-- caller, errstr, err_fn);
--
- if (bh)
- BUFFER_TRACE(bh, "abort");
-- journal_abort_handle(handle);
-+
- if (!handle->h_err)
- handle->h_err = err;
-+
-+ if (is_handle_aborted(handle))
-+ return;
-+
-+ printk(KERN_ERR "%s: aborting transaction: %s in %s\n",
-+ caller, errstr, err_fn);
-+
-+ journal_abort_handle(handle);
- }
-
- /* Deal with the reporting of failure conditions on a filesystem such as
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/078-jbd_journal_revoke_graceful_double_delete.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/078-jbd_journal_revoke_graceful_double_delete.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/078-jbd_journal_revoke_graceful_double_delete.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,59 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [PATCH] ext3: handle attempted double-delete of metadata.
-## DP: Patch author: sct@redhat.com
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/04 21:27:49-08:00 sct@redhat.com
-# [PATCH] ext3: handle attempted double-delete of metadata.
-#
-# This patch improves ext3's ability to deal with corruption on-disk. If we
-# try to delete a metadata block twice, we confuse ext3's internal revoke
-# error-checking, resulting in a BUG(). But this can occur in practice due
-# to a corrupt indirect block, so we should attempt to fail gracefully.
-#
-# Downgrade the assert failure to a JH_EXPECT_BH failure, and return EIO when
-# it occurs.
-#
-# This is easily reproduced with a sample ext3 fs image containing an inode
-# which references the same indirect block more than once. Deleting that
-# inode will BUG() an unfixed kernel with:
-#
-# Assertion failure in journal_revoke() at fs/jbd/revoke.c:379:
-# "!buffer_revoked(bh)"
-#
-# With the fix, ext3 recovers gracefully.
-#
-# Signed-off-by: Stephen Tweedie <sct@redhat.com>
-# Signed-off-by: Andrew Morton <akpm@osdl.org>
-# Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-#
-# fs/jbd/revoke.c
-# 2005/01/04 18:48:12-08:00 sct@redhat.com +6 -1
-# ext3: handle attempted double-delete of metadata.
-#
-diff -Nru a/fs/jbd/revoke.c b/fs/jbd/revoke.c
---- a/fs/jbd/revoke.c 2005-01-22 22:56:39 -08:00
-+++ b/fs/jbd/revoke.c 2005-01-22 22:56:39 -08:00
-@@ -376,7 +376,12 @@
- first having the revoke cancelled: it's illegal to free a
- block twice without allocating it in between! */
- if (bh) {
-- J_ASSERT_BH(bh, !buffer_revoked(bh));
-+ if (!J_EXPECT_BH(bh, !buffer_revoked(bh),
-+ "inconsistent data on disk")) {
-+ if (!bh_in)
-+ brelse(bh);
-+ return -EIO;
-+ }
- set_buffer_revoked(bh);
- set_buffer_revokevalid(bh);
- if (bh_in) {
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/079-i386_timer_resume_slowdown.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/079-i386_timer_resume_slowdown.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/079-i386_timer_resume_slowdown.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,46 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [PATCH] time runx too fast after S3
-## DP: Patch author: shaohua.li@intel.com
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/04 21:28:15-08:00 shaohua.li@intel.com
-# [PATCH] time runx too fast after S3
-#
-# After resume from S3, 'date' shows time run too fast.
-#
-# Signed-off-by: Li Shaohua <shaohua.li@intel.com>
-# Signed-off-by: Andrew Morton <akpm@osdl.org>
-# Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-#
-# arch/i386/kernel/time.c
-# 2005/01/04 18:48:13-08:00 shaohua.li@intel.com +3 -2
-# time runx too fast after S3
-#
-diff -Nru a/arch/i386/kernel/time.c b/arch/i386/kernel/time.c
---- a/arch/i386/kernel/time.c 2005-01-22 22:57:24 -08:00
-+++ b/arch/i386/kernel/time.c 2005-01-22 22:57:24 -08:00
-@@ -342,12 +342,13 @@
- hpet_reenable();
- #endif
- sec = get_cmos_time() + clock_cmos_diff;
-- sleep_length = get_cmos_time() - sleep_start;
-+ sleep_length = (get_cmos_time() - sleep_start) * HZ;
- write_seqlock_irqsave(&xtime_lock, flags);
- xtime.tv_sec = sec;
- xtime.tv_nsec = 0;
- write_sequnlock_irqrestore(&xtime_lock, flags);
-- jiffies += sleep_length * HZ;
-+ jiffies += sleep_length;
-+ wall_jiffies += sleep_length;
- return 0;
- }
-
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/080-kernel_sched_might_sleep_ignore_if_oopsed.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/080-kernel_sched_might_sleep_ignore_if_oopsed.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/080-kernel_sched_might_sleep_ignore_if_oopsed.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,41 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [PATCH] suppress might_sleep() if oopsing
-## DP: Patch author: akpm@osdl.org
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/04 21:28:41-08:00 akpm@osdl.org
-# [PATCH] suppress might_sleep() if oopsing
-#
-# We can call might_sleep() functions on the oops handling path (under do_exit).
-#
-# There seem little point in emitting spurious might_sleep() warnings into the
-# logs after the kernel has oopsed.
-#
-# Signed-off-by: Andrew Morton <akpm@osdl.org>
-# Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-#
-# kernel/sched.c
-# 2005/01/04 20:24:26-08:00 akpm@osdl.org +1 -1
-# suppress might_sleep() if oopsing
-#
-diff -Nru a/kernel/sched.c b/kernel/sched.c
---- a/kernel/sched.c 2005-01-22 22:57:56 -08:00
-+++ b/kernel/sched.c 2005-01-22 22:57:56 -08:00
-@@ -4631,7 +4631,7 @@
- static unsigned long prev_jiffy; /* ratelimiting */
-
- if ((in_atomic() || irqs_disabled()) &&
-- system_state == SYSTEM_RUNNING) {
-+ system_state == SYSTEM_RUNNING && !oops_in_progress) {
- if (time_before(jiffies, prev_jiffy + HZ) && prev_jiffy)
- return;
- prev_jiffy = jiffies;
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/081-ia64_early_sn_setup_nested_loop.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/081-ia64_early_sn_setup_nested_loop.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/081-ia64_early_sn_setup_nested_loop.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,88 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [IA64] fix early SAL init for sn2
-## DP: Patch author: jbarnes@sgi.com
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/22 14:58:21-08:00 jbarnes@sgi.com
-# [IA64] fix early SAL init for sn2
-#
-# sn2 does early initialization of the SAL so it can use it for early console
-# support. Unfortunately, the loop to find the SAL entry point was buggy so
-# when we tried out new EFI and SAL system table layouts, the loop didn't
-# terminate. Here's the fix (doh!, use two different loop counters instead of
-# one and just return if we find the SAL entry point).
-#
-# Signed-off-by: Jesse Barnes <jbarnes@sgi.com>
-# Signed-off-by: Tony Luck <tony.luck@intel.com>
-#
-# arch/ia64/sn/kernel/setup.c
-# 2005/01/22 14:57:15-08:00 jbarnes@sgi.com +5 -4
-# fix early SAL init for sn2
-#
-# include/asm-ia64/sal.h
-# 2005/01/22 14:57:26-08:00 jbarnes@sgi.com +2 -0
-# fix early SAL init for sn2
-#
-diff -Nru a/arch/ia64/sn/kernel/setup.c b/arch/ia64/sn/kernel/setup.c
---- a/arch/ia64/sn/kernel/setup.c 2005-01-22 22:19:56 -08:00
-+++ b/arch/ia64/sn/kernel/setup.c 2005-01-22 22:19:56 -08:00
-@@ -163,13 +163,12 @@
-
- void __init early_sn_setup(void)
- {
-- void ia64_sal_handler_init(void *entry_point, void *gpval);
- efi_system_table_t *efi_systab;
- efi_config_table_t *config_tables;
- struct ia64_sal_systab *sal_systab;
- struct ia64_sal_desc_entry_point *ep;
- char *p;
-- int i;
-+ int i, j;
-
- /*
- * Parse enough of the SAL tables to locate the SAL entry point. Since, console
-@@ -185,19 +184,21 @@
- 0) {
- sal_systab = __va(config_tables[i].table);
- p = (char *)(sal_systab + 1);
-- for (i = 0; i < sal_systab->entry_count; i++) {
-+ for (j = 0; j < sal_systab->entry_count; j++) {
- if (*p == SAL_DESC_ENTRY_POINT) {
- ep = (struct ia64_sal_desc_entry_point
- *)p;
- ia64_sal_handler_init(__va
- (ep->sal_proc),
- __va(ep->gp));
-- break;
-+ return;
- }
- p += SAL_DESC_SIZE(*p);
- }
- }
- }
-+ /* Uh-oh, SAL not available?? */
-+ printk(KERN_ERR "failed to find SAL entry point\n");
- }
-
- extern int platform_intr_list[];
-diff -Nru a/include/asm-ia64/sal.h b/include/asm-ia64/sal.h
---- a/include/asm-ia64/sal.h 2005-01-22 22:19:56 -08:00
-+++ b/include/asm-ia64/sal.h 2005-01-22 22:19:56 -08:00
-@@ -833,6 +833,8 @@
- extern int ia64_sal_oemcall_reentrant(struct ia64_sal_retval *, u64, u64, u64,
- u64, u64, u64, u64, u64);
-
-+extern void ia64_sal_handler_init(void *entry_point, void *gpval);
-+
- #endif /* __ASSEMBLY__ */
-
- #endif /* _ASM_IA64_SAL_H */
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/082-ide_it8172_init_return_failure.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/082-ide_it8172_init_return_failure.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/082-ide_it8172_init_return_failure.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,48 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [ide] it8172: incorrect return from it8172_init_one()
-## DP: Patch author: bzolnier@trik.(none)
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2004/12/30 19:00:56+01:00 bzolnier@trik.(none)
-# [ide] it8172: incorrect return from it8172_init_one()
-#
-# From: Alan Cox <alan@lxorguk.ukuu.org.uk>
-#
-# Several IDE drivers return positive values as errors in the PCI setup
-# code. Unfortunately the PCI layer considers positive values as success
-# so the driver skips the device but still claims it and things then go
-# downhill.
-#
-# This fixes the IT8172 driver.
-#
-# From: Francois Romieu <romieu@fr.zoreil.com>
-#
-# Use -ENODEV instead of -EAGAIN.
-#
-# Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
-#
-# drivers/ide/pci/it8172.c
-# 2004/12/30 19:00:46+01:00 bzolnier@trik.(none) +1 -1
-# [ide] it8172: incorrect return from it8172_init_one()
-#
-diff -Nru a/drivers/ide/pci/it8172.c b/drivers/ide/pci/it8172.c
---- a/drivers/ide/pci/it8172.c 2005-01-22 23:08:16 -08:00
-+++ b/drivers/ide/pci/it8172.c 2005-01-22 23:08:16 -08:00
-@@ -270,7 +270,7 @@
- {
- if ((!(PCI_FUNC(dev->devfn) & 1) ||
- (!((dev->class >> 8) == PCI_CLASS_STORAGE_IDE))))
-- return 1; /* IT8172 is more than only a IDE controller */
-+ return -ENODEV; /* IT8172 is more than an IDE controller */
- ide_setup_pci_device(dev, &it8172_chipsets[id->driver_data]);
- return 0;
- }
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/084-smp_nmi_watchdog_race.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/084-smp_nmi_watchdog_race.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/084-smp_nmi_watchdog_race.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,140 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [PATCH] i386/x86-64: Fix SMP NMI watchdog race
-## DP: Patch author: ak@suse.de
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/21 07:59:10-08:00 ak@suse.de
-# [PATCH] i386/x86-64: Fix SMP NMI watchdog race
-#
-# Fix SMP race in NMI watchdog on i386/x86-64
-#
-# Fix a long standing SMP Setup race in the NMI watchdog. The watchdog would
-# tick from very early and check if all CPUs increase their timer interrupts.
-# For that it would check the cpu_online_map. Now if a CPU took too long to
-# boot the watchdog would trigger prematurely because the CPU didn't increase
-# its timer count yet.
-#
-# Fix is to check cpu_callin_map instead of cpu_online_map because the first is
-# only set when a CPU started its timer interrupt.
-#
-# I fixed it on i386 and x86-64.
-#
-# Description of the problem from Manpreet Singh. Thanks.
-#
-# Cc: <manpreet@fabric7.com>
-# Signed-off-by: Andrew Morton <akpm@osdl.org>
-# Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-#
-# arch/i386/kernel/nmi.c
-# 2005/01/20 21:29:13-08:00 ak@suse.de +5 -1
-# i386/x86-64: Fix SMP NMI watchdog race
-#
-# arch/i386/kernel/smpboot.c
-# 2005/01/20 20:58:11-08:00 ak@suse.de +1 -1
-# i386/x86-64: Fix SMP NMI watchdog race
-#
-# arch/x86_64/kernel/nmi.c
-# 2005/01/20 21:29:11-08:00 ak@suse.de +5 -1
-# i386/x86-64: Fix SMP NMI watchdog race
-#
-# arch/x86_64/kernel/smpboot.c
-# 2005/01/20 20:58:11-08:00 ak@suse.de +1 -1
-# i386/x86-64: Fix SMP NMI watchdog race
-#
-# include/asm-i386/smp.h
-# 2005/01/20 20:58:11-08:00 ak@suse.de +1 -0
-# i386/x86-64: Fix SMP NMI watchdog race
-#
-# include/asm-x86_64/smp.h
-# 2005/01/20 20:58:11-08:00 ak@suse.de +1 -0
-# i386/x86-64: Fix SMP NMI watchdog race
-#
-diff -Nru a/arch/i386/kernel/nmi.c b/arch/i386/kernel/nmi.c
---- a/arch/i386/kernel/nmi.c 2005-01-22 21:36:57 -08:00
-+++ b/arch/i386/kernel/nmi.c 2005-01-22 21:36:57 -08:00
-@@ -117,8 +117,12 @@
- /* FIXME: Only boot CPU is online at this stage. Check CPUs
- as they come up. */
- for (cpu = 0; cpu < NR_CPUS; cpu++) {
-- if (!cpu_online(cpu))
-+#ifdef CONFIG_SMP
-+ /* Check cpu_callin_map here because that is set
-+ after the timer is started. */
-+ if (!cpu_isset(cpu, cpu_callin_map))
- continue;
-+#endif
- if (nmi_count(cpu) - prev_nmi_count[cpu] <= 5) {
- printk("CPU#%d: NMI appears to be stuck!\n", cpu);
- nmi_active = 0;
-diff -Nru a/arch/i386/kernel/smpboot.c b/arch/i386/kernel/smpboot.c
---- a/arch/i386/kernel/smpboot.c 2005-01-22 21:36:57 -08:00
-+++ b/arch/i386/kernel/smpboot.c 2005-01-22 21:36:57 -08:00
-@@ -66,7 +66,7 @@
- /* bitmap of online cpus */
- cpumask_t cpu_online_map;
-
--static cpumask_t cpu_callin_map;
-+cpumask_t cpu_callin_map;
- cpumask_t cpu_callout_map;
- static cpumask_t smp_commenced_mask;
-
-diff -Nru a/arch/x86_64/kernel/nmi.c b/arch/x86_64/kernel/nmi.c
---- a/arch/x86_64/kernel/nmi.c 2005-01-22 21:36:57 -08:00
-+++ b/arch/x86_64/kernel/nmi.c 2005-01-22 21:36:57 -08:00
-@@ -130,8 +130,12 @@
- mdelay((10*1000)/nmi_hz); // wait 10 ticks
-
- for (cpu = 0; cpu < NR_CPUS; cpu++) {
-- if (!cpu_online(cpu))
-+#ifdef CONFIG_SMP
-+ /* Check cpu_callin_map here because that is set
-+ after the timer is started. */
-+ if (!cpu_isset(cpu, cpu_callin_map))
- continue;
-+#endif
- if (cpu_pda[cpu].__nmi_count - counts[cpu] <= 5) {
- printk("CPU#%d: NMI appears to be stuck (%d)!\n",
- cpu,
-diff -Nru a/arch/x86_64/kernel/smpboot.c b/arch/x86_64/kernel/smpboot.c
---- a/arch/x86_64/kernel/smpboot.c 2005-01-22 21:36:57 -08:00
-+++ b/arch/x86_64/kernel/smpboot.c 2005-01-22 21:36:57 -08:00
-@@ -63,7 +63,7 @@
- /* Bitmask of currently online CPUs */
- cpumask_t cpu_online_map;
-
--static cpumask_t cpu_callin_map;
-+cpumask_t cpu_callin_map;
- cpumask_t cpu_callout_map;
- static cpumask_t smp_commenced_mask;
-
-diff -Nru a/include/asm-i386/smp.h b/include/asm-i386/smp.h
---- a/include/asm-i386/smp.h 2005-01-22 21:36:57 -08:00
-+++ b/include/asm-i386/smp.h 2005-01-22 21:36:57 -08:00
-@@ -53,6 +53,7 @@
- #define __smp_processor_id() (current_thread_info()->cpu)
-
- extern cpumask_t cpu_callout_map;
-+extern cpumask_t cpu_callin_map;
- #define cpu_possible_map cpu_callout_map
-
- /* We don't mark CPUs online until __cpu_up(), so we need another measure */
-diff -Nru a/include/asm-x86_64/smp.h b/include/asm-x86_64/smp.h
---- a/include/asm-x86_64/smp.h 2005-01-22 21:36:57 -08:00
-+++ b/include/asm-x86_64/smp.h 2005-01-22 21:36:57 -08:00
-@@ -59,6 +59,7 @@
- */
-
- extern cpumask_t cpu_callout_map;
-+extern cpumask_t cpu_callin_map;
- #define cpu_possible_map cpu_callout_map
-
- static inline int num_booting_cpus(void)
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/085-ia64_irq_reg_typo.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/085-ia64_irq_reg_typo.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/085-ia64_irq_reg_typo.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,39 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [IA64] irq_ia64.c typo s/_IA64_REG_AR_SP/_IA64_REG_SP/
-## DP: Patch author: tony.luck@intel.com
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2004/12/28 13:15:44-08:00 tony.luck@intel.com
-# [IA64] irq_ia64.c typo s/_IA64_REG_AR_SP/_IA64_REG_SP/
-#
-# Patch supplied by Sourav Sen from HP:
-# If I turn on IRQ_DEBUG in arch/ia64/kernel/irq_ia64.c in 2.6.8.1,
-# the compilation does not go thru as there isn't any _IA64_REG_AR_SP
-#
-# Signed-off-by: Tony Luck <tony.luck@intel.com>
-#
-# arch/ia64/kernel/irq_ia64.c
-# 2004/12/28 13:12:43-08:00 tony.luck@intel.com +1 -1
-# typo s/_IA64_REG_AR_SP/_IA64_REG_SP/
-#
-diff -Nru a/arch/ia64/kernel/irq_ia64.c b/arch/ia64/kernel/irq_ia64.c
---- a/arch/ia64/kernel/irq_ia64.c 2005-01-22 21:48:10 -08:00
-+++ b/arch/ia64/kernel/irq_ia64.c 2005-01-22 21:48:10 -08:00
-@@ -115,7 +115,7 @@
- * switched atomically.
- */
- bsp = ia64_getreg(_IA64_REG_AR_BSP);
-- sp = ia64_getreg(_IA64_REG_AR_SP);
-+ sp = ia64_getreg(_IA64_REG_SP);
-
- if ((sp - bsp) < 1024) {
- static unsigned char count;
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/086-i386_cpufreq_powernow_k8_acpi_error.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/086-i386_cpufreq_powernow_k8_acpi_error.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/086-i386_cpufreq_powernow_k8_acpi_error.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,52 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [CPUFREQ] powernow-k8: unregister from ACPI perflib in error path
-## DP: Patch author: davej@redhat.com
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2004/12/29 02:41:40-05:00 davej@redhat.com
-# [CPUFREQ] powernow-k8: unregister from ACPI perflib in error path
-#
-# If something fails in the per-CPU initialization in powernow-k8, it should
-# unregister itself from the ACPI performance library.
-#
-# Signed-off-by: Dominik Brodowski <linux@brodo.de>
-# Signed-off-by: Dave Jones <davej@redhat.com>
-#
-# arch/i386/kernel/cpu/cpufreq/powernow-k8.c
-# 2004/12/29 02:41:24-05:00 davej@redhat.com +2 -0
-# [CPUFREQ] powernow-k8: unregister from ACPI perflib in error path
-#
-# If something fails in the per-CPU initialization in powernow-k8, it should
-# unregister itself from the ACPI performance library.
-#
-# Signed-off-by: Dominik Brodowski <linux@brodo.de>
-# Signed-off-by: Dave Jones <davej@redhat.com>
-#
-diff -Nru a/arch/i386/kernel/cpu/cpufreq/powernow-k8.c b/arch/i386/kernel/cpu/cpufreq/powernow-k8.c
---- a/arch/i386/kernel/cpu/cpufreq/powernow-k8.c 2005-01-22 22:03:03 -08:00
-+++ b/arch/i386/kernel/cpu/cpufreq/powernow-k8.c 2005-01-22 22:03:03 -08:00
-@@ -1010,6 +1010,7 @@
- /* min/max the cpu is capable of */
- if (cpufreq_frequency_table_cpuinfo(pol, data->powernow_table)) {
- printk(KERN_ERR PFX "invalid powernow_table\n");
-+ powernow_k8_cpu_exit_acpi(data);
- kfree(data->powernow_table);
- kfree(data);
- return -EINVAL;
-@@ -1027,6 +1028,7 @@
- err_out:
- set_cpus_allowed(current, oldmask);
- schedule();
-+ powernow_k8_cpu_exit_acpi(data);
-
- kfree(data);
- return -ENODEV;
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/087-ext3_graceful_corruption_fixes.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/087-ext3_graceful_corruption_fixes.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/087-ext3_graceful_corruption_fixes.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,191 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [PATCH] ext3: handle attempted delete of bitmap blocks.
-## DP: Patch author: sct@redhat.com
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/04 21:27:36-08:00 sct@redhat.com
-# [PATCH] ext3: handle attempted delete of bitmap blocks.
-#
-# This patch improves ext3's ability to deal with corruption on-disk. If we
-# ever get a corrupt inode or indirect block, then an attempt to delete it
-# can end up trying to remove any block on the fs, including bitmap blocks.
-# This can cause ext3 to assert-fail as we end up trying to do an ext3_forget
-# on a buffer with b_committed_data set.
-#
-# The fix is to downgrade this to an IO error and journal abort, so that we
-# take the filesystem readonly but don't bring down the whole kernel.
-#
-# Make J_EXPECT_JH() return a value so it can be easily tested and yet still
-# retained as an assert failure if we build ext3 with full internal debugging
-# enabled. Make journal_forget() return an error code so that in this case
-# the error can be passed up to the caller.
-#
-# This is easily reproduced with a sample ext3 fs image containing an inode
-# whose direct and indirect blocks refer to a block bitmap block. Allocating
-# new blocks and then deleting that inode will BUG() with:
-#
-# Assertion failure in journal_forget() at fs/jbd/transaction.c:1228:
-# "!jh->b_committed_data"
-#
-# With the fix, ext3 recovers gracefully.
-#
-# Signed-off-by: Stephen Tweedie <sct@redhat.com>
-# Signed-off-by: Andrew Morton <akpm@osdl.org>
-# Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-#
-# fs/ext3/inode.c
-# 2005/01/04 20:24:31-08:00 sct@redhat.com +1 -1
-# ext3: handle attempted delete of bitmap blocks.
-#
-# fs/jbd/transaction.c
-# 2005/01/04 18:48:12-08:00 sct@redhat.com +12 -4
-# ext3: handle attempted delete of bitmap blocks.
-#
-# include/linux/ext3_jbd.h
-# 2005/01/04 18:48:12-08:00 sct@redhat.com +8 -3
-# ext3: handle attempted delete of bitmap blocks.
-#
-# include/linux/jbd.h
-# 2005/01/04 18:48:12-08:00 sct@redhat.com +7 -5
-# ext3: handle attempted delete of bitmap blocks.
-#
-diff -Nru a/fs/ext3/inode.c b/fs/ext3/inode.c
---- a/fs/ext3/inode.c 2005-01-22 22:56:19 -08:00
-+++ b/fs/ext3/inode.c 2005-01-22 22:56:19 -08:00
-@@ -84,7 +84,7 @@
- (!is_metadata && !ext3_should_journal_data(inode))) {
- if (bh) {
- BUFFER_TRACE(bh, "call journal_forget");
-- ext3_journal_forget(handle, bh);
-+ return ext3_journal_forget(handle, bh);
- }
- return 0;
- }
-diff -Nru a/fs/jbd/transaction.c b/fs/jbd/transaction.c
---- a/fs/jbd/transaction.c 2005-01-22 22:56:19 -08:00
-+++ b/fs/jbd/transaction.c 2005-01-22 22:56:19 -08:00
-@@ -1198,11 +1198,12 @@
- * Allow this call even if the handle has aborted --- it may be part of
- * the caller's cleanup after an abort.
- */
--void journal_forget(handle_t *handle, struct buffer_head *bh)
-+int journal_forget (handle_t *handle, struct buffer_head *bh)
- {
- transaction_t *transaction = handle->h_transaction;
- journal_t *journal = transaction->t_journal;
- struct journal_head *jh;
-+ int err = 0;
-
- BUFFER_TRACE(bh, "entry");
-
-@@ -1213,6 +1214,14 @@
- goto not_jbd;
- jh = bh2jh(bh);
-
-+ /* Critical error: attempting to delete a bitmap buffer, maybe?
-+ * Don't do any jbd operations, and return an error. */
-+ if (!J_EXPECT_JH(jh, !jh->b_committed_data,
-+ "inconsistent data on disk")) {
-+ err = -EIO;
-+ goto not_jbd;
-+ }
-+
- if (jh->b_transaction == handle->h_transaction) {
- J_ASSERT_JH(jh, !jh->b_frozen_data);
-
-@@ -1223,7 +1232,6 @@
- clear_buffer_jbddirty(bh);
-
- JBUFFER_TRACE(jh, "belongs to current transaction: unfile");
-- J_ASSERT_JH(jh, !jh->b_committed_data);
-
- __journal_unfile_buffer(jh);
-
-@@ -1248,7 +1256,7 @@
- spin_unlock(&journal->j_list_lock);
- jbd_unlock_bh_state(bh);
- __bforget(bh);
-- return;
-+ return 0;
- }
- }
- } else if (jh->b_transaction) {
-@@ -1270,7 +1278,7 @@
- spin_unlock(&journal->j_list_lock);
- jbd_unlock_bh_state(bh);
- __brelse(bh);
-- return;
-+ return err;
- }
-
- /**
-diff -Nru a/include/linux/ext3_jbd.h b/include/linux/ext3_jbd.h
---- a/include/linux/ext3_jbd.h 2005-01-22 22:56:19 -08:00
-+++ b/include/linux/ext3_jbd.h 2005-01-22 22:56:19 -08:00
-@@ -138,10 +138,13 @@
- journal_release_buffer(handle, bh, credits);
- }
-
--static inline void
--ext3_journal_forget(handle_t *handle, struct buffer_head *bh)
-+static inline int
-+__ext3_journal_forget(const char *where, handle_t *handle, struct buffer_head *bh)
- {
-- journal_forget(handle, bh);
-+ int err = journal_forget(handle, bh);
-+ if (err)
-+ ext3_journal_abort_handle(where, __FUNCTION__, bh, handle,err);
-+ return err;
- }
-
- static inline int
-@@ -187,6 +190,8 @@
- __ext3_journal_get_create_access(__FUNCTION__, (handle), (bh))
- #define ext3_journal_dirty_metadata(handle, bh) \
- __ext3_journal_dirty_metadata(__FUNCTION__, (handle), (bh))
-+#define ext3_journal_forget(handle, bh) \
-+ __ext3_journal_forget(__FUNCTION__, (handle), (bh))
-
- int ext3_journal_dirty_data(handle_t *handle, struct buffer_head *bh);
-
-diff -Nru a/include/linux/jbd.h b/include/linux/jbd.h
---- a/include/linux/jbd.h 2005-01-22 22:56:19 -08:00
-+++ b/include/linux/jbd.h 2005-01-22 22:56:19 -08:00
-@@ -277,13 +277,15 @@
- #define J_EXPECT_JH(jh, expr, why...) J_ASSERT_JH(jh, expr)
- #else
- #define __journal_expect(expr, why...) \
-- do { \
-- if (!(expr)) { \
-+ ({ \
-+ int val = (expr); \
-+ if (!val) { \
- printk(KERN_ERR \
- "EXT3-fs unexpected failure: %s;\n",# expr); \
-- printk(KERN_ERR why); \
-+ printk(KERN_ERR why "\n"); \
- } \
-- } while (0)
-+ val; \
-+ })
- #define J_EXPECT(expr, why...) __journal_expect(expr, ## why)
- #define J_EXPECT_BH(bh, expr, why...) __journal_expect(expr, ## why)
- #define J_EXPECT_JH(jh, expr, why...) __journal_expect(expr, ## why)
-@@ -874,7 +876,7 @@
- extern int journal_dirty_metadata (handle_t *, struct buffer_head *);
- extern void journal_release_buffer (handle_t *, struct buffer_head *,
- int credits);
--extern void journal_forget (handle_t *, struct buffer_head *);
-+extern int journal_forget (handle_t *, struct buffer_head *);
- extern void journal_sync_buffer (struct buffer_head *);
- extern int journal_invalidatepage(journal_t *,
- struct page *, unsigned long);
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/alpha-io-typo.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/alpha-io-typo.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/alpha-io-typo.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,48 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [PATCH] drivers/acpi/ibm_acpi.o .init.text refers to .exit.text
-## DP: Patch author: Richard Henderson <rth@twiddle.net>
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/12 08:48:35-08:00 ink@jurassic.park.msu.ru
-# [PATCH] Alpha: typos in io_trivial.h
-#
-# This apparently explains some weird IO failures reported in last two months.
-# Only non-bwx (including generic) kernels were affected.
-#
-# Acked-by: Richard Henderson <rth@twiddle.net>
-# Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-#
-# include/asm-alpha/io_trivial.h
-# 2005/01/11 17:47:26-08:00 ink@jurassic.park.msu.ru +2 -2
-# Alpha: typos in io_trivial.h
-#
-diff -Nru a/include/asm-alpha/io_trivial.h b/include/asm-alpha/io_trivial.h
---- a/include/asm-alpha/io_trivial.h 2005-01-12 10:55:52 -08:00
-+++ b/include/asm-alpha/io_trivial.h 2005-01-12 10:55:52 -08:00
-@@ -26,7 +26,7 @@
- __EXTERN_INLINE void
- IO_CONCAT(__IO_PREFIX,iowrite16)(u16 b, void __iomem *a)
- {
-- __kernel_stb(b, *(volatile u16 __force *)a);
-+ __kernel_stw(b, *(volatile u16 __force *)a);
- }
- #endif
-
-@@ -66,7 +66,7 @@
- __EXTERN_INLINE void
- IO_CONCAT(__IO_PREFIX,writew)(u16 b, volatile void __iomem *a)
- {
-- __kernel_stb(b, *(volatile u16 __force *)a);
-+ __kernel_stw(b, *(volatile u16 __force *)a);
- }
- #elif IO_CONCAT(__IO_PREFIX,trivial_rw_bw) == 2
- __EXTERN_INLINE u8
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/ia64-ptrace-fixes.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/ia64-ptrace-fixes.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/ia64-ptrace-fixes.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,252 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [IA64] clean up ptrace corner cases
-## DP: Patch author: tony.luck@intel.com
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/22 14:21:34-08:00 tony.luck@intel.com
-# [IA64] clean up ptrace corner cases
-#
-# Patch from yanmin.zhang@intel.com to fix up some corner cases
-# in ptrace. Many thanks to davidm for reviewing and improving.
-#
-# Signed-off-by: Tony Luck <tony.luck@intel.com>
-#
-# arch/ia64/kernel/entry.S
-# 2005/01/22 14:18:28-08:00 tony.luck@intel.com +19 -7
-# clean up ptrace corner cases
-#
-# arch/ia64/kernel/fsys.S
-# 2005/01/22 14:19:11-08:00 tony.luck@intel.com +3 -2
-# clean up ptrace corner cases
-#
-# arch/ia64/kernel/gate.S
-# 2005/01/22 14:19:18-08:00 tony.luck@intel.com +3 -1
-# clean up ptrace corner cases
-#
-# arch/ia64/kernel/ivt.S
-# 2005/01/22 14:19:19-08:00 tony.luck@intel.com +20 -5
-# clean up ptrace corner cases
-#
-# arch/ia64/kernel/process.c
-# 2005/01/22 14:19:21-08:00 tony.luck@intel.com +1 -1
-# clean up ptrace corner cases
-#
-# include/asm-ia64/unistd.h
-# 2005/01/22 14:19:22-08:00 tony.luck@intel.com +1 -1
-# clean up ptrace corner cases
-#
-diff -Nru a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S
---- a/arch/ia64/kernel/entry.S 2005-01-25 21:43:25 -08:00
-+++ b/arch/ia64/kernel/entry.S 2005-01-25 21:43:25 -08:00
-@@ -51,8 +51,11 @@
- * setup a null register window frame.
- */
- ENTRY(ia64_execve)
-- .prologue ASM_UNW_PRLG_RP|ASM_UNW_PRLG_PFS, ASM_UNW_PRLG_GRSAVE(3)
-- alloc loc1=ar.pfs,3,2,4,0
-+ /*
-+ * Allocate 8 input registers since ptrace() may clobber them
-+ */
-+ .prologue ASM_UNW_PRLG_RP|ASM_UNW_PRLG_PFS, ASM_UNW_PRLG_GRSAVE(8)
-+ alloc loc1=ar.pfs,8,2,4,0
- mov loc0=rp
- .body
- mov out0=in0 // filename
-@@ -113,8 +116,11 @@
- * u64 tls)
- */
- GLOBAL_ENTRY(sys_clone2)
-- .prologue ASM_UNW_PRLG_RP|ASM_UNW_PRLG_PFS, ASM_UNW_PRLG_GRSAVE(6)
-- alloc r16=ar.pfs,6,2,6,0
-+ /*
-+ * Allocate 8 input registers since ptrace() may clobber them
-+ */
-+ .prologue ASM_UNW_PRLG_RP|ASM_UNW_PRLG_PFS, ASM_UNW_PRLG_GRSAVE(8)
-+ alloc r16=ar.pfs,8,2,6,0
- DO_SAVE_SWITCH_STACK
- adds r2=PT(R16)+IA64_SWITCH_STACK_SIZE+16,sp
- mov loc0=rp
-@@ -142,8 +148,11 @@
- * Deprecated. Use sys_clone2() instead.
- */
- GLOBAL_ENTRY(sys_clone)
-- .prologue ASM_UNW_PRLG_RP|ASM_UNW_PRLG_PFS, ASM_UNW_PRLG_GRSAVE(5)
-- alloc r16=ar.pfs,5,2,6,0
-+ /*
-+ * Allocate 8 input registers since ptrace() may clobber them
-+ */
-+ .prologue ASM_UNW_PRLG_RP|ASM_UNW_PRLG_PFS, ASM_UNW_PRLG_GRSAVE(8)
-+ alloc r16=ar.pfs,8,2,6,0
- DO_SAVE_SWITCH_STACK
- adds r2=PT(R16)+IA64_SWITCH_STACK_SIZE+16,sp
- mov loc0=rp
-@@ -1212,7 +1221,10 @@
-
- ENTRY(sys_rt_sigreturn)
- PT_REGS_UNWIND_INFO(0)
-- alloc r2=ar.pfs,0,0,1,0
-+ /*
-+ * Allocate 8 input registers since ptrace() may clobber them
-+ */
-+ alloc r2=ar.pfs,8,0,1,0
- .prologue
- PT_REGS_SAVES(16)
- adds sp=-16,sp
-diff -Nru a/arch/ia64/kernel/fsys.S b/arch/ia64/kernel/fsys.S
---- a/arch/ia64/kernel/fsys.S 2005-01-25 21:43:25 -08:00
-+++ b/arch/ia64/kernel/fsys.S 2005-01-25 21:43:25 -08:00
-@@ -612,8 +612,9 @@
- ;;
- mov rp=r2 // set the real return addr
- tbit.z p8,p0=r3,TIF_SYSCALL_TRACE
--
--(p8) br.call.sptk.many b6=b6 // ignore this return addr
-+ ;;
-+(p10) br.cond.spnt.many ia64_ret_from_syscall // p10==true means out registers are more than 8
-+(p8) br.call.sptk.many b6=b6 // ignore this return addr
- br.cond.sptk ia64_trace_syscall
- END(fsys_bubble_down)
-
-diff -Nru a/arch/ia64/kernel/gate.S b/arch/ia64/kernel/gate.S
---- a/arch/ia64/kernel/gate.S 2005-01-25 21:43:25 -08:00
-+++ b/arch/ia64/kernel/gate.S 2005-01-25 21:43:25 -08:00
-@@ -81,6 +81,7 @@
- LOAD_FSYSCALL_TABLE(r14)
-
- mov r16=IA64_KR(CURRENT) // 12 cycle read latency
-+ tnat.nz p10,p9=r15
- mov r19=NR_syscalls-1
- ;;
- shladd r18=r17,3,r14
-@@ -119,7 +120,8 @@
- #endif
-
- mov r10=-1
-- mov r8=ENOSYS
-+(p10) mov r8=EINVAL
-+(p9) mov r8=ENOSYS
- FSYS_RETURN
- END(__kernel_syscall_via_epc)
-
-diff -Nru a/arch/ia64/kernel/ivt.S b/arch/ia64/kernel/ivt.S
---- a/arch/ia64/kernel/ivt.S 2005-01-25 21:43:25 -08:00
-+++ b/arch/ia64/kernel/ivt.S 2005-01-25 21:43:25 -08:00
-@@ -51,6 +51,7 @@
- #include <asm/system.h>
- #include <asm/thread_info.h>
- #include <asm/unistd.h>
-+#include <asm/errno.h>
-
- #if 1
- # define PSR_DEFAULT_BITS psr.ac
-@@ -732,10 +733,12 @@
- ssm psr.ic | PSR_DEFAULT_BITS
- ;;
- srlz.i // guarantee that interruption collection is on
-+ mov r3=NR_syscalls - 1
- ;;
- (p15) ssm psr.i // restore psr.i
-+ // p10==true means out registers are more than 8 or r15's Nat is true
-+(p10) br.cond.spnt.many ia64_ret_from_syscall
- ;;
-- mov r3=NR_syscalls - 1
- movl r16=sys_call_table
-
- adds r15=-1024,r15 // r15 contains the syscall number---subtract 1024
-@@ -836,8 +839,11 @@
- * On exit:
- * - executing on bank 1 registers
- * - psr.ic enabled, interrupts restored
-+ * - p10: TRUE if syscall is invoked with more than 8 out
-+ * registers or r15's Nat is true
- * - r1: kernel's gp
- * - r3: preserved (same as on entry)
-+ * - r8: -EINVAL if p10 is true
- * - r12: points to kernel stack
- * - r13: points to current task
- * - p15: TRUE if interrupts need to be re-enabled
-@@ -871,12 +877,17 @@
- ;;
-
- st8 [r16]=r19,PT(AR_RNAT)-PT(CR_IFS) // store ar.pfs.pfm in cr.ifs
-+ extr.u r11=r19,7,7 // I0 // get sol of ar.pfs
-+ and r8=0x7f,r19 // A // get sof of ar.pfs
-+
- st8 [r17]=r27,PT(AR_BSPSTORE)-PT(AR_RSC)// save ar.rsc
-+ tbit.nz p15,p0=r29,IA64_PSR_I_BIT // I0
- (p9) mov in1=-1
-+ ;;
-
- (pUStk) sub r18=r18,r22 // r18=RSE.ndirty*8
-- tbit.nz p15,p0=r29,IA64_PSR_I_BIT
- tnat.nz p10,p0=in2
-+ add r11=8,r11
- ;;
- (pKStk) adds r16=PT(PR)-PT(AR_RNAT),r16 // skip over ar_rnat field
- (pKStk) adds r17=PT(B0)-PT(AR_BSPSTORE),r17 // skip over ar_bspstore field
-@@ -904,25 +915,29 @@
- (p13) mov in5=-1
- ;;
- st8 [r16]=r21,PT(R8)-PT(AR_FPSR) // save ar.fpsr
-- st8.spill [r17]=r15 // save r15
- tnat.nz p14,p0=in6
-+ cmp.lt p10,p9=r11,r8 // frame size can't be more than local+8
- ;;
- stf8 [r16]=f1 // ensure pt_regs.r8 != 0 (see handle_syscall_error)
-+(p9) tnat.nz p10,p0=r15
- adds r12=-16,r1 // switch to kernel memory stack (with 16 bytes of scratch)
-+
-+ st8.spill [r17]=r15 // save r15
- tnat.nz p8,p0=in7
-+ nop.i 0
-
- mov r13=r2 // establish `current'
- movl r1=__gp // establish kernel global pointer
- ;;
- (p14) mov in6=-1
- (p8) mov in7=-1
-- tnat.nz p9,p0=r15
-+ nop.i 0
-
- cmp.eq pSys,pNonSys=r0,r0 // set pSys=1, pNonSys=0
- movl r17=FPSR_DEFAULT
- ;;
- mov.m ar.fpsr=r17 // set ar.fpsr to kernel default value
--(p9) mov r15=-1
-+(p10) mov r8=-EINVAL
- br.ret.sptk.many b7
- END(ia64_syscall_setup)
-
-diff -Nru a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c
---- a/arch/ia64/kernel/process.c 2005-01-25 21:43:25 -08:00
-+++ b/arch/ia64/kernel/process.c 2005-01-25 21:43:25 -08:00
-@@ -632,7 +632,7 @@
- return 1; /* f0-f31 are always valid so we always return 1 */
- }
-
--asmlinkage long
-+long
- sys_execve (char __user *filename, char __user * __user *argv, char __user * __user *envp,
- struct pt_regs *regs)
- {
-diff -Nru a/include/asm-ia64/unistd.h b/include/asm-ia64/unistd.h
---- a/include/asm-ia64/unistd.h 2005-01-25 21:43:25 -08:00
-+++ b/include/asm-ia64/unistd.h 2005-01-25 21:43:25 -08:00
-@@ -374,7 +374,7 @@
- int fd, long pgoff);
- struct pt_regs;
- struct sigaction;
--asmlinkage long sys_execve(char __user *filename, char __user * __user *argv,
-+long sys_execve(char __user *filename, char __user * __user *argv,
- char __user * __user *envp, struct pt_regs *regs);
- asmlinkage long sys_pipe(long arg0, long arg1, long arg2, long arg3,
- long arg4, long arg5, long arg6, long arg7, long stack);
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/ia64-unwind-fix.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/ia64-unwind-fix.dpatch 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/ia64-unwind-fix.dpatch 2005-03-04 09:59:48 UTC (rev 2595)
@@ -1,46 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [IA64] Sanity check unw_unwind_to_user
-## DP: Patch author: kaos@sgi.com
-## DP: Upstream status: backported
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/22 12:59:23-08:00 kaos@sgi.com
-# [IA64] Sanity check unw_unwind_to_user
-#
-# Signed-off-by: Keith Owens <kaos@sgi.com>
-# Signed-off-by: Tony Luck <tony.luck@intel.com>
-#
-# arch/ia64/kernel/unwind.c
-# 2005/01/22 12:57:36-08:00 kaos@sgi.com +4 -1
-# Sanity check unw_unwind_to_user
-#
-diff -Nru a/arch/ia64/kernel/unwind.c b/arch/ia64/kernel/unwind.c
---- a/arch/ia64/kernel/unwind.c 2005-01-25 22:08:49 -08:00
-+++ b/arch/ia64/kernel/unwind.c 2005-01-25 22:08:49 -08:00
-@@ -1945,7 +1945,7 @@
- int
- unw_unwind_to_user (struct unw_frame_info *info)
- {
-- unsigned long ip;
-+ unsigned long ip, sp;
-
- while (unw_unwind(info) >= 0) {
- if (unw_get_rp(info, &ip) < 0) {
-@@ -1954,6 +1954,9 @@
- __FUNCTION__, ip);
- return -1;
- }
-+ unw_get_sp(info, &sp);
-+ if (sp >= (unsigned long)info->task + IA64_STK_OFFSET)
-+ break;
- if (ip < FIXADDR_USER_END)
- return 0;
- }
Added: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-1
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-1 2005-03-04 09:48:09 UTC (rev 2594)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-1 2005-03-04 09:59:48 UTC (rev 2595)
@@ -0,0 +1,72 @@
+X drivers/net/acenic_firmware.h
+X drivers/net/dgrs_firmware.c
+X drivers/net/tg3.c
+X drivers/net/tokenring/smctr_firmware.h
+X drivers/scsi/qla2xxx/ql2100_fw.c
+X drivers/scsi/qla2xxx/ql2200_fw.c
+X drivers/scsi/qla2xxx/ql2300_fw.c
+X drivers/scsi/qla2xxx/ql2322_fw.c
+X drivers/scsi/qla2xxx/ql6312_fw.c
+X drivers/scsi/qla2xxx/ql6322_fw.c
+X drivers/usb/media/dabfirmware.h
+X drivers/usb/misc/emi62_fw_m.h
+X drivers/usb/misc/emi62_fw_s.h
+X drivers/usb/serial/keyspan_mpr_fw.h
+X drivers/usb/serial/keyspan_usa18x_fw.h
+X drivers/usb/serial/keyspan_usa19_fw.h
+X drivers/usb/serial/keyspan_usa19qi_fw.h
+X drivers/usb/serial/keyspan_usa19qw_fw.h
+X drivers/usb/serial/keyspan_usa19w_fw.h
+X drivers/usb/serial/keyspan_usa28_fw.h
+X drivers/usb/serial/keyspan_usa28x_fw.h
+X drivers/usb/serial/keyspan_usa28xa_fw.h
+X drivers/usb/serial/keyspan_usa28xb_fw.h
+X drivers/usb/serial/keyspan_usa49w_fw.h
+X drivers/usb/serial/keyspan_usa49wlc_fw.h
++ doc-post_halloween.dpatch
++ drivers-ide-dma-blacklist-toshiba.dpatch
++ drivers-net-8139too-locking.dpatch
++ drivers-net-tg3-readd.dpatch
++ drivers-scsi_changer.dpatch
++ fs-asfs.dpatch
++ modular-ide-pnp.dpatch
++ remove-references-to-removed-drivers.dpatch
++ x86-i486_emu.dpatch
++ powerpc-g4-l2-flush-errata.dpatch
++ sparc64-hme-lockup.dpatch
++ tty-locking-fixes9.dpatch
++ sparc32-initrd-memcpy.dpatch
++ drm-locking-fixes.dpatch
++ powerpc-serial.dpatch
++ ia64-generic-no-smp.dpatch
++ ia64-generic-no-smp-1-to-2.dpatch
++ 029-random_poolsize_overflow.dpatch
++ 030-moxa_user_copy_checking.dpatch
++ ia64-bte_error-missing-include.dpatch
++ ia64-irq-affinity-upfix.dpatch
++ smbfs-overflow-fixes.dpatch
++ modular-ide.dpatch
++ drivers-ide-__devinit.dpatch
++ fix-mxser-compile.dpatch
++ fix-alpha-ext3-oops.dpatch
++ alsa-emu10k1-ioctl-fix.dpatch
++ modular-vesafb.dpatch
++ cmsg-compat-signedness-fix-fix.dpatch
++ scsi-ioctl.dpatch
++ amd64-ia32-vsyscall-fix.dpatch
++ powerpc-fix-power3-ftbfs.dpatch
++ amd64-parse-noexec-fix.dpatch
++ amd64-int3-fix.dpatch
++ fbdev-radeon-noaccel.dpatch
++ atyfb-sparc.dpatch
++ skb-reset-ip_summed.dpatch
++ sparc64-nis-killer.dpatch
++ sparc32-hypersparc-srmmu.dpatch
++ setsid-race.dpatch
++ setsid-race-2.dpatch
++ ipv4-fragment-queues.dpatch
++ ipv4-fragment-queues-2.dpatch
++ nls-table-overflow.dpatch
++ amd64-noexec32-backport.dpatch
++ outs.dpatch
++ sparc64-sb1500-clock-2.6.dpatch