---

 memhotplug-dave/arch/i386/mm/init.c               |    2 +-
 memhotplug-dave/drivers/char/drm/drm_memory.c     |    6 +++---
 memhotplug-dave/include/asm-i386/pgtable-2level.h |    3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff -puN arch/i386/mm/init.c~i386-t41-warnings arch/i386/mm/init.c
--- memhotplug/arch/i386/mm/init.c~i386-t41-warnings	2004-12-01 11:46:45.000000000 -0800
+++ memhotplug-dave/arch/i386/mm/init.c	2004-12-01 11:47:17.000000000 -0800
@@ -824,7 +824,7 @@ void free_initmem(void)
 }
 
 #ifdef CONFIG_BLK_DEV_INITRD
-void free_initrd_mem(unsigned long start, unsigned long end)
+void free_initrd_mem(char *start, char *end)
 {
 	if (start < end)
 		printk (KERN_INFO "Freeing initrd memory: %ldk freed\n", (end - start) >> 10);
diff -puN arch/i386/mm/pageattr.c~i386-t41-warnings arch/i386/mm/pageattr.c
diff -puN include/asm-i386/pgtable-2level.h~i386-t41-warnings include/asm-i386/pgtable-2level.h
--- memhotplug/include/asm-i386/pgtable-2level.h~i386-t41-warnings	2004-12-01 11:48:49.000000000 -0800
+++ memhotplug-dave/include/asm-i386/pgtable-2level.h	2004-12-01 11:52:46.000000000 -0800
@@ -35,7 +35,8 @@ static inline int pgd_present(pgd_t pgd)
 #define pgd_page(pgd) \
 ((unsigned long) __va(pgd_val(pgd) & PAGE_MASK))
 
-static inline pmd_t * pmd_offset(pgd_t * dir, unsigned long address)
+#define pmd_offset(dir,address)	__pmd_offset(dir,(void *)address)
+static inline pmd_t * __pmd_offset(pgd_t * dir, void *address)
 {
 	return (pmd_t *) dir;
 }
diff -puN drivers/char/drm/drm_memory.c~i386-t41-warnings drivers/char/drm/drm_memory.c
--- memhotplug/drivers/char/drm/drm_memory.c~i386-t41-warnings	2004-12-01 11:54:25.000000000 -0800
+++ memhotplug-dave/drivers/char/drm/drm_memory.c	2004-12-01 12:35:42.000000000 -0800
@@ -102,17 +102,17 @@ void *drm_realloc(void *oldpt, size_t ol
  */
 unsigned long drm_alloc_pages(int order, int area)
 {
-	unsigned long address;
+	char *address;
 	unsigned long bytes	  = PAGE_SIZE << order;
 	unsigned long addr;
 	unsigned int  sz;
 
-	address = __get_free_pages(GFP_KERNEL, order);
+	address = (void *)__get_free_pages(GFP_KERNEL, order);
 	if (!address) 
 		return 0;
 
 				/* Zero */
-	memset((void *)address, 0, bytes);
+	memset(address, 0, bytes);
 
 				/* Reserve */
 	for (addr = address, sz = bytes;
diff -L char/drm/drm_memory.c -puN /dev/null /dev/null
_