diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-11 17:22:26 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-11 17:22:26 +0100 |
| commit | b3f2caaaa82440af06b39c2c92e4fa8122d75465 (patch) | |
| tree | 62338ae23ff00ec98773a1a9d768a303740a4dfa /kernel | |
| parent | Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 (diff) | |
| parent | tracing, x86: fix constraint for parent variable (diff) | |
| download | linux-b3f2caaaa82440af06b39c2c92e4fa8122d75465.tar.xz linux-b3f2caaaa82440af06b39c2c92e4fa8122d75465.zip | |
Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
tracing, x86: fix constraint for parent variable
tracing, x86: fix fixup section to return to original code
profiling: fix broken profiling regression
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/profile.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/profile.c b/kernel/profile.c index 784933acf5b8..7724e0409bae 100644 --- a/kernel/profile.c +++ b/kernel/profile.c @@ -114,12 +114,15 @@ int __ref profile_init(void) if (!slab_is_available()) { prof_buffer = alloc_bootmem(buffer_bytes); alloc_bootmem_cpumask_var(&prof_cpu_mask); + cpumask_copy(prof_cpu_mask, cpu_possible_mask); return 0; } if (!alloc_cpumask_var(&prof_cpu_mask, GFP_KERNEL)) return -ENOMEM; + cpumask_copy(prof_cpu_mask, cpu_possible_mask); + prof_buffer = kzalloc(buffer_bytes, GFP_KERNEL); if (prof_buffer) return 0; |