From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751293AbVKLEeM (ORCPT ); Fri, 11 Nov 2005 23:34:12 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751294AbVKLEeM (ORCPT ); Fri, 11 Nov 2005 23:34:12 -0500 Received: from mailout.stusta.mhn.de ([141.84.69.5]:777 "HELO mailout.stusta.mhn.de") by vger.kernel.org with SMTP id S1751293AbVKLEeM (ORCPT ); Fri, 11 Nov 2005 23:34:12 -0500 Date: Sat, 12 Nov 2005 05:34:06 +0100 From: Adrian Bunk To: Andrew Morton Cc: linux-kernel@vger.kernel.org Subject: [2.6 patch] mark virt_to_bus/bus_to_virt as __deprecated on i386 Message-ID: <20051112043406.GW5376@stusta.de> References: <20051107200336.GH3847@stusta.de> <20051110042857.38b4635b.akpm@osdl.org> <20051111021258.GK5376@stusta.de> <20051110182443.514622ed.akpm@osdl.org> <20051111201849.GP5376@stusta.de> <20051111202005.GQ5376@stusta.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20051111202005.GQ5376@stusta.de> User-Agent: Mutt/1.5.11 Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org virt_to_bus/bus_to_virt are long deprecated, mark them as __deprecated on i386. Signed-off-by: Adrian Bunk --- linux-2.6.14-mm2-full/include/asm-i386/io.h.old 2005-11-12 01:44:38.000000000 +0100 +++ linux-2.6.14-mm2-full/include/asm-i386/io.h 2005-11-12 01:45:58.000000000 +0100 @@ -144,8 +144,14 @@ * * Allow them on x86 for legacy drivers, though. */ -#define virt_to_bus virt_to_phys -#define bus_to_virt phys_to_virt +static inline unsigned long __deprecated virt_to_bus(volatile void * address) +{ + return __pa(address); +} +static inline void * __deprecated bus_to_virt(unsigned long address) +{ + return __va(address); +} /* * readX/writeX() are used to access memory mapped devices. On some