From: Chris Wright Date: Tue, 20 Jun 2006 10:26:24 +0000 (-0700) Subject: refresh queue against 2.6.16.21 X-Git-Tag: v2.6.16.22~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=06b431450de0987e64d52b05cb433cac0a5ecb69;p=thirdparty%2Fkernel%2Fstable-queue.git refresh queue against 2.6.16.21 --- diff --git a/queue-2.6.16/fs-namei.c-call-to-file_permission-under-a-spinlock-in-do_lookup_path.patch b/queue-2.6.16/fs-namei.c-call-to-file_permission-under-a-spinlock-in-do_lookup_path.patch index 936b88c621f..8605484b6c6 100644 --- a/queue-2.6.16/fs-namei.c-call-to-file_permission-under-a-spinlock-in-do_lookup_path.patch +++ b/queue-2.6.16/fs-namei.c-call-to-file_permission-under-a-spinlock-in-do_lookup_path.patch @@ -27,8 +27,8 @@ Signed-off-by: Greg Kroah-Hartman fs/namei.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) ---- linux-2.6.16.20.orig/fs/namei.c -+++ linux-2.6.16.20/fs/namei.c +--- linux-2.6.16.21.orig/fs/namei.c ++++ linux-2.6.16.21/fs/namei.c @@ -1077,8 +1077,8 @@ static int fastcall do_path_lookup(int d nd->flags = flags; nd->depth = 0; diff --git a/queue-2.6.16/i2o-bugfixes-to-get-i2o-working-again.patch b/queue-2.6.16/i2o-bugfixes-to-get-i2o-working-again.patch index 2fc56d05830..0c5654616d7 100644 --- a/queue-2.6.16/i2o-bugfixes-to-get-i2o-working-again.patch +++ b/queue-2.6.16/i2o-bugfixes-to-get-i2o-working-again.patch @@ -34,8 +34,8 @@ Signed-off-by: Greg Kroah-Hartman include/linux/i2o.h | 5 ++ 3 files changed, 42 insertions(+), 39 deletions(-) ---- linux-2.6.16.20.orig/drivers/message/i2o/exec-osm.c -+++ linux-2.6.16.20/drivers/message/i2o/exec-osm.c +--- linux-2.6.16.21.orig/drivers/message/i2o/exec-osm.c ++++ linux-2.6.16.21/drivers/message/i2o/exec-osm.c @@ -55,6 +55,7 @@ struct i2o_exec_wait { u32 m; /* message id */ struct i2o_message *msg; /* pointer to the reply message */ @@ -212,8 +212,8 @@ Signed-off-by: Greg Kroah-Hartman return 0; }; ---- linux-2.6.16.20.orig/drivers/message/i2o/iop.c -+++ linux-2.6.16.20/drivers/message/i2o/iop.c +--- linux-2.6.16.21.orig/drivers/message/i2o/iop.c ++++ linux-2.6.16.21/drivers/message/i2o/iop.c @@ -804,8 +804,6 @@ void i2o_iop_remove(struct i2o_controlle /* Ask the IOP to switch to RESET state */ @@ -232,8 +232,8 @@ Signed-off-by: Greg Kroah-Hartman I2O_MSG_INPOOL_MIN)) { kfree(c); return ERR_PTR(-ENOMEM); ---- linux-2.6.16.20.orig/include/linux/i2o.h -+++ linux-2.6.16.20/include/linux/i2o.h +--- linux-2.6.16.21.orig/include/linux/i2o.h ++++ linux-2.6.16.21/include/linux/i2o.h @@ -1116,8 +1116,11 @@ static inline struct i2o_message *i2o_ms mmsg->mfa = readl(c->in_port); diff --git a/queue-2.6.16/jfs-fix-multiple-errors-in-metapage_releasepage.patch b/queue-2.6.16/jfs-fix-multiple-errors-in-metapage_releasepage.patch index 1b4e258de05..9730ff167cf 100644 --- a/queue-2.6.16/jfs-fix-multiple-errors-in-metapage_releasepage.patch +++ b/queue-2.6.16/jfs-fix-multiple-errors-in-metapage_releasepage.patch @@ -27,8 +27,8 @@ Signed-off-by: Greg Kroah-Hartman fs/jfs/jfs_metapage.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) ---- linux-2.6.16.20.orig/fs/jfs/jfs_metapage.c -+++ linux-2.6.16.20/fs/jfs/jfs_metapage.c +--- linux-2.6.16.21.orig/fs/jfs/jfs_metapage.c ++++ linux-2.6.16.21/fs/jfs/jfs_metapage.c @@ -543,7 +543,7 @@ add_failed: static int metapage_releasepage(struct page *page, gfp_t gfp_mask) { diff --git a/queue-2.6.16/missed-error-checking-for-intent-s-filp-in-open_namei.patch b/queue-2.6.16/missed-error-checking-for-intent-s-filp-in-open_namei.patch index e84eeb71078..304b0def529 100644 --- a/queue-2.6.16/missed-error-checking-for-intent-s-filp-in-open_namei.patch +++ b/queue-2.6.16/missed-error-checking-for-intent-s-filp-in-open_namei.patch @@ -36,8 +36,8 @@ Signed-off-by: Greg Kroah-Hartman fs/namei.c | 6 ++++++ 1 file changed, 6 insertions(+) ---- linux-2.6.16.20.orig/fs/namei.c -+++ linux-2.6.16.20/fs/namei.c +--- linux-2.6.16.21.orig/fs/namei.c ++++ linux-2.6.16.21/fs/namei.c @@ -1628,6 +1628,12 @@ do_last: goto exit; } diff --git a/queue-2.6.16/powernow-k8-crash-workaround.patch b/queue-2.6.16/powernow-k8-crash-workaround.patch index b45650a0ae6..27c3b3b570e 100644 --- a/queue-2.6.16/powernow-k8-crash-workaround.patch +++ b/queue-2.6.16/powernow-k8-crash-workaround.patch @@ -24,8 +24,8 @@ Signed-off-by: Greg Kroah-Hartman drivers/acpi/processor_perflib.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---- linux-2.6.16.20.orig/drivers/acpi/processor_perflib.c -+++ linux-2.6.16.20/drivers/acpi/processor_perflib.c +--- linux-2.6.16.21.orig/drivers/acpi/processor_perflib.c ++++ linux-2.6.16.21/drivers/acpi/processor_perflib.c @@ -577,6 +577,8 @@ acpi_processor_register_performance(stru return_VALUE(-EBUSY); } diff --git a/queue-2.6.16/scsi_lib.c-properly-count-the-number-of-pages-in-scsi_req_map_sg.patch b/queue-2.6.16/scsi_lib.c-properly-count-the-number-of-pages-in-scsi_req_map_sg.patch index af0a46dff27..f773cd1afc5 100644 --- a/queue-2.6.16/scsi_lib.c-properly-count-the-number-of-pages-in-scsi_req_map_sg.patch +++ b/queue-2.6.16/scsi_lib.c-properly-count-the-number-of-pages-in-scsi_req_map_sg.patch @@ -20,8 +20,8 @@ Signed-off-by: Greg Kroah-Hartman drivers/scsi/scsi_lib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---- linux-2.6.16.20.orig/drivers/scsi/scsi_lib.c -+++ linux-2.6.16.20/drivers/scsi/scsi_lib.c +--- linux-2.6.16.21.orig/drivers/scsi/scsi_lib.c ++++ linux-2.6.16.21/drivers/scsi/scsi_lib.c @@ -368,7 +368,7 @@ static int scsi_req_map_sg(struct reques int nsegs, unsigned bufflen, gfp_t gfp) { diff --git a/queue-2.6.16/serial-parport_serial-should-depend-on-serial_8250_pci.patch b/queue-2.6.16/serial-parport_serial-should-depend-on-serial_8250_pci.patch index 802c87ff1ec..6e0e86a566d 100644 --- a/queue-2.6.16/serial-parport_serial-should-depend-on-serial_8250_pci.patch +++ b/queue-2.6.16/serial-parport_serial-should-depend-on-serial_8250_pci.patch @@ -15,8 +15,8 @@ Signed-off-by: Greg Kroah-Hartman drivers/parport/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---- linux-2.6.16.20.orig/drivers/parport/Kconfig -+++ linux-2.6.16.20/drivers/parport/Kconfig +--- linux-2.6.16.21.orig/drivers/parport/Kconfig ++++ linux-2.6.16.21/drivers/parport/Kconfig @@ -48,7 +48,7 @@ config PARPORT_PC config PARPORT_SERIAL diff --git a/queue-2.6.16/sparc64-fix-d-cache-corruption-in-mremap.patch b/queue-2.6.16/sparc64-fix-d-cache-corruption-in-mremap.patch index 4736c325b4e..d18338640b8 100644 --- a/queue-2.6.16/sparc64-fix-d-cache-corruption-in-mremap.patch +++ b/queue-2.6.16/sparc64-fix-d-cache-corruption-in-mremap.patch @@ -27,8 +27,8 @@ Signed-off-by: Greg Kroah-Hartman include/asm-sparc64/pgtable.h | 17 +++++++++++++++++ 3 files changed, 27 insertions(+), 11 deletions(-) ---- linux-2.6.16.20.orig/include/asm-generic/pgtable.h -+++ linux-2.6.16.20/include/asm-generic/pgtable.h +--- linux-2.6.16.21.orig/include/asm-generic/pgtable.h ++++ linux-2.6.16.21/include/asm-generic/pgtable.h @@ -159,17 +159,8 @@ static inline void ptep_set_wrprotect(st #define lazy_mmu_prot_update(pte) do { } while (0) #endif @@ -48,8 +48,8 @@ Signed-off-by: Greg Kroah-Hartman #endif /* ---- linux-2.6.16.20.orig/include/asm-mips/pgtable.h -+++ linux-2.6.16.20/include/asm-mips/pgtable.h +--- linux-2.6.16.21.orig/include/asm-mips/pgtable.h ++++ linux-2.6.16.21/include/asm-mips/pgtable.h @@ -70,7 +70,15 @@ extern unsigned long zero_page_mask; #define ZERO_PAGE(vaddr) \ (virt_to_page(empty_zero_page + (((unsigned long)(vaddr)) & zero_page_mask))) @@ -67,8 +67,8 @@ Signed-off-by: Greg Kroah-Hartman extern void paging_init(void); ---- linux-2.6.16.20.orig/include/asm-sparc64/pgtable.h -+++ linux-2.6.16.20/include/asm-sparc64/pgtable.h +--- linux-2.6.16.21.orig/include/asm-sparc64/pgtable.h ++++ linux-2.6.16.21/include/asm-sparc64/pgtable.h @@ -335,6 +335,23 @@ static inline void set_pte_at(struct mm_ #define pte_clear(mm,addr,ptep) \ set_pte_at((mm), (addr), (ptep), __pte(0UL)) diff --git a/queue-2.6.16/sparc64-fix-missing-fold-at-end-of-checksums.patch b/queue-2.6.16/sparc64-fix-missing-fold-at-end-of-checksums.patch index f5ed435d920..a202573dde4 100644 --- a/queue-2.6.16/sparc64-fix-missing-fold-at-end-of-checksums.patch +++ b/queue-2.6.16/sparc64-fix-missing-fold-at-end-of-checksums.patch @@ -23,8 +23,8 @@ Signed-off-by: Greg Kroah-Hartman arch/sparc64/lib/csum_copy.S | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) ---- linux-2.6.16.20.orig/arch/sparc64/lib/checksum.S -+++ linux-2.6.16.20/arch/sparc64/lib/checksum.S +--- linux-2.6.16.21.orig/arch/sparc64/lib/checksum.S ++++ linux-2.6.16.21/arch/sparc64/lib/checksum.S @@ -165,8 +165,9 @@ csum_partial_end_cruft: sll %g1, 8, %g1 or %o5, %g1, %o4 @@ -37,8 +37,8 @@ Signed-off-by: Greg Kroah-Hartman retl - mov %o2, %o0 + srl %o2, 0, %o0 ---- linux-2.6.16.20.orig/arch/sparc64/lib/csum_copy.S -+++ linux-2.6.16.20/arch/sparc64/lib/csum_copy.S +--- linux-2.6.16.21.orig/arch/sparc64/lib/csum_copy.S ++++ linux-2.6.16.21/arch/sparc64/lib/csum_copy.S @@ -221,11 +221,12 @@ FUNC_NAME: /* %o0=src, %o1=dst, %o2=len sll %g1, 8, %g1 or %o5, %g1, %o4 diff --git a/queue-2.6.16/sparc64-respect-gfp_t-argument-to-dma_alloc_coherent.patch b/queue-2.6.16/sparc64-respect-gfp_t-argument-to-dma_alloc_coherent.patch index 0c1811a4338..8713bafd726 100644 --- a/queue-2.6.16/sparc64-respect-gfp_t-argument-to-dma_alloc_coherent.patch +++ b/queue-2.6.16/sparc64-respect-gfp_t-argument-to-dma_alloc_coherent.patch @@ -30,8 +30,8 @@ Signed-off-by: Greg Kroah-Hartman include/asm-sparc64/pci.h | 4 - 4 files changed, 146 insertions(+), 5 deletions(-) ---- linux-2.6.16.20.orig/arch/sparc64/kernel/pci_iommu.c -+++ linux-2.6.16.20/arch/sparc64/kernel/pci_iommu.c +--- linux-2.6.16.21.orig/arch/sparc64/kernel/pci_iommu.c ++++ linux-2.6.16.21/arch/sparc64/kernel/pci_iommu.c @@ -219,7 +219,7 @@ static inline void iommu_free_ctx(struct * DMA for PCI device PDEV. Return non-NULL cpu-side address if * successful and set *DMA_ADDRP to the PCI side dma address. @@ -50,8 +50,8 @@ Signed-off-by: Greg Kroah-Hartman if (first_page == 0UL) return NULL; memset((char *)first_page, 0, PAGE_SIZE << order); ---- linux-2.6.16.20.orig/arch/sparc64/kernel/sparc64_ksyms.c -+++ linux-2.6.16.20/arch/sparc64/kernel/sparc64_ksyms.c +--- linux-2.6.16.21.orig/arch/sparc64/kernel/sparc64_ksyms.c ++++ linux-2.6.16.21/arch/sparc64/kernel/sparc64_ksyms.c @@ -221,7 +221,7 @@ EXPORT_SYMBOL(insl); EXPORT_SYMBOL(ebus_chain); EXPORT_SYMBOL(isa_chain); @@ -61,8 +61,8 @@ Signed-off-by: Greg Kroah-Hartman EXPORT_SYMBOL(pci_free_consistent); EXPORT_SYMBOL(pci_map_single); EXPORT_SYMBOL(pci_unmap_single); ---- linux-2.6.16.20.orig/include/asm-sparc64/dma-mapping.h -+++ linux-2.6.16.20/include/asm-sparc64/dma-mapping.h +--- linux-2.6.16.21.orig/include/asm-sparc64/dma-mapping.h ++++ linux-2.6.16.21/include/asm-sparc64/dma-mapping.h @@ -4,7 +4,146 @@ #include @@ -211,8 +211,8 @@ Signed-off-by: Greg Kroah-Hartman #else struct device; ---- linux-2.6.16.20.orig/include/asm-sparc64/pci.h -+++ linux-2.6.16.20/include/asm-sparc64/pci.h +--- linux-2.6.16.21.orig/include/asm-sparc64/pci.h ++++ linux-2.6.16.21/include/asm-sparc64/pci.h @@ -44,7 +44,9 @@ struct pci_dev; /* Allocate and map kernel buffer using consistent mode DMA for a device. * hwdev should be valid struct pci_dev pointer for PCI devices. diff --git a/queue-2.6.16/tmpfs-time-granularity-fix-for-time-going-backwards.patch b/queue-2.6.16/tmpfs-time-granularity-fix-for-time-going-backwards.patch index 87fbab80287..7a627f6be4b 100644 --- a/queue-2.6.16/tmpfs-time-granularity-fix-for-time-going-backwards.patch +++ b/queue-2.6.16/tmpfs-time-granularity-fix-for-time-going-backwards.patch @@ -33,8 +33,8 @@ Signed-off-by: Greg Kroah-Hartman mm/shmem.c | 1 + 1 file changed, 1 insertion(+) ---- linux-2.6.16.20.orig/mm/shmem.c -+++ linux-2.6.16.20/mm/shmem.c +--- linux-2.6.16.21.orig/mm/shmem.c ++++ linux-2.6.16.21/mm/shmem.c @@ -2100,6 +2100,7 @@ static int shmem_fill_super(struct super sb->s_blocksize_bits = PAGE_CACHE_SHIFT; sb->s_magic = TMPFS_MAGIC; diff --git a/queue-2.6.16/usb-whiteheat-fix-firmware-spurious-errors.patch b/queue-2.6.16/usb-whiteheat-fix-firmware-spurious-errors.patch index 143125c32b3..189e049d692 100644 --- a/queue-2.6.16/usb-whiteheat-fix-firmware-spurious-errors.patch +++ b/queue-2.6.16/usb-whiteheat-fix-firmware-spurious-errors.patch @@ -9,14 +9,13 @@ Attached patch fixes spurious errors during firmware load. Signed-off-by: Stuart MacDonald Signed-off-by: Greg Kroah-Hartman - - +Signed-off-by: Chris Wright --- drivers/usb/serial/whiteheat.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---- linux-2.6.16.20.orig/drivers/usb/serial/whiteheat.c -+++ linux-2.6.16.20/drivers/usb/serial/whiteheat.c +--- linux-2.6.16.21.orig/drivers/usb/serial/whiteheat.c ++++ linux-2.6.16.21/drivers/usb/serial/whiteheat.c @@ -388,7 +388,7 @@ static int whiteheat_attach (struct usb_ if (ret) { err("%s: Couldn't send command [%d]", serial->type->description, ret);