Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 156048
b: refs/heads/master
c: b62f495
h: refs/heads/master
v: v3
  • Loading branch information
Mel Gorman authored and Linus Torvalds committed Jul 30, 2009
1 parent 713f8c3 commit 49453e0
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 1fc28b70fe2dbf87e061b6ce5091a1f8e4e5d4e7
refs/heads/master: b62f495dad04fa94b5083aec638ff3072bccaaca
5 changes: 3 additions & 2 deletions trunk/kernel/profile.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit 49453e0

Please sign in to comment.