2010-01-01 00:03:51

by Stephen Rothwell

[permalink] [raw]
Subject: linux-next: agp tree build failure

Hi all,

Today's linux-next build (x86_64 allmodconfig) failed like this:

drivers/char/agp/amd64-agp.c: In function '__exittest':
drivers/char/agp/amd64-agp.c:782: error: 'agp_amd64_cleanup' undeclared (first use in this function)

Caused by commit f405d2c02395a74d3883bd03ded36457aa3697ad ("x86/agp: Fix
agp_amd64_init() initialization with CONFIG_GART_IOMMU enabled") from the
origin tree interacting with commit
e85c5c6542528aba88a5d811652cf0e2d44f7f07 ("drivers/char/agp/amd64-agp.c:
squish warning") from the agp tree.

I reverted the agp tree commit.
--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/


Attachments:
(No filename) (661.00 B)
(No filename) (198.00 B)
Download all attachments

2010-01-04 07:24:46

by FUJITA Tomonori

[permalink] [raw]
Subject: Re: linux-next: agp tree build failure

On Fri, 1 Jan 2010 11:03:27 +1100
Stephen Rothwell <[email protected]> wrote:

> Today's linux-next build (x86_64 allmodconfig) failed like this:
>
> drivers/char/agp/amd64-agp.c: In function '__exittest':
> drivers/char/agp/amd64-agp.c:782: error: 'agp_amd64_cleanup' undeclared (first use in this function)
>
> Caused by commit f405d2c02395a74d3883bd03ded36457aa3697ad ("x86/agp: Fix
> agp_amd64_init() initialization with CONFIG_GART_IOMMU enabled") from the
> origin tree interacting with commit
> e85c5c6542528aba88a5d811652cf0e2d44f7f07 ("drivers/char/agp/amd64-agp.c:
> squish warning") from the agp tree.

The former patch was already merged to fix:

http://marc.info/?l=linux-kernel&m=126192729110083&w=2

I think that the latter commit in agp tree isn't necessary since with
the former patch, agp_amd64_cleanup is necessary even with
CONFIG_GART_IOMMU enabled.

But the former patch added another bug. I've just posted a fix for
it. Sorry about that.

http://marc.info/?l=linux-kernel&m=126258945607963&w=2