← Back to branch summary

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

« back to all changes in this revision

Viewing changes to arch/unicore32/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/unicore32/include/asm/pgalloc.h
51
51
        struct page *pte;
52
52
 
53
53
        pte = alloc_pages(PGALLOC_GFP, 0);
54
 
        if (pte) {
55
 
                if (!PageHighMem(pte)) {
56
 
                        void *page = page_address(pte);
57
 
                        clean_dcache_area(page, PTRS_PER_PTE * sizeof(pte_t));
58
 
                }
59
 
                pgtable_page_ctor(pte);
 
54
        if (!pte)
 
55
                return NULL;
 
56
        if (!PageHighMem(pte)) {
 
57
                void *page = page_address(pte);
 
58
                clean_dcache_area(page, PTRS_PER_PTE * sizeof(pte_t));
 
59
        }
 
60
        if (!pgtable_page_ctor(pte)) {
 
61
                __free_page(pte);
60
62
        }
61
63
 
62
64
        return pte;