X-Git-Url: http://git.samba.org/samba.git/?a=blobdiff_plain;f=arch%2Falpha%2Fkernel%2Fsetup.c;h=5d4c76a77a9f3edd9d8769f91c9425bb293bbbbe;hb=add8462a60421ca1b03a6864e295d22de532a5e7;hp=4b5b1b244f86a108bdda89f33316e84c77950df3;hpb=3c9bb6a639d0b2a45ef8aac1dd3581522814ad0c;p=sfrench%2Fcifs-2.6.git diff --git a/arch/alpha/kernel/setup.c b/arch/alpha/kernel/setup.c index 4b5b1b244f86..5d4c76a77a9f 100644 --- a/arch/alpha/kernel/setup.c +++ b/arch/alpha/kernel/setup.c @@ -293,7 +293,7 @@ move_initrd(unsigned long mem_limit) unsigned long size; size = initrd_end - initrd_start; - start = memblock_alloc_from(PAGE_ALIGN(size), PAGE_SIZE, 0); + start = memblock_alloc(PAGE_ALIGN(size), PAGE_SIZE); if (!start || __pa(start) + size > mem_limit) { initrd_start = initrd_end = 0; return NULL;