linux-kernel - Re: linux-next: agp tree build failure

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-Id: <1249551542.568.4.camel@macbook.infradead.org>
Date:	Thu, 06 Aug 2009 10:39:02 +0100
From:	David Woodhouse <dwmw2@...radead.org>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Dave Airlie <airlied@...ux.ie>,
	"linux-next@...r.kernel.org" <linux-next@...r.kernel.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: Re: linux-next: agp tree build failure

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@...el.com                              Intel Corporation

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/