---

yaml --- r: 73820 b: refs/heads/master c: 330a9c1 h: refs/heads/master v: v3
git-mirror · Nov 15, 2007 · 0d7e5f4 · 0d7e5f4
1 parent ab4e091
commit 0d7e5f4
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -21,7 +21,7 @@
 #include <sys/types.h>
 #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
@@ -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
@@ -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;
 	}