---

 memhotplug-dave/include/asm-i386/highmem.h |    2 +-
 memhotplug-dave/ipc/shm.c                  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff -puN arch/i386/mm/highmem.c~mm5-numaq-compile arch/i386/mm/highmem.c
diff -puN include/asm-i386/highmem.h~mm5-numaq-compile include/asm-i386/highmem.h
--- memhotplug/include/asm-i386/highmem.h~mm5-numaq-compile	2004-11-12 09:20:55.000000000 -0800
+++ memhotplug-dave/include/asm-i386/highmem.h	2004-11-12 09:23:13.000000000 -0800
@@ -62,7 +62,7 @@ void kunmap(struct page *page);
 char *kmap_atomic(struct page *page, enum km_type type);
 void kunmap_atomic(char *kvaddr, enum km_type type);
 char *kmap_atomic_pfn(unsigned long pfn, enum km_type type);
-struct page *kmap_atomic_to_page(void *ptr);
+struct page *kmap_atomic_to_page(char *ptr);
 
 #define flush_cache_kmaps()	do { } while (0)
 
diff -puN ipc/shm.c~mm5-numaq-compile ipc/shm.c
--- memhotplug/ipc/shm.c~mm5-numaq-compile	2004-11-12 09:24:01.000000000 -0800
+++ memhotplug-dave/ipc/shm.c	2004-11-12 09:24:17.000000000 -0800
@@ -167,7 +167,7 @@ static struct vm_operations_struct shm_v
 	.open	= shm_open,	/* callback for a new vm-area open */
 	.close	= shm_close,	/* callback for when the vm-area is released */
 	.nopage	= shmem_nopage,
-#ifdef CONFIG_NUMA
+#if defined(CONFIG_NUMA) && defined(CONFIG_SHMEM)
 	.set_policy = shmem_set_policy,
 	.get_policy = shmem_get_policy,
 #endif
_