leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto-update from upstream

Browse Source
This commit is contained in:
Tony Luck 2005-10-28 15:28:54 -07:00
commit fb5f329d58
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1,7 +1,7 @@
VERSION = 2 VERSION = 2
PATCHLEVEL = 6 PATCHLEVEL = 6
SUBLEVEL = 14 SUBLEVEL = 14
EXTRAVERSION =-rc5 EXTRAVERSION =
NAME=Affluent Albatross NAME=Affluent Albatross
# *DOCUMENTATION* # *DOCUMENTATION*

6
drivers/cpufreq/cpufreq_conservative.c
View File

@ -315,9 +315,9 @@ static void dbs_check_cpu(int cpu)
policy = this_dbs_info->cur_policy; policy = this_dbs_info->cur_policy;
if ( init_flag == 0 ) { if ( init_flag == 0 ) {
for ( /* NULL */; init_flag < NR_CPUS; init_flag++ ) { for_each_online_cpu(j) {
dbs_info = &per_cpu(cpu_dbs_info, init_flag); dbs_info = &per_cpu(cpu_dbs_info, j);
requested_freq[cpu] = dbs_info->cur_policy->cur; requested_freq[j] = dbs_info->cur_policy->cur;
} }
init_flag = 1; init_flag = 1;
} }

6
include/asm-x86_64/pci.h
View File

@ -50,10 +50,10 @@ extern int iommu_setup(char *opt);
* address space. The networking and block device layers use * address space. The networking and block device layers use
* this boolean for bounce buffer decisions * this boolean for bounce buffer decisions
* *
* On x86-64 it mostly equals, but we set it to zero to tell some subsystems * On AMD64 it mostly equals, but we set it to zero to tell some subsystems
* that an hard or soft IOMMU is available. * 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 * x86-64 always supports DAC, but sometimes it is useful to force

1
net/ipv4/tcp_input.c
View File

@ -2239,6 +2239,7 @@ static int tcp_ack_update_window(struct sock *sk, struct tcp_sock *tp,
/* Note, it is the only place, where /* Note, it is the only place, where
* fast path is recovered for sending TCP. * fast path is recovered for sending TCP.
*/ */
tp->pred_flags = 0;
tcp_fast_path_check(sk, tp); tcp_fast_path_check(sk, tp);
if (nwin > tp->max_window) { if (nwin > tp->max_window) {