2007-02-16 06:10:01

by Zwane Mwaikambo

Subject: [PATCH] Fix modular AGPGART (ia64 allmodconfig)

My previous compat AGP patch broke modular AGPGART.

Test built on;

i386 CONFIG_AGP=y,m
x86_64 CONFIG_AGP=y
ia64 CONFIG_AGP=m

Signed-off-by: Zwane Mwaikambo <[email protected]>

Index: linux-2.6.20-mm1-ia64/drivers/char/agp/Makefile
===================================================================
RCS file: /home/cvsroot/linux-2.6.20-mm1/drivers/char/agp/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -B -r1.1.1.1 Makefile
--- linux-2.6.20-mm1-ia64/drivers/char/agp/Makefile 15 Feb 2007 17:35:27 -0000 1.1.1.1
+++ linux-2.6.20-mm1-ia64/drivers/char/agp/Makefile 16 Feb 2007 05:47:27 -0000
@@ -1,7 +1,10 @@
agpgart-y := backend.o frontend.o generic.o isoch.o

+ifeq ($(CONFIG_COMPAT),y)
+agpgart-y += compat_ioctl.o
+endif
+
obj-$(CONFIG_AGP) += agpgart.o
-obj-$(CONFIG_COMPAT) += compat_ioctl.o
obj-$(CONFIG_AGP_ALI) += ali-agp.o
obj-$(CONFIG_AGP_ATI) += ati-agp.o
obj-$(CONFIG_AGP_AMD) += amd-k7-agp.o

2007-02-16 06:23:27

by Kyle McMartin

Subject: Re: [PATCH] Fix modular AGPGART (ia64 allmodconfig)

On Thu, Feb 15, 2007 at 10:09:57PM -0800, Zwane Mwaikambo wrote:
> +ifeq ($(CONFIG_COMPAT),y)
> +agpgart-y += compat_ioctl.o
> +endif
> +

eh?

Couldn't this be?
agpgart-$(CONFIG_COMPAT) += compat_ioctl.o

Cheers,
Kyle M.

2007-02-16 06:45:48

by Zwane Mwaikambo

Subject: Re: [PATCH] Fix modular AGPGART (ia64 allmodconfig)

On Fri, 16 Feb 2007, Kyle McMartin wrote:

> On Thu, Feb 15, 2007 at 10:09:57PM -0800, Zwane Mwaikambo wrote:
> > +ifeq ($(CONFIG_COMPAT),y)
> > +agpgart-y += compat_ioctl.o
> > +endif
> > +
>
> eh?
>
> Couldn't this be?
> agpgart-$(CONFIG_COMPAT) += compat_ioctl.o

Yep thay works too and does look cleaner