diff options
| author |   Russell King <rmk+kernel@armlinux.org.uk> | 2017-04-05 23:43:03 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2017-04-05 23:43:03 +0100 |
| commit | 3872fe83a2fbb7366daa93ca533a22138e2d483e (patch) | |
| tree | e9c7c7a4a09a551011286a866235594b76cb73af /kernel/trace/trace_stack.c | |
| parent | ARM: 8665/1: nommu: access ID_PFR1 only if CPUID scheme (diff) | |
| parent | arm: kprobes: Align stack to 8-bytes in test code (diff) | |
| download | linux-dev-3872fe83a2fbb7366daa93ca533a22138e2d483e.tar.xz linux-dev-3872fe83a2fbb7366daa93ca533a22138e2d483e.zip | |
Merge branch 'kprobe-fixes' of https://git.linaro.org/people/tixy/kernel into fixes
Diffstat (limited to 'kernel/trace/trace_stack.c')
| -rw-r--r-- | kernel/trace/trace_stack.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c index 1d68b5b7ad41..5fb1f2c87e6b 100644 --- a/kernel/trace/trace_stack.c +++ b/kernel/trace/trace_stack.c @@ -65,7 +65,7 @@ void stack_trace_print(void) } /* - * When arch-specific code overides this function, the following + * When arch-specific code overrides this function, the following * data should be filled up, assuming stack_trace_max_lock is held to * prevent concurrent updates. * stack_trace_index[] |