diff options
| author | Joerg Roedel <joerg.roedel@amd.com> | 2009-06-09 04:50:57 -0400 |
|---|---|---|
| committer | Joerg Roedel <joerg.roedel@amd.com> | 2009-06-09 04:50:57 -0400 |
| commit | d2dd01de9924ae24afeba5aa5bc2e08287701df6 (patch) | |
| tree | 3021bf496579a48984666355b59df5e44b42dd32 /arch/powerpc/include/asm/system.h | |
| parent | 367d04c4ec02dad34d80452e32e3370db7fb6fee (diff) | |
| parent | 62a6f465f6572e1f28765c583c12753bb3e23715 (diff) | |
Merge commit 'tip/core/iommu' into amd-iommu/fixes
Diffstat (limited to 'arch/powerpc/include/asm/system.h')
| -rw-r--r-- | arch/powerpc/include/asm/system.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/system.h b/arch/powerpc/include/asm/system.h index f612798e1c93..2b2420a49884 100644 --- a/arch/powerpc/include/asm/system.h +++ b/arch/powerpc/include/asm/system.h | |||
| @@ -212,7 +212,7 @@ extern struct task_struct *_switch(struct thread_struct *prev, | |||
| 212 | extern unsigned int rtas_data; | 212 | extern unsigned int rtas_data; |
| 213 | extern int mem_init_done; /* set on boot once kmalloc can be called */ | 213 | extern int mem_init_done; /* set on boot once kmalloc can be called */ |
| 214 | extern int init_bootmem_done; /* set on !NUMA once bootmem is available */ | 214 | extern int init_bootmem_done; /* set on !NUMA once bootmem is available */ |
| 215 | extern unsigned long memory_limit; | 215 | extern phys_addr_t memory_limit; |
| 216 | extern unsigned long klimit; | 216 | extern unsigned long klimit; |
| 217 | 217 | ||
| 218 | extern void *alloc_maybe_bootmem(size_t size, gfp_t mask); | 218 | extern void *alloc_maybe_bootmem(size_t size, gfp_t mask); |