From 0d97ceb1af0dde4bb74b082aecc2b95f455f472b Mon Sep 17 00:00:00 2001
From: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Date: Mon, 16 May 2005 21:53:14 -0700
Subject: [PATCH] --- yaml --- r: 1131 b: refs/heads/master c:
 8f332287bc3f2801ba43682fd79baf24dc8ac1ce h: refs/heads/master i:   1129:
 0d2d34b5a579a7191aabaa8b06a188f0731c59d4   1127:
 31245b515ac7f0b15834e0eef701fd724ed1e09d v: v3

---
 [refs]                          |  2 +-
 trunk/arch/um/kernel/irq_user.c | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 20bc72b4f8ac..48a8deead412 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 02048817a70ad04dda5b30ad876c42a232229c99
+refs/heads/master: 8f332287bc3f2801ba43682fd79baf24dc8ac1ce
diff --git a/trunk/arch/um/kernel/irq_user.c b/trunk/arch/um/kernel/irq_user.c
index 6d6f9484b884..b3074cbaa479 100644
--- a/trunk/arch/um/kernel/irq_user.c
+++ b/trunk/arch/um/kernel/irq_user.c
@@ -236,9 +236,15 @@ static void free_irq_by_cb(int (*test)(struct irq_fd *, void *), void *arg)
 				       (*prev)->fd, pollfds[i].fd);
 				goto out;
 			}
-			memcpy(&pollfds[i], &pollfds[i + 1],
-			       (pollfds_num - i - 1) * sizeof(pollfds[0]));
+
 			pollfds_num--;
+
+			/* This moves the *whole* array after pollfds[i] (though
+			 * it doesn't spot as such)! */
+
+			memmove(&pollfds[i], &pollfds[i + 1],
+			       (pollfds_num - i) * sizeof(pollfds[0]));
+
 			if(last_irq_ptr == &old_fd->next) 
 				last_irq_ptr = prev;
 			*prev = (*prev)->next;