diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 09:03:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 09:03:19 -0700 |
| commit | 1f43c5393033de90bac4410352b1d2a69dcbe7ef (patch) | |
| tree | 3e6c3b9e9ea4dd6620a3b8332546a3cbbeddb1fd /arch/x86/kernel/e820_64.c | |
| parent | c135b6592bd63925397e60425e0301f33f06c7a6 (diff) | |
| parent | e90955c26d8af318658c45caadb1d330ac6a506c (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-fixes
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-fixes:
x86: fix PCI MSI breaks when booting with nosmp
x86: vget_cycles() __always_inline
x86: add more boot protocol documentation
bootprotocol: cleanup
x86: fix warning in "x86: clean up vSMP detection"
x86: !x & y typo in mtrr code
Diffstat (limited to 'arch/x86/kernel/e820_64.c')
| -rw-r--r-- | arch/x86/kernel/e820_64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/e820_64.c b/arch/x86/kernel/e820_64.c index 645ee5e32a2..124480c0008 100644 --- a/arch/x86/kernel/e820_64.c +++ b/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; |