lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'v2.6.35-rc6' into devicetree/next

Browse Source 
Conflicts:
	arch/sparc/kernel/prom_64.c
This commit is contained in:
Grant Likely
2010-07-24 09:49:13 -06:00
parent 9e3288dc9a b37fa16e78
commit 4e4f62bf73
994 changed files with 10066 additions and 201378 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/sparc/kernel/prom_64.c
View File

@ -20,7 +20,7 @@
#include <linux/string.h>
#include <linux/mm.h>
#include <linux/module.h>
#include <linux/lmb.h>
#include <linux/memblock.h>
#include <linux/of.h>
#include <asm/prom.h>
@ -34,7 +34,7 @@
void * __init prom_early_alloc(unsigned long size)
{
unsigned long paddr = lmb_alloc(size, SMP_CACHE_BYTES);
unsigned long paddr = memblock_alloc(size, SMP_CACHE_BYTES);
void *ret;
if (!paddr) {