Re: 2.6.16-rc1-mm4

[Muli Ben-Yehuda]

On Sun, Jan 29, 2006 at 02:45:33PM -0800, Andrew Morton wrote:
> 
>
ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.16-rc1/2.6.16-rc1-mm4/

IA64 defconfig breaks with:

  CC      arch/ia64/sn/pci/tioce_provider.o
/home/muli/kernel/common-swiotlb/mm4.swiotlb/arch/ia64/sn/pci/tioce_provider.c:721:32:
macro "ATE_MAKE" requires 3 arguments, but only 2 given
/home/muli/kernel/common-swiotlb/mm4.swiotlb/arch/ia64/sn/pci/tioce_provider.c:
In function `tioce_reserve_m32':

Attached patch fixes it. Mark, looks like it's your Altix MSI support
patch (http://patchwork.ozlabs.org/linuxppc64/patch?id=4231) that
broke it. Is the fix correct?

Signed-off-by: Muli Ben-Yehuda <mulix@xxxxxxxxx>

diff -Naurp --exclude-from /home/muli/w/dontdiff mm4.orig/arch/ia64/sn/pci/tioce_provider.c mm4.ate/arch/ia64/sn/pci/tioce_provider.c
--- mm4.orig/arch/ia64/sn/pci/tioce_provider.c	2006-01-30 10:34:57.000000000 +0200
+++ mm4.ate/arch/ia64/sn/pci/tioce_provider.c	2006-01-30 11:27:58.000000000 +0200
@@ -717,7 +717,7 @@ tioce_reserve_m32(struct tioce_kernel *c
 	while (ate_index <= last_ate) {
 		u64 ate;
 
-		ate = ATE_MAKE(0xdeadbeef, ps);
+		ate = ATE_MAKE(0xdeadbeef, ps, 0);
 		ce_kern->ce_ate3240_shadow[ate_index] = ate;
 		tioce_mmr_storei(ce_kern, &ce_mmr->ce_ure_ate3240[ate_index],
 				 ate);


-- 
Muli Ben-Yehuda
http://www.mulix.org | http://mulix.livejournal.com/

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