diff --git a/[refs] b/[refs] index 1047bdb2793b..0dbd892b3cd4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1fc28b70fe2dbf87e061b6ce5091a1f8e4e5d4e7 +refs/heads/master: b62f495dad04fa94b5083aec638ff3072bccaaca diff --git a/trunk/kernel/profile.c b/trunk/kernel/profile.c index 69911b5745eb..419250ebec4d 100644 --- a/trunk/kernel/profile.c +++ b/trunk/kernel/profile.c @@ -117,11 +117,12 @@ int __ref profile_init(void) cpumask_copy(prof_cpu_mask, cpu_possible_mask); - prof_buffer = kzalloc(buffer_bytes, GFP_KERNEL); + prof_buffer = kzalloc(buffer_bytes, GFP_KERNEL|__GFP_NOWARN); if (prof_buffer) return 0; - prof_buffer = alloc_pages_exact(buffer_bytes, GFP_KERNEL|__GFP_ZERO); + prof_buffer = alloc_pages_exact(buffer_bytes, + GFP_KERNEL|__GFP_ZERO|__GFP_NOWARN); if (prof_buffer) return 0;