diff options
author | Marco Ammon <marco.ammon@fau.de> | 2019-09-02 08:02:59 -0400 |
---|---|---|
committer | Borislav Petkov <bp@suse.de> | 2019-09-02 08:02:59 -0400 |
commit | 32b1cbe380417f2ed80f758791179de6b05795ab (patch) | |
tree | bbe74da083b9a16ca1f377f0bcf383b7807f5b9f | |
parent | cbb1133b563a63901cf778220eb17e3ff1425aed (diff) |
x86: Correct misc typos
Correct spelling typos in comments in different files under arch/x86/.
[ bp: Merge into a single patch, massage. ]
Signed-off-by: Marco Ammon <marco.ammon@fau.de>
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Daniel Bristot de Oliveira <bristot@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Juergen Gross <jgross@suse.com>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Nadav Amit <namit@vmware.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Pu Wen <puwen@hygon.cn>
Cc: Rick Edgecombe <rick.p.edgecombe@intel.com>
Cc: "Steven Rostedt (VMware)" <rostedt@goodmis.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: trivial@kernel.org
Cc: x86-ml <x86@kernel.org>
Link: https://lkml.kernel.org/r/20190902102436.27396-1-marco.ammon@fau.de
-rw-r--r-- | arch/x86/include/asm/text-patching.h | 4 | ||||
-rw-r--r-- | arch/x86/kernel/alternative.c | 6 | ||||
-rw-r--r-- | arch/x86/kernel/kprobes/opt.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/arch/x86/include/asm/text-patching.h b/arch/x86/include/asm/text-patching.h index 70c09967a999..5e8319bb207a 100644 --- a/arch/x86/include/asm/text-patching.h +++ b/arch/x86/include/asm/text-patching.h | |||
@@ -45,8 +45,8 @@ extern void text_poke_early(void *addr, const void *opcode, size_t len); | |||
45 | * no thread can be preempted in the instructions being modified (no iret to an | 45 | * no thread can be preempted in the instructions being modified (no iret to an |
46 | * invalid instruction possible) or if the instructions are changed from a | 46 | * invalid instruction possible) or if the instructions are changed from a |
47 | * consistent state to another consistent state atomically. | 47 | * consistent state to another consistent state atomically. |
48 | * On the local CPU you need to be protected again NMI or MCE handlers seeing an | 48 | * On the local CPU you need to be protected against NMI or MCE handlers seeing |
49 | * inconsistent instruction while you patch. | 49 | * an inconsistent instruction while you patch. |
50 | */ | 50 | */ |
51 | extern void *text_poke(void *addr, const void *opcode, size_t len); | 51 | extern void *text_poke(void *addr, const void *opcode, size_t len); |
52 | extern void *text_poke_kgdb(void *addr, const void *opcode, size_t len); | 52 | extern void *text_poke_kgdb(void *addr, const void *opcode, size_t len); |
diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c index ccd32013c47a..9d3a971ea364 100644 --- a/arch/x86/kernel/alternative.c +++ b/arch/x86/kernel/alternative.c | |||
@@ -713,7 +713,7 @@ void __init alternative_instructions(void) | |||
713 | * Don't stop machine check exceptions while patching. | 713 | * Don't stop machine check exceptions while patching. |
714 | * MCEs only happen when something got corrupted and in this | 714 | * MCEs only happen when something got corrupted and in this |
715 | * case we must do something about the corruption. | 715 | * case we must do something about the corruption. |
716 | * Ignoring it is worse than a unlikely patching race. | 716 | * Ignoring it is worse than an unlikely patching race. |
717 | * Also machine checks tend to be broadcast and if one CPU | 717 | * Also machine checks tend to be broadcast and if one CPU |
718 | * goes into machine check the others follow quickly, so we don't | 718 | * goes into machine check the others follow quickly, so we don't |
719 | * expect a machine check to cause undue problems during to code | 719 | * expect a machine check to cause undue problems during to code |
@@ -753,8 +753,8 @@ void __init alternative_instructions(void) | |||
753 | * When you use this code to patch more than one byte of an instruction | 753 | * When you use this code to patch more than one byte of an instruction |
754 | * you need to make sure that other CPUs cannot execute this code in parallel. | 754 | * you need to make sure that other CPUs cannot execute this code in parallel. |
755 | * Also no thread must be currently preempted in the middle of these | 755 | * Also no thread must be currently preempted in the middle of these |
756 | * instructions. And on the local CPU you need to be protected again NMI or MCE | 756 | * instructions. And on the local CPU you need to be protected against NMI or |
757 | * handlers seeing an inconsistent instruction while you patch. | 757 | * MCE handlers seeing an inconsistent instruction while you patch. |
758 | */ | 758 | */ |
759 | void __init_or_module text_poke_early(void *addr, const void *opcode, | 759 | void __init_or_module text_poke_early(void *addr, const void *opcode, |
760 | size_t len) | 760 | size_t len) |
diff --git a/arch/x86/kernel/kprobes/opt.c b/arch/x86/kernel/kprobes/opt.c index 9d4aedece363..b348dd506d58 100644 --- a/arch/x86/kernel/kprobes/opt.c +++ b/arch/x86/kernel/kprobes/opt.c | |||
@@ -403,7 +403,7 @@ int arch_prepare_optimized_kprobe(struct optimized_kprobe *op, | |||
403 | (u8 *)op->kp.addr + op->optinsn.size); | 403 | (u8 *)op->kp.addr + op->optinsn.size); |
404 | len += RELATIVEJUMP_SIZE; | 404 | len += RELATIVEJUMP_SIZE; |
405 | 405 | ||
406 | /* We have to use text_poke for instuction buffer because it is RO */ | 406 | /* We have to use text_poke() for instruction buffer because it is RO */ |
407 | text_poke(slot, buf, len); | 407 | text_poke(slot, buf, len); |
408 | ret = 0; | 408 | ret = 0; |
409 | out: | 409 | out: |