* linux-next: agp tree build failure
@ 2009-08-06 9:10 Stephen Rothwell
2009-08-06 9:39 ` David Woodhouse
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2009-08-06 9:10 UTC (permalink / raw)
To: Dave Airlie; +Cc: linux-next, linux-kernel, David Woodhouse
[-- Attachment #1: Type: text/plain, Size: 655 bytes --]
Hi Dave,
Today's linux-next build (powerpc allyesconfig) failed like this:
drivers/char/agp/uninorth-agp.c: In function 'uninorth_configure':
drivers/char/agp/uninorth-agp.c:138: error: 'struct agp_bridge_data' has no member named 'scratch_page_real'
Caused by commit c2980d8c2961113f24863f70d8ad016f55224c81 ("agp: Switch
agp_{un,}map_page() to take struct page * argument").
I have reverted that commit for today (and
6a12235c7d2d75c7d94b9afcaaecd422ff845ce0 ("agp: kill phys_to_gart() and
gart_to_phys()") which depends on it).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: linux-next: agp tree build failure
2009-08-06 9:10 linux-next: agp tree build failure Stephen Rothwell
@ 2009-08-06 9:39 ` David Woodhouse
0 siblings, 0 replies; 4+ messages in thread
From: David Woodhouse @ 2009-08-06 9:39 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Dave Airlie, linux-next@vger•kernel.org,
linux-kernel@vger•kernel.org
On Thu, 2009-08-06 at 02:10 -0700, Stephen Rothwell wrote:
> Today's linux-next build (powerpc allyesconfig) failed like this:
>
> drivers/char/agp/uninorth-agp.c: In function 'uninorth_configure':
> drivers/char/agp/uninorth-agp.c:138: error: 'struct agp_bridge_data' has no member named 'scratch_page_real'
>
> Caused by commit c2980d8c2961113f24863f70d8ad016f55224c81 ("agp: Switch
> agp_{un,}map_page() to take struct page * argument").
>
> I have reverted that commit for today (and
> 6a12235c7d2d75c7d94b9afcaaecd422ff845ce0 ("agp: kill phys_to_gart() and
> gart_to_phys()") which depends on it).
Oops, sorry -- I thought I'd dealt with that.
diff --git a/drivers/char/agp/uninorth-agp.c b/drivers/char/agp/uninorth-agp.c
index 2e99311..4317a55 100644
--- a/drivers/char/agp/uninorth-agp.c
+++ b/drivers/char/agp/uninorth-agp.c
@@ -135,7 +135,7 @@ static int uninorth_configure(void)
if (is_u3) {
pci_write_config_dword(agp_bridge->dev,
UNI_N_CFG_GART_DUMMY_PAGE,
- agp_bridge->scratch_page_real >> 12);
+ page_to_phys(agp_bridge->scratch_page_page) >> 12);
}
return 0;
--
David Woodhouse Open Source Technology Centre
David.Woodhouse@intel•com Intel Corporation
^ permalink raw reply related [flat|nested] 4+ messages in thread
* linux-next: agp tree build failure
@ 2010-01-01 0:03 Stephen Rothwell
2010-01-04 7:24 ` FUJITA Tomonori
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2010-01-01 0:03 UTC (permalink / raw)
To: Dave Airlie; +Cc: linux-next, LKML, FUJITA Tomonori, Andrew Morton
[-- Attachment #1: Type: text/plain, Size: 679 bytes --]
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 sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: linux-next: agp tree build failure
2010-01-01 0:03 Stephen Rothwell
@ 2010-01-04 7:24 ` FUJITA Tomonori
0 siblings, 0 replies; 4+ messages in thread
From: FUJITA Tomonori @ 2010-01-04 7:24 UTC (permalink / raw)
To: sfr; +Cc: airlied, linux-next, linux-kernel, fujita.tomonori, akpm
On Fri, 1 Jan 2010 11:03:27 +1100
Stephen Rothwell <sfr@canb•auug.org.au> 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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-01-04 7:24 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-08-06 9:10 linux-next: agp tree build failure Stephen Rothwell
2009-08-06 9:39 ` David Woodhouse
-- strict thread matches above, loose matches on Subject: below --
2010-01-01 0:03 Stephen Rothwell
2010-01-04 7:24 ` FUJITA Tomonori
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox