diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-03-06 11:34:30 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-03-06 11:34:30 +1100 |
| commit | 3c81cd30226dac4964189ed2071cd78655df3311 (patch) | |
| tree | bb9a33e960a68c824487eef82415a49cfd9945fc /arch/x86/kernel/ftrace.c | |
| parent | beb50e827e6ade056f663d17cb42c663a4703d8b (diff) | |
| parent | de91776547c1fe0d8d7cb3951b581ecba364bda1 (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'arch/x86/kernel/ftrace.c')
| -rw-r--r-- | arch/x86/kernel/ftrace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c index 8639bb2ae058..8f3d9cf26ff9 100644 --- a/arch/x86/kernel/ftrace.c +++ b/arch/x86/kernel/ftrace.c @@ -535,7 +535,7 @@ static void run_sync(void) { int enable_irqs = irqs_disabled(); - /* We may be called with interrupts disbled (on bootup). */ + /* We may be called with interrupts disabled (on bootup). */ if (enable_irqs) local_irq_enable(); on_each_cpu(do_sync_core, NULL, 1); |