Auto-update from upstream

4 files changed, 8 insertions, 7 deletions

diff --git a/Makefile b/Makefile
index 4a7000e353b5..1fa7e5343464 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 14
-EXTRAVERSION =-rc5
+EXTRAVERSION =
 NAME=Affluent Albatross
 
 # *DOCUMENTATION*
diff --git a/drivers/cpufreq/cpufreq_conservative.c b/drivers/cpufreq/cpufreq_conservative.c
index e1df376e709e..2ed5c4363b53 100644
--- a/drivers/cpufreq/cpufreq_conservative.c
+++ b/drivers/cpufreq/cpufreq_conservative.c
@@ -315,9 +315,9 @@ static void dbs_check_cpu(int cpu)
         policy = this_dbs_info->cur_policy;
 
         if ( init_flag == 0 ) {
-                for ( /* NULL */; init_flag < NR_CPUS; init_flag++ ) {
-                        dbs_info = &per_cpu(cpu_dbs_info, init_flag);
-                        requested_freq[cpu] = dbs_info->cur_policy->cur;
+                for_each_online_cpu(j) {
+                        dbs_info = &per_cpu(cpu_dbs_info, j);
+                        requested_freq[j] = dbs_info->cur_policy->cur;
                 }
                 init_flag = 1;
         }
diff --git a/include/asm-x86_64/pci.h b/include/asm-x86_64/pci.h
index 5a82a6762c21..eeb3088a1c9e 100644
--- a/include/asm-x86_64/pci.h
+++ b/include/asm-x86_64/pci.h
@@ -50,10 +50,10 @@ extern int iommu_setup(char *opt);
  * address space.  The networking and block device layers use
  * this boolean for bounce buffer decisions
  *
- * On x86-64 it mostly equals, but we set it to zero to tell some subsystems
- * that an hard or soft IOMMU is available.
+ * On AMD64 it mostly equals, but we set it to zero to tell some subsystems
+ * that an IOMMU is available.
  */
-#define PCI_DMA_BUS_IS_PHYS 0
+#define PCI_DMA_BUS_IS_PHYS     (no_iommu ? 1 : 0)
 
 /*
  * x86-64 always supports DAC, but sometimes it is useful to force
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 677419d0c9ad..3e98b57578dc 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -2239,6 +2239,7 @@ static int tcp_ack_update_window(struct sock *sk, struct tcp_sock *tp,
                         /* Note, it is the only place, where
                          * fast path is recovered for sending TCP.
                          */
+                        tp->pred_flags = 0;
                         tcp_fast_path_check(sk, tp);
 
                         if (nwin > tp->max_window) {