* linux-next: build failure after final merge (arm tree)
@ 2010-02-19 6:39 Stephen Rothwell
2010-02-19 8:22 ` Russell King
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2010-02-19 6:39 UTC (permalink / raw)
To: Russell King; +Cc: linux-next, linux-kernel, David Miller
Hi Russell,
After merging the scsi-post-merge tree, today's linux-next build (sparc32
defconfig) failed like this:
arch/sparc/mm/sun4c.c: In function 'sun4c_update_mmu_cache':
arch/sparc/mm/sun4c.c:1943: error: 'pte' undeclared (first use
in this function)
Caused by commit 2dca0ca96ac340fbf4f9e0741dcf58ff3677e994 ("MM: Pass a
PTE pointer to update_mmu_cache() rather than the PTE itself").
I applied the following patch for today. It may not be correct.
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Fri, 19 Feb 2010 17:33:16 +1100
Subject: [PATCH] sparc: fix fallout from update_mmu_cache API change
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
arch/sparc/mm/sun4c.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/sparc/mm/sun4c.c b/arch/sparc/mm/sun4c.c
index 171f823..1865253 100644
--- a/arch/sparc/mm/sun4c.c
+++ b/arch/sparc/mm/sun4c.c
@@ -1929,7 +1929,7 @@ void sun4c_update_mmu_cache(struct vm_area_struct *vma, unsigned long address, p
start += PAGE_SIZE;
}
#ifndef SUN4C_PRELOAD_PSEG
- sun4c_put_pte(address, pte_val(pte));
+ sun4c_put_pte(address, pte_val(*ptep));
#endif
local_irq_restore(flags);
return;
@@ -1940,7 +1940,7 @@ void sun4c_update_mmu_cache(struct vm_area_struct *vma, unsigned long address, p
add_lru(entry);
}
- sun4c_put_pte(address, pte_val(pte));
+ sun4c_put_pte(address, pte_val(*ptep));
local_irq_restore(flags);
}
--
1.6.6.2
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: linux-next: build failure after final merge (arm tree)
2010-02-19 6:39 linux-next: build failure after final merge (arm tree) Stephen Rothwell
@ 2010-02-19 8:22 ` Russell King
2010-02-19 8:46 ` Stephen Rothwell
0 siblings, 1 reply; 3+ messages in thread
From: Russell King @ 2010-02-19 8:22 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, David Miller
On Fri, Feb 19, 2010 at 05:39:29PM +1100, Stephen Rothwell wrote:
> Hi Russell,
>
> After merging the scsi-post-merge tree, today's linux-next build (sparc32
> defconfig) failed like this:
>
> arch/sparc/mm/sun4c.c: In function 'sun4c_update_mmu_cache':
> arch/sparc/mm/sun4c.c:1943: error: 'pte' undeclared (first use
> in this function)
Damn.
> Caused by commit 2dca0ca96ac340fbf4f9e0741dcf58ff3677e994 ("MM: Pass a
> PTE pointer to update_mmu_cache() rather than the PTE itself").
>
> I applied the following patch for today. It may not be correct.
It looks correct to me - I'll merge it into the original commit tonight
unless David provides me with an alternative patch.
Thanks.
--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of:
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-02-19 8:46 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-02-19 6:39 linux-next: build failure after final merge (arm tree) Stephen Rothwell
2010-02-19 8:22 ` Russell King
2010-02-19 8:46 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox