Re: Linux 2.4.23-rc1

From: glee
Date: Wed Nov 12 2003 - 01:51:39 EST


On Wed, Nov 12, 2003 at 07:19:09AM +0100, Willy Tarreau wrote:
> Hi,
>
> for me, -rc1 compiles correctly on Alpha, but I don't use agpgart. So I
> guess it's about your only problem here.
>


I think that we should wrap the msr.h include around a CONFIG_X86_MSR.

- g.


--- linux-2.4.22/drivers/char/agp/agpgart_be.c.orig 2003-11-12 14:16:40.000000000 +0800
+++ linux-2.4.22/drivers/char/agp/agpgart_be.c 2003-11-12 14:17:54.000000000 +0800
@@ -49,7 +49,10 @@
#include <asm/uaccess.h>
#include <asm/io.h>
#include <asm/page.h>
+
+#ifdef CONFIG_X86_MSR
#include <asm/msr.h>
+#endif

#include <linux/agp_backend.h>
#include "agp.h"