From 0d7e5f4c58b2fdfb6aec00bd7001d1ab057cdea7 Mon Sep 17 00:00:00 2001 From: Haavard Skinnemoen Date: Tue, 16 Oct 2007 11:23:51 +0200 Subject: [PATCH] --- yaml --- r: 73820 b: refs/heads/master c: 330a9c1df63ca5043c468698da0a1853fd6778bb h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/pcmcia/cs_types.h | 2 +- trunk/kernel/exit.c | 3 ++- trunk/mm/slob.c | 3 +-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index d4c7304f1b6e..9bd1d6c320db 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d32ddd8f20e7d7a49c45c337c2079be03c77dc41 +refs/heads/master: 330a9c1df63ca5043c468698da0a1853fd6778bb diff --git a/trunk/include/pcmcia/cs_types.h b/trunk/include/pcmcia/cs_types.h index c1d1629fcd27..5f388035687d 100644 --- a/trunk/include/pcmcia/cs_types.h +++ b/trunk/include/pcmcia/cs_types.h @@ -21,7 +21,7 @@ #include #endif -#if defined(__arm__) || defined(__mips__) +#if defined(__arm__) || defined(__mips__) || defined(__avr32__) /* This (ioaddr_t) is exposed to userspace & hence cannot be changed. */ typedef u_int ioaddr_t; #else diff --git a/trunk/kernel/exit.c b/trunk/kernel/exit.c index cd0f1d4137a7..f1aec27f1df0 100644 --- a/trunk/kernel/exit.c +++ b/trunk/kernel/exit.c @@ -1386,7 +1386,8 @@ static int wait_task_stopped(struct task_struct *p, int delayed_group_leader, int why = (p->ptrace & PT_PTRACED) ? CLD_TRAPPED : CLD_STOPPED; exit_code = p->exit_code; - if (unlikely(!exit_code) || unlikely(p->exit_state)) + if (unlikely(!exit_code) || + unlikely(p->state & TASK_TRACED)) goto bail_ref; return wait_noreap_copyout(p, pid, uid, why, (exit_code << 8) | 0x7f, diff --git a/trunk/mm/slob.c b/trunk/mm/slob.c index 08a9bd91a1aa..5bc2ceb692ec 100644 --- a/trunk/mm/slob.c +++ b/trunk/mm/slob.c @@ -321,8 +321,7 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node) /* Improve fragment distribution and reduce our average * search time by starting our next search here. (see * Knuth vol 1, sec 2.5, pg 449) */ - if (prev != free_slob_pages.prev && - free_slob_pages.next != prev->next) + if (free_slob_pages.next != prev->next) list_move_tail(&free_slob_pages, prev->next); break; }