aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorge G. Davis <george_davis@mentor.com>2019-06-05 16:30:10 -0400
committerJonathan Corbet <corbet@lwn.net>2019-06-07 11:50:10 -0600
commit462e5a521ab73f7762583add73cbab1662612beb (patch)
tree31a93f162ccf8965a70982f963de90c587a40b82
parentDocumentation: xfs: Fix typo (diff)
downloadlinux-dev-462e5a521ab73f7762583add73cbab1662612beb.tar.xz
linux-dev-462e5a521ab73f7762583add73cbab1662612beb.zip
treewide: trivial: fix s/poped/popped/ typo
Fix a couple of s/poped/popped/ typos. Signed-off-by: George G. Davis <george_davis@mentor.com> Acked-by: Steven Rostedt (VMware) <rostedt@goodmis.org> Acked-by: Masami Hiramatsu <mhiramat@kernel.org> Signed-off-by: Jonathan Corbet <corbet@lwn.net>
-rw-r--r--Documentation/arm/mem_alignment2
-rw-r--r--arch/x86/kernel/kprobes/core.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/arm/mem_alignment b/Documentation/arm/mem_alignment
index 6335fcacbba9..e110e2781039 100644
--- a/Documentation/arm/mem_alignment
+++ b/Documentation/arm/mem_alignment
@@ -1,4 +1,4 @@
-Too many problems poped up because of unnoticed misaligned memory access in
+Too many problems popped up because of unnoticed misaligned memory access in
kernel code lately. Therefore the alignment fixup is now unconditionally
configured in for SA11x0 based targets. According to Alan Cox, this is a
bad idea to configure it out, but Russell King has some good reasons for
diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c
index 9e4fa2484d10..1de809afaf65 100644
--- a/arch/x86/kernel/kprobes/core.c
+++ b/arch/x86/kernel/kprobes/core.c
@@ -826,7 +826,7 @@ __used __visible void *trampoline_handler(struct pt_regs *regs)
continue;
/*
* Return probes must be pushed on this hash list correct
- * order (same as return order) so that it can be poped
+ * order (same as return order) so that it can be popped
* correctly. However, if we find it is pushed it incorrect
* order, this means we find a function which should not be
* probed, because the wrong order entry is pushed on the