From ce8c954cd000f025a946cb03a948e6ba29d81f27 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Sat, 26 Apr 2008 23:14:36 +0200 Subject: [PATCH] --- yaml --- r: 94834 b: refs/heads/master c: 781fe2ebc0f44b32418d203ac023a541afdd042f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/e820_64.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ff2bb58b152c..b2c7d0c51d80 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8008abbd87644c84f93a7a86fec88f1e14031901 +refs/heads/master: 781fe2ebc0f44b32418d203ac023a541afdd042f diff --git a/trunk/arch/x86/kernel/e820_64.c b/trunk/arch/x86/kernel/e820_64.c index 645ee5e32a27..124480c0008d 100644 --- a/trunk/arch/x86/kernel/e820_64.c +++ b/trunk/arch/x86/kernel/e820_64.c @@ -100,7 +100,7 @@ void __init free_early(unsigned long start, unsigned long end) for (j = i + 1; j < MAX_EARLY_RES && early_res[j].end; j++) ; - memcpy(&early_res[i], &early_res[i + 1], + memmove(&early_res[i], &early_res[i + 1], (j - 1 - i) * sizeof(struct early_res)); early_res[j - 1].end = 0;