From 69124082ea531ded2267c83f7c782ace20a188c8 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Thu, 24 May 2007 16:09:34 -0700 Subject: [PATCH] refresh queue-2.6.20 --- .../acpi-thermal-fix-mod_timer-interval.patch | 4 ++-- ...module-pointer-before-freeing-algorithm.patch | 4 ++-- ...e-devt_attr-till-the-device-is-released.patch | 4 ++-- .../fuse-fix-mknod-of-regular-file.patch | 4 ++-- .../iop13xx-fix-i-o-address-translation.patch | 8 ++++---- ...odify-corrupt-grev0-packets-through-nat.patch | 16 ++++++++-------- .../ipv6-track-device-renames-in-snmp6.patch | 8 ++++---- ...-fix-race-waking-up-jfsio-kernel-thread.patch | 4 ++-- ...-threads-that-share-mm-with-killed-task.patch | 4 ++-- queue-2.6.20/sata_via-add-missing-pm-hooks.patch | 4 ++-- ...x-compilation-breakage-wjen-debug-is-on.patch | 4 ++-- ...ays-flush-all-pages-in-change_page_attr.patch | 4 ++-- 12 files changed, 34 insertions(+), 34 deletions(-) diff --git a/queue-2.6.20/acpi-thermal-fix-mod_timer-interval.patch b/queue-2.6.20/acpi-thermal-fix-mod_timer-interval.patch index db3a9bcdd21..7d63c40bd39 100644 --- a/queue-2.6.20/acpi-thermal-fix-mod_timer-interval.patch +++ b/queue-2.6.20/acpi-thermal-fix-mod_timer-interval.patch @@ -20,8 +20,8 @@ Signed-off-by: Chris Wright drivers/acpi/thermal.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---- linux-2.6.20.11.orig/drivers/acpi/thermal.c -+++ linux-2.6.20.11/drivers/acpi/thermal.c +--- linux-2.6.20.12.orig/drivers/acpi/thermal.c ++++ linux-2.6.20.12/drivers/acpi/thermal.c @@ -758,7 +758,8 @@ static void acpi_thermal_check(void *dat del_timer(&(tz->timer)); } else { diff --git a/queue-2.6.20/crypto-api-read-module-pointer-before-freeing-algorithm.patch b/queue-2.6.20/crypto-api-read-module-pointer-before-freeing-algorithm.patch index ea11c1e1357..49f9a96eda2 100644 --- a/queue-2.6.20/crypto-api-read-module-pointer-before-freeing-algorithm.patch +++ b/queue-2.6.20/crypto-api-read-module-pointer-before-freeing-algorithm.patch @@ -21,8 +21,8 @@ Signed-off-by: Chris Wright crypto/api.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---- linux-2.6.20.11.orig/crypto/api.c -+++ linux-2.6.20.11/crypto/api.c +--- linux-2.6.20.12.orig/crypto/api.c ++++ linux-2.6.20.12/crypto/api.c @@ -48,8 +48,10 @@ EXPORT_SYMBOL_GPL(crypto_mod_get); void crypto_mod_put(struct crypto_alg *alg) diff --git a/queue-2.6.20/driver-core-don-t-free-devt_attr-till-the-device-is-released.patch b/queue-2.6.20/driver-core-don-t-free-devt_attr-till-the-device-is-released.patch index d3b111880a3..32b2727caa0 100644 --- a/queue-2.6.20/driver-core-don-t-free-devt_attr-till-the-device-is-released.patch +++ b/queue-2.6.20/driver-core-don-t-free-devt_attr-till-the-device-is-released.patch @@ -27,8 +27,8 @@ too (applies well there as well). drivers/base/core.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) ---- linux-2.6.20.11.orig/drivers/base/core.c -+++ linux-2.6.20.11/drivers/base/core.c +--- linux-2.6.20.12.orig/drivers/base/core.c ++++ linux-2.6.20.12/drivers/base/core.c @@ -93,6 +93,9 @@ static void device_release(struct kobjec { struct device * dev = to_dev(kobj); diff --git a/queue-2.6.20/fuse-fix-mknod-of-regular-file.patch b/queue-2.6.20/fuse-fix-mknod-of-regular-file.patch index 6e276ec4702..dc408a14d2a 100644 --- a/queue-2.6.20/fuse-fix-mknod-of-regular-file.patch +++ b/queue-2.6.20/fuse-fix-mknod-of-regular-file.patch @@ -22,8 +22,8 @@ Signed-off-by: Chris Wright fs/fuse/dir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---- linux-2.6.20.11.orig/fs/fuse/dir.c -+++ linux-2.6.20.11/fs/fuse/dir.c +--- linux-2.6.20.12.orig/fs/fuse/dir.c ++++ linux-2.6.20.12/fs/fuse/dir.c @@ -484,7 +484,7 @@ static int fuse_mknod(struct inode *dir, static int fuse_create(struct inode *dir, struct dentry *entry, int mode, struct nameidata *nd) diff --git a/queue-2.6.20/iop13xx-fix-i-o-address-translation.patch b/queue-2.6.20/iop13xx-fix-i-o-address-translation.patch index 85e6364855d..6ed47397e63 100644 --- a/queue-2.6.20/iop13xx-fix-i-o-address-translation.patch +++ b/queue-2.6.20/iop13xx-fix-i-o-address-translation.patch @@ -23,8 +23,8 @@ Signed-off-by: Chris Wright include/asm-arm/arch-iop13xx/iop13xx.h | 22 +++++++++++++--------- 2 files changed, 17 insertions(+), 13 deletions(-) ---- linux-2.6.20.11.orig/arch/arm/mach-iop13xx/pci.c -+++ linux-2.6.20.11/arch/arm/mach-iop13xx/pci.c +--- linux-2.6.20.12.orig/arch/arm/mach-iop13xx/pci.c ++++ linux-2.6.20.12/arch/arm/mach-iop13xx/pci.c @@ -1023,7 +1023,7 @@ int iop13xx_pci_setup(int nr, struct pci << IOP13XX_ATUX_PCIXSR_FUNC_NUM; __raw_writel(pcixsr, IOP13XX_ATUX_PCIXSR); @@ -61,8 +61,8 @@ Signed-off-by: Chris Wright sys->map_irq = iop13xx_pcie_map_irq; break; default: ---- linux-2.6.20.11.orig/include/asm-arm/arch-iop13xx/iop13xx.h -+++ linux-2.6.20.11/include/asm-arm/arch-iop13xx/iop13xx.h +--- linux-2.6.20.12.orig/include/asm-arm/arch-iop13xx/iop13xx.h ++++ linux-2.6.20.12/include/asm-arm/arch-iop13xx/iop13xx.h @@ -55,19 +55,24 @@ static inline int iop13xx_cpu_id(void) #define IOP13XX_PCI_OFFSET IOP13XX_MAX_RAM_SIZE diff --git a/queue-2.6.20/ip-nf-_nat_proto_gre-do-not-modify-corrupt-grev0-packets-through-nat.patch b/queue-2.6.20/ip-nf-_nat_proto_gre-do-not-modify-corrupt-grev0-packets-through-nat.patch index 93d82a5d832..5597617fab4 100644 --- a/queue-2.6.20/ip-nf-_nat_proto_gre-do-not-modify-corrupt-grev0-packets-through-nat.patch +++ b/queue-2.6.20/ip-nf-_nat_proto_gre-do-not-modify-corrupt-grev0-packets-through-nat.patch @@ -35,8 +35,8 @@ committer Patrick McHardy Thu, 03 May 2007 02:50:51 +0200 net/ipv4/netfilter/nf_nat_proto_gre.c | 20 +++++++----------- 4 files changed, 16 insertions(+), 61 deletions(-) ---- linux-2.6.20.11.orig/include/linux/netfilter/nf_conntrack_proto_gre.h -+++ linux-2.6.20.11/include/linux/netfilter/nf_conntrack_proto_gre.h +--- linux-2.6.20.12.orig/include/linux/netfilter/nf_conntrack_proto_gre.h ++++ linux-2.6.20.12/include/linux/netfilter/nf_conntrack_proto_gre.h @@ -87,24 +87,6 @@ int nf_ct_gre_keymap_add(struct nf_conn /* delete keymap entries */ void nf_ct_gre_keymap_destroy(struct nf_conn *ct); @@ -62,8 +62,8 @@ committer Patrick McHardy Thu, 03 May 2007 02:50:51 +0200 extern void nf_ct_gre_keymap_flush(void); extern void nf_nat_need_gre(void); ---- linux-2.6.20.11.orig/include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h -+++ linux-2.6.20.11/include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h +--- linux-2.6.20.12.orig/include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h ++++ linux-2.6.20.12/include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h @@ -90,25 +90,6 @@ int ip_ct_gre_keymap_add(struct ip_connt /* delete keymap entries */ void ip_ct_gre_keymap_destroy(struct ip_conntrack *ct); @@ -90,8 +90,8 @@ committer Patrick McHardy Thu, 03 May 2007 02:50:51 +0200 #endif /* __KERNEL__ */ #endif /* _CONNTRACK_PROTO_GRE_H */ ---- linux-2.6.20.11.orig/net/ipv4/netfilter/ip_nat_proto_gre.c -+++ linux-2.6.20.11/net/ipv4/netfilter/ip_nat_proto_gre.c +--- linux-2.6.20.12.orig/net/ipv4/netfilter/ip_nat_proto_gre.c ++++ linux-2.6.20.12/net/ipv4/netfilter/ip_nat_proto_gre.c @@ -70,6 +70,11 @@ gre_unique_tuple(struct ip_conntrack_tup __be16 *keyptr; unsigned int min, i, range_size; @@ -126,8 +126,8 @@ committer Patrick McHardy Thu, 03 May 2007 02:50:51 +0200 break; case GRE_VERSION_PPTP: DEBUGP("call_id -> 0x%04x\n", ---- linux-2.6.20.11.orig/net/ipv4/netfilter/nf_nat_proto_gre.c -+++ linux-2.6.20.11/net/ipv4/netfilter/nf_nat_proto_gre.c +--- linux-2.6.20.12.orig/net/ipv4/netfilter/nf_nat_proto_gre.c ++++ linux-2.6.20.12/net/ipv4/netfilter/nf_nat_proto_gre.c @@ -72,6 +72,11 @@ gre_unique_tuple(struct nf_conntrack_tup __be16 *keyptr; unsigned int min, i, range_size; diff --git a/queue-2.6.20/ipv6-track-device-renames-in-snmp6.patch b/queue-2.6.20/ipv6-track-device-renames-in-snmp6.patch index 9bac23a1169..30ec13a0c75 100644 --- a/queue-2.6.20/ipv6-track-device-renames-in-snmp6.patch +++ b/queue-2.6.20/ipv6-track-device-renames-in-snmp6.patch @@ -20,8 +20,8 @@ Signed-off-by: Chris Wright net/ipv6/proc.c | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) ---- linux-2.6.20.11.orig/net/ipv6/addrconf.c -+++ linux-2.6.20.11/net/ipv6/addrconf.c +--- linux-2.6.20.12.orig/net/ipv6/addrconf.c ++++ linux-2.6.20.12/net/ipv6/addrconf.c @@ -2338,8 +2338,9 @@ static int addrconf_notify(struct notifi break; @@ -44,8 +44,8 @@ Signed-off-by: Chris Wright break; }; ---- linux-2.6.20.11.orig/net/ipv6/proc.c -+++ linux-2.6.20.11/net/ipv6/proc.c +--- linux-2.6.20.12.orig/net/ipv6/proc.c ++++ linux-2.6.20.12/net/ipv6/proc.c @@ -237,6 +237,7 @@ int snmp6_unregister_dev(struct inet6_de return -EINVAL; remove_proc_entry(idev->stats.proc_dir_entry->name, diff --git a/queue-2.6.20/jfs-fix-race-waking-up-jfsio-kernel-thread.patch b/queue-2.6.20/jfs-fix-race-waking-up-jfsio-kernel-thread.patch index 2f20605e982..8bf0ae8faec 100644 --- a/queue-2.6.20/jfs-fix-race-waking-up-jfsio-kernel-thread.patch +++ b/queue-2.6.20/jfs-fix-race-waking-up-jfsio-kernel-thread.patch @@ -19,8 +19,8 @@ Signed-off-by: Chris Wright fs/jfs/jfs_logmgr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---- linux-2.6.20.11.orig/fs/jfs/jfs_logmgr.c -+++ linux-2.6.20.11/fs/jfs/jfs_logmgr.c +--- linux-2.6.20.12.orig/fs/jfs/jfs_logmgr.c ++++ linux-2.6.20.12/fs/jfs/jfs_logmgr.c @@ -2354,12 +2354,13 @@ int jfsIOWait(void *arg) lbmStartIO(bp); spin_lock_irq(&log_redrive_lock); diff --git a/queue-2.6.20/oom-kill-all-threads-that-share-mm-with-killed-task.patch b/queue-2.6.20/oom-kill-all-threads-that-share-mm-with-killed-task.patch index 615b63d0d4c..b2532bfd218 100644 --- a/queue-2.6.20/oom-kill-all-threads-that-share-mm-with-killed-task.patch +++ b/queue-2.6.20/oom-kill-all-threads-that-share-mm-with-killed-task.patch @@ -26,8 +26,8 @@ Signed-off-by: Chris Wright mm/oom_kill.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---- linux-2.6.20.11.orig/mm/oom_kill.c -+++ linux-2.6.20.11/mm/oom_kill.c +--- linux-2.6.20.12.orig/mm/oom_kill.c ++++ linux-2.6.20.12/mm/oom_kill.c @@ -335,7 +335,7 @@ static int oom_kill_task(struct task_str */ do_each_thread(g, q) { diff --git a/queue-2.6.20/sata_via-add-missing-pm-hooks.patch b/queue-2.6.20/sata_via-add-missing-pm-hooks.patch index 33a66dbe186..8f3028057d1 100644 --- a/queue-2.6.20/sata_via-add-missing-pm-hooks.patch +++ b/queue-2.6.20/sata_via-add-missing-pm-hooks.patch @@ -18,8 +18,8 @@ Signed-off-by: Chris Wright drivers/ata/sata_via.c | 8 ++++++++ 1 file changed, 8 insertions(+) ---- linux-2.6.20.11.orig/drivers/ata/sata_via.c -+++ linux-2.6.20.11/drivers/ata/sata_via.c +--- linux-2.6.20.12.orig/drivers/ata/sata_via.c ++++ linux-2.6.20.12/drivers/ata/sata_via.c @@ -90,6 +90,10 @@ static struct pci_driver svia_pci_driver .name = DRV_NAME, .id_table = svia_pci_tbl, diff --git a/queue-2.6.20/smc911x-fix-compilation-breakage-wjen-debug-is-on.patch b/queue-2.6.20/smc911x-fix-compilation-breakage-wjen-debug-is-on.patch index 233dc5bd1c7..f9fc6b06f39 100644 --- a/queue-2.6.20/smc911x-fix-compilation-breakage-wjen-debug-is-on.patch +++ b/queue-2.6.20/smc911x-fix-compilation-breakage-wjen-debug-is-on.patch @@ -17,8 +17,8 @@ Signed-off-by: Chris Wright drivers/net/smc911x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---- linux-2.6.20.11.orig/drivers/net/smc911x.c -+++ linux-2.6.20.11/drivers/net/smc911x.c +--- linux-2.6.20.12.orig/drivers/net/smc911x.c ++++ linux-2.6.20.12/drivers/net/smc911x.c @@ -499,7 +499,7 @@ static inline void smc911x_rcv(struct n SMC_SET_RX_CFG(RX_CFG_RX_END_ALGN4_ | ((2<<8) & RX_CFG_RXDOFF_)); SMC_PULL_DATA(data, pkt_len+2+3); diff --git a/queue-2.6.20/x86-64-always-flush-all-pages-in-change_page_attr.patch b/queue-2.6.20/x86-64-always-flush-all-pages-in-change_page_attr.patch index 0b0963e6c9e..b95bd95eead 100644 --- a/queue-2.6.20/x86-64-always-flush-all-pages-in-change_page_attr.patch +++ b/queue-2.6.20/x86-64-always-flush-all-pages-in-change_page_attr.patch @@ -26,8 +26,8 @@ Signed-off-by: Chris Wright arch/x86_64/mm/pageattr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---- linux-2.6.20.11.orig/arch/x86_64/mm/pageattr.c -+++ linux-2.6.20.11/arch/x86_64/mm/pageattr.c +--- linux-2.6.20.12.orig/arch/x86_64/mm/pageattr.c ++++ linux-2.6.20.12/arch/x86_64/mm/pageattr.c @@ -81,8 +81,8 @@ static void flush_kernel_map(void *arg) void *adr = page_address(pg); if (cpu_has_clflush) -- 2.47.3