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 {
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)
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);
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)
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);
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
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);
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);
#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;
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;
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;
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,
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);
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) {
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,
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);
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)