diff options
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/kernel/mpparse.c | 4 | ||||
-rw-r--r-- | arch/x86/lib/memcpy_64.S | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c index 5a532ce646bf..ef59817357fc 100644 --- a/arch/x86/kernel/mpparse.c +++ b/arch/x86/kernel/mpparse.c | |||
@@ -718,14 +718,12 @@ static void __init check_irq_src(struct mpc_intsrc *m, int *nr_m_spare) | |||
718 | static int | 718 | static int |
719 | check_slot(unsigned long mpc_new_phys, unsigned long mpc_new_length, int count) | 719 | check_slot(unsigned long mpc_new_phys, unsigned long mpc_new_length, int count) |
720 | { | 720 | { |
721 | int ret = 0; | ||
722 | |||
723 | if (!mpc_new_phys || count <= mpc_new_length) { | 721 | if (!mpc_new_phys || count <= mpc_new_length) { |
724 | WARN(1, "update_mptable: No spare slots (length: %x)\n", count); | 722 | WARN(1, "update_mptable: No spare slots (length: %x)\n", count); |
725 | return -1; | 723 | return -1; |
726 | } | 724 | } |
727 | 725 | ||
728 | return ret; | 726 | return 0; |
729 | } | 727 | } |
730 | #else /* CONFIG_X86_IO_APIC */ | 728 | #else /* CONFIG_X86_IO_APIC */ |
731 | static | 729 | static |
diff --git a/arch/x86/lib/memcpy_64.S b/arch/x86/lib/memcpy_64.S index 75ef61e35e38..2a560bb2573b 100644 --- a/arch/x86/lib/memcpy_64.S +++ b/arch/x86/lib/memcpy_64.S | |||
@@ -49,7 +49,7 @@ ENTRY(memcpy) | |||
49 | jb .Lhandle_tail | 49 | jb .Lhandle_tail |
50 | 50 | ||
51 | /* | 51 | /* |
52 | * We check whether memory false dependece could occur, | 52 | * We check whether memory false dependence could occur, |
53 | * then jump to corresponding copy mode. | 53 | * then jump to corresponding copy mode. |
54 | */ | 54 | */ |
55 | cmp %dil, %sil | 55 | cmp %dil, %sil |