diff options
author | Paul Mundt <lethal@linux-sh.org> | 2012-05-10 02:51:07 (GMT) |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2012-05-10 02:51:07 (GMT) |
commit | 15f99cbd071aa402e113d342448603344a337046 (patch) | |
tree | 56f98892d1bd38029988eb8931e2321ef7e79aa0 /mm/hugetlb.c | |
parent | b2212ea41dacda8cce0e7681a3a6ccc76c63802e (diff) | |
parent | 41797f75486d8ca3b98d7658c2a506ac7879a8e5 (diff) | |
download | linux-fsl-qoriq-15f99cbd071aa402e113d342448603344a337046.tar.xz |
Merge branch 'sh/rsk-updates' into sh-latest
Conflicts:
arch/sh/Kconfig
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'mm/hugetlb.c')
-rw-r--r-- | mm/hugetlb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/hugetlb.c b/mm/hugetlb.c index cd65cb1..5a16423 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; |