Re: [Xen-merge] [PATCH] merge i386's agp.h

["Jan Beulich" <JBeulich@xxxxxxxxxx>]

Sure, it can be done that way, but for small blocks of conditionals I
really wanted to avoid introducing endless new header files. Of course,
if you had a clear direction from Linus and/or Andrew that you should
reduce the conditionals to a minimum, then I'd even go further and say
let's not have a conditional at all and move the default definitions to
mach-default/mach_agp.h. What you recommend is sitting in the middle of
the two, and hence doesn't seem a really clean approach to me. Jan

>>> Christian Limpach <Christian.Limpach@xxxxxxxxxxxx> 22.12.05
16:08:20 >>>
On Tue, Dec 20, 2005 at 03:15:00PM +0100, Jan Beulich wrote:
> Subject says it all.

How about having a mach-{default,xen}/mach_agp.h file included at the
top
of agp.h with:

#define phys_to_gart(x) phys_to_machine(x)
#define gart_to_phys(x) machine_to_phys(x)
#define HAVE_MACH_PHYS_GART_MACROS

and then in asm-i386/agp.h:
/* Convert a physical address to an address suitable for the GART. */
#ifndef HAVE_MACH_PHYS_GART_MACROS
#define phys_to_gart(x) (x)
#define gart_to_phys(x) (x)
#endif

Same for the {alloc,free}_gatt_pages macros.

That would be my preference since it preserves the default definitions
in the regular file moving the overrides into machine specific files.

    christian


_______________________________________________
Xen-merge mailing list
Xen-merge@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-merge