diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-03-10 13:14:11 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-03-10 13:14:13 +1100 |
| commit | bab31490ee78b5c5531bae6d54d411a49d2c2f30 (patch) | |
| tree | f38d61b2da425a855b0b39d9733c879518f3b6cf /kernel/trace | |
| parent | e766a98118fe1ec0697d0cb6ad5e44b988a192d4 (diff) | |
| parent | 328f8e70990e9bb7f7cb8f9e59299d5fa6ca699d (diff) | |
Merge branch 'akpm-current/current'
Diffstat (limited to 'kernel/trace')
| -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[] |