diff -Nur linux-2.4.21-rc5/drivers/char/agp/agpgart_be.c linux-2.4.21-rc5.n/drivers/char/agp/agpgart_be.c
--- linux-2.4.21-rc5/drivers/char/agp/agpgart_be.c	Wed May 28 08:54:24 2003
+++ linux-2.4.21-rc5.n/drivers/char/agp/agpgart_be.c	Wed May 28 09:32:54 2003
@@ -577,7 +577,7 @@
 	for (page = virt_to_page(table); page <= virt_to_page(table_end); page++)
 		SetPageReserved(page);
 
-	agp_bridge.gatt_table_real = (unsigned long *) table;
+	agp_bridge.gatt_table_real = (u32 *) table;
 	agp_gatt_table = (void *)table;
 #ifdef CONFIG_X86
 	err = change_page_attr(virt_to_page(table), 1<<page_order, PAGE_KERNEL_NOCACHE);
diff -Nur linux-2.4.21-rc5/fs/ext2/balloc.c linux-2.4.21-rc5.n/fs/ext2/balloc.c
--- linux-2.4.21-rc5/fs/ext2/balloc.c	Wed May 28 08:54:37 2003
+++ linux-2.4.21-rc5.n/fs/ext2/balloc.c	Wed May 28 09:18:36 2003
@@ -520,7 +520,7 @@
 	    in_range (tmp, le32_to_cpu(gdp->bg_inode_table),
 		      EXT2_SB(sb)->s_itb_per_group)) {
 		ext2_error (sb, "ext2_new_block",
-			    "Allocating block in system zone - block = %lu",
+			    "Allocating block in system zone - block = %u",
 			    tmp);
 		ext2_set_bit(j, bh->b_data);
 		DQUOT_FREE_BLOCK(inode, 1);