← Back to branch summary

~ubuntu-branches/debian/experimental/linux-tools/experimental

« back to all changes in this revision

Viewing changes to arch/cris/include/asm/pgalloc.h

  • Committer: Package Import Robot
  • Author(s): Ben Hutchings
  • Date: 2014-02-02 16:57:49 UTC
  • mfrom: (1.1.10) (0.1.21 sid)
  • Revision ID: package-import@ubuntu.com-20140202165749-tw94o9t1t0a8txk6
Tags: 3.13-1~exp2
Merge changes from sid up to 3.12.6-3

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/cris/include/asm/pgalloc.h
32
32
{
33
33
        struct page *pte;
34
34
        pte = alloc_pages(GFP_KERNEL|__GFP_REPEAT|__GFP_ZERO, 0);
35
 
        pgtable_page_ctor(pte);
 
35
        if (!pte)
 
36
                return NULL;
 
37
        if (!pgtable_page_ctor(pte)) {
 
38
                __free_page(pte);
 
39
                return NULL;
 
40
        }
36
41
        return pte;
37
42
}
38
43