From patchwork Fri Oct 15 12:46:23 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Felipe Contreras <felipe.contreras@gmail.com>
X-Patchwork-Id: 256591
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 o9FDFm1c009343
	for <patchwork-omap@patchwork.kernel.org>;
	Fri, 15 Oct 2010 13:15:48 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1754845Ab0JONPr (ORCPT
	<rfc822;patchwork-omap@patchwork.kernel.org>);
	Fri, 15 Oct 2010 09:15:47 -0400
Received: from mail-bw0-f46.google.com ([209.85.214.46]:61800 "EHLO
	mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1754096Ab0JONPr (ORCPT
	<rfc822; linux-omap@vger.kernel.org>); Fri, 15 Oct 2010 09:15:47 -0400
Received: by bwz15 with SMTP id 15so894197bwz.19
	for <linux-omap@vger.kernel.org>;
	Fri, 15 Oct 2010 06:15:45 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
	h=domainkey-signature:received:received:from:to:cc:subject:date
	:message-id:x-mailer:in-reply-to:references;
	bh=1gy54niHCTr+b+D0iaXYwUZcYoeMmW7ieSkD7vTzYMM=;
	b=ckQvpQnHGNcl8nvb8/nZGbZ97s6KInVCuhzssWjD04K2A4NfPsMb2hDOiTFmeT/9It
	eRzpSKBGfoVG4nxFyMZFNd+7sT9CLIAFaMKD/zc/oAODtDnhNX3Y0w1SLnpgBXpR1eQN
	uIYrq139IdxT0V6wl6IUFPlR3lTTeKFSq9qLw=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;
	h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;
	b=p9nB3Q7c9+fRzcie7gD6nftZcCRC+utRAM6VOnEs27OHW940ybcjyEs3UoBqz3sa5V
	WJZwpAsb0fpNUB5k8gdSGv94XbDqD6aiuJlNx0dnmAQhzgknzvrGaoiy0B3ZatQzkWB0
	uMLl9UdqjwGE3CaDOnaijLwCsCR6TIxJ2cmGU=
Received: by 10.204.46.33 with SMTP id h33mr730651bkf.95.1287146798165;
	Fri, 15 Oct 2010 05:46:38 -0700 (PDT)
Received: from localhost (a91-153-253-80.elisa-laajakaista.fi
	[91.153.253.80]) by mx.google.com with ESMTPS id
	t10sm6705811bkj.16.2010.10.15.05.46.36
	(version=TLSv1/SSLv3 cipher=RC4-MD5);
	Fri, 15 Oct 2010 05:46:37 -0700 (PDT)
From: Felipe Contreras <felipe.contreras@gmail.com>
To: linux-arm <linux-arm-kernel@lists.infradead.org>,
	linux-omap <linux-omap@vger.kernel.org>
Cc: Tomi Valkeinen <tomi.valkeinen@nokia.com>,
	Ameya Palande <ameya.palande@nokia.com>, mike@compulab.co.il,
	Russell King <linux@arm.linux.org.uk>,
	Felipe Contreras <felipe.contreras@gmail.com>
Subject: [PATCH 1/2] video: omap: vram: remove from normal memory
Date: Fri, 15 Oct 2010 15:46:23 +0300
Message-Id: <1287146784-5517-1-git-send-email-felipe.contreras@gmail.com>
X-Mailer: git-send-email 1.7.3.1.2.g7fe2b
In-Reply-To: <AANLkTik_6byuzkZ+mKunTi6HJTHu49C4XGebfTjCaEeE@mail.gmail.com>
References: <AANLkTik_6byuzkZ+mKunTi6HJTHu49C4XGebfTjCaEeE@mail.gmail.com>
Sender: linux-omap-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-omap.vger.kernel.org>
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]);
	Fri, 15 Oct 2010 13:15:48 +0000 (UTC)


diff --git a/drivers/video/omap2/vram.c b/drivers/video/omap2/vram.c
index f6fdc20..1a99777 100644
--- a/drivers/video/omap2/vram.c
+++ b/drivers/video/omap2/vram.c
@@ -575,6 +575,8 @@ void __init omap_vram_reserve_sdram_memblock(void)
 		}
 	} else {
 		paddr = memblock_alloc_base(size, PAGE_SIZE, MEMBLOCK_REAL_LIMIT);
+		memblock_free(paddr, size);
+		memblock_remove(paddr, size);
 	}
 
 	omap_vram_add_region(paddr, size);