From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg Ungerer Subject: Re: [PATCH] m68knommu: change definitions of __pa() and __va() Date: Tue, 12 Jan 2010 19:45:02 +1000 Message-ID: <4B4C449E.5020207@snapgear.com> References: <201001120039.o0C0dboQ031390@goober.internal.moreton.com.au> <4B4C1E82.7000907@snapgear.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <4B4C1E82.7000907@snapgear.com> Sender: linux-kernel-owner@vger.kernel.org To: Linus Torvalds Cc: gerg@uclinux.org, linux-m68k@vger.kernel.org, linux-kernel@vger.kernel.org List-Id: linux-m68k@vger.kernel.org On 01/12/2010 05:02 PM, Greg Ungerer wrote: > Linus Torvalds wrote: >> On Tue, 12 Jan 2010, Greg Ungerer wrote: >>> +#else >>> +#define page_to_phys(page) ((page - mem_map) << PAGE_SHIFT) >>> +#define page_to_bus(page) ((page - mem_map) << PAGE_SHIFT) >>> +#endif >> >> Ok, so the old ones were total crap too, but when moving things >> around, don't just copy the crap like this. >> >> Look at those two #define's for five seconds, and ask yourself what is >> wrong with them. Those macros are not good. > > Ok. Easily fixed. > > page_to_bus() doesn't even look like it is used anywhere (and m68k > itself doesn't define it). So I'll remove it. > > I propose changing page_to_phys() to be: > > #define page_to_phys(page) (page_to_pfn(page) << PAGE_SHIFT) Hmmm, on second thoughts maybe that change is better left for the next merge window. Perhaps best to just fix that arg bracketization now? > Which seems consistent with many other arches. (And it works on > m68knommu too :-) > > I'll generate a new patch with that changed. > > A quick grep shows page_to_phys() defined this way in a couple of > other places too: > > h8300/include/asm/io.h > sparc/include/asm/io_32.h Strike that, only the h8300 one needs arg fixing. Regards Greg ------------------------------------------------------------------------ Greg Ungerer -- Principal Engineer EMAIL: gerg@snapgear.com SnapGear Group, McAfee PHONE: +61 7 3435 2888 8 Gardner Close, FAX: +61 7 3891 3630 Milton, QLD, 4064, Australia WEB: http://www.SnapGear.com