diff options
| author | Alex Shi <alex.shi@linaro.org> | 2014-01-10 10:50:57 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2014-01-10 10:50:57 +0800 |
| commit | 450cdfa9c5713551ab1438ab210679868b52a994 (patch) | |
| tree | edd98f9698aa88af55a3a1ee3de62e52917c39ba /kernel/trace/ftrace.c | |
| parent | bf78886fb6c4131885f84f3eaaf7474509d40e51 (diff) | |
| parent | 8b4ed85b8404ffe7e10ee410c4df3968b86f0793 (diff) | |
Merge remote-tracking branch 'stable/linux-3.10.y' into linux-linaro-lsk
Conflicts:
arch/arm64/kernel/smp.c
Signed-off-by: Alex Shi <alex.shi@linaro.org>
Diffstat (limited to 'kernel/trace/ftrace.c')
| -rw-r--r-- | kernel/trace/ftrace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index 331c102177a..d0c5c3f0d93 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -750,7 +750,7 @@ static int ftrace_profile_init(void) int cpu; int ret = 0; - for_each_online_cpu(cpu) { + for_each_possible_cpu(cpu) { ret = ftrace_profile_init_cpu(cpu); if (ret) break; |