## Automatically generated incremental diff
## From:   linux-2.5.66-bk12
## To:     linux-2.5.66-bk13
## Robot:  $Id: make-incremental-diff,v 1.11 2002/02/20 02:59:33 hpa Exp $

diff -urN linux-2.5.66-bk12/Makefile linux-2.5.66-bk13/Makefile
--- linux-2.5.66-bk12/Makefile	2003-04-07 04:32:36.000000000 -0700
+++ linux-2.5.66-bk13/Makefile	2003-04-07 04:32:43.000000000 -0700
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 5
 SUBLEVEL = 66
-EXTRAVERSION = -bk12
+EXTRAVERSION = -bk13
 
 # *DOCUMENTATION*
 # To see a list of typical targets execute "make help"
diff -urN linux-2.5.66-bk12/arch/i386/kernel/cpu/cpufreq/acpi.c linux-2.5.66-bk13/arch/i386/kernel/cpu/cpufreq/acpi.c
--- linux-2.5.66-bk12/arch/i386/kernel/cpu/cpufreq/acpi.c	2003-03-24 14:00:00.000000000 -0800
+++ linux-2.5.66-bk13/arch/i386/kernel/cpu/cpufreq/acpi.c	2003-04-07 04:32:43.000000000 -0700
@@ -32,6 +32,7 @@
 #include <linux/seq_file.h>
 #include <asm/io.h>
 #include <asm/delay.h>
+#include <asm/uaccess.h>
 
 #include <linux/acpi.h>
 #include <acpi/processor.h>
diff -urN linux-2.5.66-bk12/arch/i386/kernel/cpu/cpufreq/longhaul.c linux-2.5.66-bk13/arch/i386/kernel/cpu/cpufreq/longhaul.c
--- linux-2.5.66-bk12/arch/i386/kernel/cpu/cpufreq/longhaul.c	2003-03-24 13:59:55.000000000 -0800
+++ linux-2.5.66-bk13/arch/i386/kernel/cpu/cpufreq/longhaul.c	2003-04-07 04:32:43.000000000 -0700
@@ -456,8 +456,10 @@
 	}
 
 	longhaul_table[k].frequency = CPUFREQ_TABLE_END;
-	if (!k)
+	if (!k) {
+		kfree (longhaul_table);
 		return -EINVAL;
+	}
 	
 	return 0;
 }
@@ -524,6 +526,7 @@
 static int longhaul_cpu_init (struct cpufreq_policy *policy)
 {
 	struct cpuinfo_x86 *c = cpu_data;
+	int ret;
 
 	switch (c->x86_model) {
 	case 6:		/* VIA C3 Samuel C5A */
@@ -554,7 +557,6 @@
 		memcpy (clock_ratio, longhaul3_clock_ratio, sizeof(longhaul3_clock_ratio));
 		memcpy (eblcr_table, c5m_eblcr, sizeof(c5m_eblcr));
 		break;
-
 	}
 
 	printk (KERN_INFO "longhaul: VIA CPU detected. Longhaul version %d supported\n", longhaul);
@@ -566,8 +568,9 @@
 			longhaul_setup_voltagescaling (lo, hi);
 	}
 
-	if (longhaul_get_ranges())
-		return -ENOMEM;
+	ret = longhaul_get_ranges();
+	if (ret != 0)
+		return ret;
 
  	policy->policy = CPUFREQ_POLICY_PERFORMANCE;
  	policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;
diff -urN linux-2.5.66-bk12/include/linux/module.h linux-2.5.66-bk13/include/linux/module.h
--- linux-2.5.66-bk12/include/linux/module.h	2003-04-07 04:32:39.000000000 -0700
+++ linux-2.5.66-bk13/include/linux/module.h	2003-04-07 04:32:45.000000000 -0700
@@ -408,9 +408,9 @@
 #endif /* MODULE */
 
 #define symbol_request(x) try_then_request_module(symbol_get(x), "symbol:" #x)
+#define SET_MODULE_OWNER(dev) ((dev)->owner = THIS_MODULE)
 
 /* BELOW HERE ALL THESE ARE OBSOLETE AND WILL VANISH */
-#define SET_MODULE_OWNER(dev) ((dev)->owner = THIS_MODULE)
 
 struct obsolete_modparm {
 	char name[64];
diff -urN linux-2.5.66-bk12/kernel/sched.c linux-2.5.66-bk13/kernel/sched.c
--- linux-2.5.66-bk12/kernel/sched.c	2003-04-07 04:32:39.000000000 -0700
+++ linux-2.5.66-bk13/kernel/sched.c	2003-04-07 04:32:45.000000000 -0700
@@ -364,19 +364,8 @@
 		 * boosting tasks that are related to maximum-interactive
 		 * tasks.
 		 */
-		if (sleep_avg > MAX_SLEEP_AVG) {
-			if (!in_interrupt()) {
-				sleep_avg += current->sleep_avg - MAX_SLEEP_AVG;
-				if (sleep_avg > MAX_SLEEP_AVG)
-					sleep_avg = MAX_SLEEP_AVG;
-
-				if (current->sleep_avg != sleep_avg) {
-					current->sleep_avg = sleep_avg;
-					requeue_waker = 1;
-				}
-			}
+		if (sleep_avg > MAX_SLEEP_AVG)
 			sleep_avg = MAX_SLEEP_AVG;
-		}
 		if (p->sleep_avg != sleep_avg) {
 			p->sleep_avg = sleep_avg;
 			p->prio = effective_prio(p);
diff -urN linux-2.5.66-bk12/net/ipv4/netfilter/Kconfig linux-2.5.66-bk13/net/ipv4/netfilter/Kconfig
--- linux-2.5.66-bk12/net/ipv4/netfilter/Kconfig	2003-04-07 04:32:39.000000000 -0700
+++ linux-2.5.66-bk13/net/ipv4/netfilter/Kconfig	2003-04-07 04:32:45.000000000 -0700
@@ -415,8 +415,8 @@
 config IP_NF_NAT_AMANDA
 	tristate
 	depends on IP_NF_IPTABLES!=n && IP_NF_CONNTRACK!=n && IP_NF_NAT!=n
-	default IP_NF_NAT if IP_NF_TFTP=y
-	default m if IP_NF_TFTP=m
+	default IP_NF_NAT if IP_NF_AMANDA=y
+	default m if IP_NF_AMANDA=m
 
 config IP_NF_MANGLE
 	tristate "Packet mangling"