← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to arch/powerpc/lib/alloc.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/powerpc/lib/alloc.c
6
6
 
7
7
#include <asm/system.h>
8
8
 
9
 
void * __init_refok alloc_maybe_bootmem(size_t size, gfp_t mask)
10
 
{
11
 
        if (mem_init_done)
12
 
                return kmalloc(size, mask);
13
 
        else
14
 
                return alloc_bootmem(size);
15
 
}
16
 
 
17
9
void * __init_refok zalloc_maybe_bootmem(size_t size, gfp_t mask)
18
10
{
19
11
        void *p;