Merge commit '559fa6e7' into perf/urgent



Merge reason: this commit was queued up quite some time ago but was
              forgotten about.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

kernel/profile.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -126,11 +126,9 @@ int __ref profile_init(void)
		if (prof_buffer)
		return 0;

		prof_buffer = vmalloc(buffer_bytes);
		if (prof_buffer) {
		memset(prof_buffer, 0, buffer_bytes);
		prof_buffer = vzalloc(buffer_bytes);
		if (prof_buffer)
		return 0;
		}

		free_cpumask_var(prof_cpu_mask);
		return -ENOMEM;