Annotation of /trunk/kernel26-alx/patches-2.6.23-r1/0107-2.6.23.8-all-fixes.patch
Parent Directory | Revision Log
Revision 658 -
(hide annotations)
(download)
Mon Jun 23 21:39:39 2008 UTC (16 years, 4 months ago) by niro
File size: 1399 byte(s)
Mon Jun 23 21:39:39 2008 UTC (16 years, 4 months ago) by niro
File size: 1399 byte(s)
2.6.23-alx-r1: new default as we fix the via epia clocksource=tsc quircks -linux-2.6.23.17 -fbcondecor-0.9.4 -squashfs-3.3 -unionfs-2.3.3 -ipw3945-1.2.2 -mptbase-vmware fix
1 | niro | 658 | diff --git a/kernel/exit.c b/kernel/exit.c |
2 | index 993369e..096c27d 100644 | ||
3 | --- a/kernel/exit.c | ||
4 | +++ b/kernel/exit.c | ||
5 | @@ -1362,8 +1362,7 @@ static int wait_task_stopped(struct task_struct *p, int delayed_group_leader, | ||
6 | int why = (p->ptrace & PT_PTRACED) ? CLD_TRAPPED : CLD_STOPPED; | ||
7 | |||
8 | exit_code = p->exit_code; | ||
9 | - if (unlikely(!exit_code) || | ||
10 | - unlikely(p->state & TASK_TRACED)) | ||
11 | + if (unlikely(!exit_code) || unlikely(p->exit_state)) | ||
12 | goto bail_ref; | ||
13 | return wait_noreap_copyout(p, pid, uid, | ||
14 | why, (exit_code << 8) | 0x7f, | ||
15 | diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c | ||
16 | index f893e90..c9298a7 100644 | ||
17 | --- a/net/ipv4/tcp_input.c | ||
18 | +++ b/net/ipv4/tcp_input.c | ||
19 | @@ -1012,6 +1012,9 @@ tcp_sacktag_write_queue(struct sock *sk, struct sk_buff *ack_skb, u32 prior_snd_ | ||
20 | if (before(TCP_SKB_CB(ack_skb)->ack_seq, prior_snd_una - tp->max_window)) | ||
21 | return 0; | ||
22 | |||
23 | + if (!tp->packets_out) | ||
24 | + goto out; | ||
25 | + | ||
26 | /* SACK fastpath: | ||
27 | * if the only SACK change is the increase of the end_seq of | ||
28 | * the first block then only apply that SACK block | ||
29 | @@ -1280,6 +1283,8 @@ tcp_sacktag_write_queue(struct sock *sk, struct sk_buff *ack_skb, u32 prior_snd_ | ||
30 | (!tp->frto_highmark || after(tp->snd_una, tp->frto_highmark))) | ||
31 | tcp_update_reordering(sk, ((tp->fackets_out + 1) - reord), 0); | ||
32 | |||
33 | +out: | ||
34 | + | ||
35 | #if FASTRETRANS_DEBUG > 0 | ||
36 | BUG_TRAP((int)tp->sacked_out >= 0); | ||
37 | BUG_TRAP((int)tp->lost_out >= 0); |