From patchwork Thu Dec 2 21:14:21 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Russell King - ARM Linux X-Patchwork-Id: 375941 X-Patchwork-Delegate: tomi.valkeinen@nokia.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oB2LEdBx013739 for ; Thu, 2 Dec 2010 21:14:39 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757575Ab0LBVOh (ORCPT ); Thu, 2 Dec 2010 16:14:37 -0500 Received: from caramon.arm.linux.org.uk ([78.32.30.218]:52742 "EHLO caramon.arm.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754095Ab0LBVOh (ORCPT ); Thu, 2 Dec 2010 16:14:37 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=arm.linux.org.uk; s=caramon; h=Date:From:To:Subject:Message-ID: MIME-Version:Content-Type:Content-Transfer-Encoding:Sender; bh=k 0suMuXX9MVpFKqDHQU/UPfXZxoJ+tRfi//ohJZKrvE=; b=ofrY8eOquXCKR9q3L Pr5qBJuuMcvl17SqnhNnvbicgNIw88OQ3SJ1O98wbYsUMq1nqjHMx3e75lg9ztPi NrnKU8loC0mF7mTFNKzMPaYuTJLS0FbXJvL9l0eRfkikGGz72OL8u+Gt49ysaxUI 6Yyg/g2ioawRhGCMy6Cx/yh1Zo= Received: from n2100.arm.linux.org.uk ([2002:4e20:1eda:1:214:fdff:fe10:4f86]) by caramon.arm.linux.org.uk with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.69) (envelope-from ) id 1POGTv-0003Dm-5x; Thu, 02 Dec 2010 21:14:23 +0000 Received: from linux by n2100.arm.linux.org.uk with local (Exim 4.69) (envelope-from ) id 1POGTt-0005u2-S9; Thu, 02 Dec 2010 21:14:21 +0000 Date: Thu, 2 Dec 2010 21:14:21 +0000 From: Russell King - ARM Linux To: linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org Subject: Mainline OMAP3 breakage (and other OMAP?) Message-ID: <20101202211421.GG10461@n2100.arm.linux.org.uk> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.19 (2009-01-05) Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Thu, 02 Dec 2010 21:15:00 +0000 (UTC) diff --git a/drivers/video/omap2/vram.c b/drivers/video/omap2/vram.c index fed2a72..a8973f0 100644 --- a/drivers/video/omap2/vram.c +++ b/drivers/video/omap2/vram.c @@ -570,7 +570,7 @@ void __init omap_vram_reserve_sdram_memblock(void) return; } } else { - paddr = memblock_alloc_base(size, PAGE_SIZE, MEMBLOCK_REAL_LIMIT); + paddr = memblock_alloc(size, PAGE_SIZE); } omap_vram_add_region(paddr, size);