Index: fs/proc/base.c
===================================================================
RCS file: /var/cvs/uClinux-2.4.x/fs/proc/base.c,v
retrieving revision 1.5
diff -u -r1.5 base.c
--- fs/proc/base.c	2002/01/04 05:01:00	1.5
+++ fs/proc/base.c	2002/04/23 07:04:09
@@ -52,10 +52,10 @@
 
 static int proc_exe_link(struct inode *inode, struct dentry **dentry, struct vfsmount **mnt)
 {
-	struct mm_struct * mm;
-	struct vm_area_struct * vma;
 	int result = -ENOENT;
 #ifndef NO_MM /* DAVIDM - Some other time */
+	struct mm_struct * mm;
+	struct vm_area_struct * vma;
 	struct task_struct *task = inode->u.proc_i.task;
 
 	task_lock(task);
Index: fs/proc/kcore.c
===================================================================
RCS file: /var/cvs/uClinux-2.4.x/fs/proc/kcore.c,v
retrieving revision 1.3
diff -u -r1.3 kcore.c
--- fs/proc/kcore.c	2001/10/01 07:01:57	1.3
+++ fs/proc/kcore.c	2002/04/23 07:04:10
@@ -114,8 +114,11 @@
 
 static size_t get_kcore_size(int *num_vma, size_t *elf_buflen)
 {
-	size_t try, size;
+	size_t size;
+#ifndef NO_MM
+	size_t try;
 	struct vm_struct *m;
+#endif
 
 	*num_vma = 0;
 	size = ((size_t)high_memory - PAGE_OFFSET + PAGE_SIZE);
@@ -198,7 +201,9 @@
 	struct elfhdr *elf;
 	struct memelfnote notes[3];
 	off_t offset = 0;
+#ifndef NO_MM
 	struct vm_struct *m;
+#endif
 
 	/* setup ELF header */
 	elf = (struct elfhdr *) bufp;
Index: mmnommu/filemap.c
===================================================================
RCS file: /var/cvs/uClinux-2.4.x/mmnommu/filemap.c,v
retrieving revision 1.9
diff -u -r1.9 filemap.c
--- mmnommu/filemap.c	2002/01/04 05:01:09	1.9
+++ mmnommu/filemap.c	2002/04/23 07:04:45
@@ -3137,7 +3137,7 @@
 			__get_free_pages(GFP_ATOMIC, order);
 	} while(page_hash_table == NULL && --order > 0);
 
-	printk("Page-cache hash table entries: %d (order: %ld, %d bytes)\n",
+	printk("Page-cache hash table entries: %d (order: %lu, %lu bytes)\n",
 	       (1 << page_hash_bits), order, (PAGE_SIZE << order));
 	if (!page_hash_table)
 		panic("Failed to allocate page hash table\n");
Index: mmnommu/mmap.c
===================================================================
RCS file: /var/cvs/uClinux-2.4.x/mmnommu/mmap.c,v
retrieving revision 1.14
diff -u -r1.14 mmap.c
--- mmnommu/mmap.c	2002/04/11 00:04:30	1.14
+++ mmnommu/mmap.c	2002/04/23 07:04:46
@@ -1239,7 +1239,9 @@
 	unsigned long pgoff)
 {
 	void * result;
+#if 0
 	struct mm_struct * mm = current->mm;
+#endif
 	struct mm_tblock_struct * tblock;
 	unsigned int vm_flags;
 
Index: mmnommu/slab.c
===================================================================
RCS file: /var/cvs/uClinux-2.4.x/mmnommu/slab.c,v
retrieving revision 1.13
diff -u -r1.13 slab.c
--- mmnommu/slab.c	2002/03/04 23:38:33	1.13
+++ mmnommu/slab.c	2002/04/23 07:04:46
@@ -479,7 +479,7 @@
 		 * eliminates "false sharing".
 		 * Note for systems short on memory removing the alignment will
 		 * allow tighter packing of the smaller caches. */
-		sprintf(name,"size-%Zd", (unsigned long) sizes->cs_size);
+		sprintf(name,"size-%lu", (unsigned long) sizes->cs_size);
 		if (!(sizes->cs_cachep =
 			kmem_cache_create(name, sizes->cs_size,
 					0, SLAB_HWCACHE_ALIGN, NULL, NULL))) {
@@ -491,7 +491,7 @@
 			offslab_limit = sizes->cs_size-sizeof(slab_t);
 			offslab_limit /= 2;
 		}
-		sprintf(name, "size-%Zd(DMA)", (unsigned long) sizes->cs_size);
+		sprintf(name, "size-%lu(DMA)", (unsigned long) sizes->cs_size);
 		sizes->cs_dmacachep = kmem_cache_create(name, sizes->cs_size, 0,
 			      SLAB_CACHE_DMA|SLAB_HWCACHE_ALIGN, NULL, NULL);
 		if (!sizes->cs_dmacachep)