summaryrefslogtreecommitdiff
path: root/mm/hugetlb.c
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2012-05-01 15:47:09 -0700
committerColin Cross <ccross@android.com>2012-05-01 15:47:09 -0700
commitaadf030d84352a91cdadf50f947da739c5611450 (patch)
tree5f22ec57ee257776b4c157f0c91f3612f05ed6c5 /mm/hugetlb.c
parentaad2732ba0dddcf3446a4e3c4843496759c1c305 (diff)
parent69964ea4c7b68c9399f7977aa5b9aa6539a6a98a (diff)
Merge commit 'v3.4-rc5' into android-3.4
Diffstat (limited to 'mm/hugetlb.c')
-rw-r--r--mm/hugetlb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index cd65cb19c94..5a16423a512 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -532,7 +532,7 @@ static struct page *dequeue_huge_page_vma(struct hstate *h,
struct vm_area_struct *vma,
unsigned long address, int avoid_reserve)
{
- struct page *page;
+ struct page *page = NULL;
struct mempolicy *mpol;
nodemask_t *nodemask;
struct zonelist *zonelist;