diff -Naur -X exclude-files ac_cur/arch/um/include/user_util.h ac/arch/um/include/user_util.h
--- ac_cur/arch/um/include/user_util.h Sat Nov 3 00:47:11 2001
+++ ac/arch/um/include/user_util.h Sat Nov 3 00:47:33 2001
@@ -28,7 +28,7 @@
extern unsigned long low_physmem;
extern unsigned long high_physmem;
-extern unsigned long physmem;
+extern unsigned long uml_physmem;
extern unsigned long end_vm;
extern unsigned long start_vm;
diff -Naur -X exclude-files ac_cur/arch/um/kernel/exec_kern.c ac/arch/um/kernel/exec_kern.c
--- ac_cur/arch/um/kernel/exec_kern.c Sat Nov 3 00:47:11 2001
+++ ac/arch/um/kernel/exec_kern.c Sat Nov 3 00:47:33 2001
@@ -59,7 +59,7 @@
current->thread.extern_pid = new_pid;
free_page(stack);
- protect(physmem, high_physmem - physmem, 1, 1, 0);
+ protect(uml_physmem, high_physmem - uml_physmem, 1, 1, 0);
task_protections((unsigned long) current);
force_flush_all();
unblock_signals();
diff -Naur -X exclude-files ac_cur/arch/um/kernel/ksyms.c ac/arch/um/kernel/ksyms.c
--- ac_cur/arch/um/kernel/ksyms.c Sat Nov 3 00:47:11 2001
+++ ac/arch/um/kernel/ksyms.c Sat Nov 3 00:47:33 2001
@@ -10,7 +10,7 @@
EXPORT_SYMBOL(stop);
EXPORT_SYMBOL(strtok);
-EXPORT_SYMBOL(physmem);
+EXPORT_SYMBOL(uml_physmem);
EXPORT_SYMBOL(current_task);
EXPORT_SYMBOL(set_signals);
EXPORT_SYMBOL(kernel_thread);
diff -Naur -X exclude-files ac_cur/arch/um/kernel/mem.c ac/arch/um/kernel/mem.c
--- ac_cur/arch/um/kernel/mem.c Sat Nov 3 00:47:11 2001
+++ ac/arch/um/kernel/mem.c Sat Nov 3 00:47:33 2001
@@ -66,7 +66,7 @@
for(i=0;i<sizeof(zones_size)/sizeof(zones_size[0]);i++)
zones_size[i] = 0;
zones_size[1] = (high_physmem >> PAGE_SHIFT) -
- (physmem >> PAGE_SHIFT) - zones_size[0];
+ (uml_physmem >> PAGE_SHIFT) - zones_size[0];
free_area_init(zones_size);
}
diff -Naur -X exclude-files ac_cur/arch/um/kernel/process_kern.c ac/arch/um/kernel/process_kern.c
--- ac_cur/arch/um/kernel/process_kern.c Sat Nov 3 00:47:11 2001
+++ ac/arch/um/kernel/process_kern.c Sat Nov 3 00:47:33 2001
@@ -498,7 +498,7 @@
{
force_flush_all();
if(current->mm != current->p_pptr->mm)
- protect(physmem, high_physmem - physmem, 1, 1, 0);
+ protect(uml_physmem, high_physmem - uml_physmem, 1, 1, 0);
task_protections((unsigned long) current);
if(current->thread.request.u.fork_finish.from)
schedule_tail(current->thread.request.u.fork_finish.from);
@@ -744,7 +744,7 @@
if(current_task == &init_task) return;
start_stack = (unsigned long) current + PAGE_SIZE;
end_stack = (unsigned long) current + PAGE_SIZE * 4;
- protect(physmem, start_stack - physmem, 1, 1, 1);
+ protect(uml_physmem, start_stack - uml_physmem, 1, 1, 1);
protect(end_stack, high_physmem - end_stack, 1, 1, 1);
}
@@ -755,7 +755,7 @@
if(current_task == &init_task) return;
start_stack = (unsigned long) current + PAGE_SIZE;
end_stack = (unsigned long) current + PAGE_SIZE * 4;
- protect(physmem, start_stack - physmem, 1, 0, 1);
+ protect(uml_physmem, start_stack - uml_physmem, 1, 0, 1);
protect(end_stack, high_physmem - end_stack, 1, 0, 1);
}
diff -Naur -X exclude-files ac_cur/arch/um/kernel/um_arch.c ac/arch/um/kernel/um_arch.c
--- ac_cur/arch/um/kernel/um_arch.c Sat Nov 3 00:47:11 2001
+++ ac/arch/um/kernel/um_arch.c Sat Nov 3 00:47:33 2001
@@ -114,7 +114,7 @@
#define START 0xa0000000
#endif
-unsigned long physmem;
+unsigned long uml_physmem;
unsigned long start_vm;
unsigned long end_vm;
@@ -233,7 +233,7 @@
remap_data(ROUND_DOWN(&__bss_start), ROUND_UP(brk_start));
/* Start physical memory at least 4M after the current brk */
- physmem = ROUND_4M(brk_start) + (1 << 22);
+ uml_physmem = ROUND_4M(brk_start) + (1 << 22);
/* Create fake command line from argv[]. */
have_root = 0;
@@ -299,7 +299,7 @@
* of physical memory or the remaining space left in the kernel
* area of the address space, whichever is smaller.
*/
- start_vm = physmem + physmem_size + VMALLOC_OFFSET;
+ start_vm = uml_physmem + physmem_size + VMALLOC_OFFSET;
if(start_vm >= get_kmem_end())
panic("Physical memory too large to allow any kernel "
"virtual memory");
@@ -313,16 +313,16 @@
printk(KERN_INFO "Kernel virtual memory size shrunk to %ld "
"bytes\n", virtmem_size);
- setup_range(-1, NULL, physmem, physmem_size,
+ setup_range(-1, NULL, uml_physmem, physmem_size,
physmem_size + VMALLOC_OFFSET + virtmem_size);
setup_memory();
- high_physmem = physmem + physmem_size;
+ high_physmem = uml_physmem + physmem_size;
- start_pfn = PFN_UP(__pa(physmem));
+ start_pfn = PFN_UP(__pa(uml_physmem));
end_pfn = PFN_DOWN(__pa(high_physmem));
bootmap_size = init_bootmem(start_pfn, end_pfn - start_pfn);
- free_bootmem(__pa(physmem) + bootmap_size,
- high_physmem - physmem - bootmap_size);
+ free_bootmem(__pa(uml_physmem) + bootmap_size,
+ high_physmem - uml_physmem - bootmap_size);
#ifdef CONFIG_BLK_DEV_INITRD
if(initrd != NULL) read_initrd(initrd);
diff -Naur -X exclude-files ac_cur/include/asm-um/dma.h ac/include/asm-um/dma.h
--- ac_cur/include/asm-um/dma.h Sat Nov 3 00:47:11 2001
+++ ac/include/asm-um/dma.h Sat Nov 3 00:47:33 2001
@@ -5,6 +5,6 @@
#undef MAX_DMA_ADDRESS
-#define MAX_DMA_ADDRESS (physmem)
+#define MAX_DMA_ADDRESS (uml_physmem)
#endif
diff -Naur -X exclude-files ac_cur/include/asm-um/page.h ac/include/asm-um/page.h
--- ac_cur/include/asm-um/page.h Sat Nov 3 00:47:11 2001
+++ ac/include/asm-um/page.h Sat Nov 3 00:47:33 2001
@@ -27,12 +27,12 @@
#endif /* __ASSEMBLY__ */
-extern unsigned long physmem;
+extern unsigned long uml_physmem;
#define __va_space (8*1024*1024)
-#define __pa(x) ((unsigned long) (x) - (physmem))
-#define __va(x) ((void *) ((unsigned long) (x) + (physmem)))
+#define __pa(x) ((unsigned long) (x) - (uml_physmem))
+#define __va(x) ((void *) ((unsigned long) (x) + (uml_physmem)))
#define virt_to_page(kaddr) (mem_map + (__pa(kaddr) >> PAGE_SHIFT))
#define VALID_PAGE(page) ((page - mem_map) < max_mapnr)
diff -Naur -X exclude-files ac_cur/include/asm-um/uaccess.h ac/include/asm-um/uaccess.h
--- ac_cur/include/asm-um/uaccess.h Sat Nov 3 00:47:11 2001
+++ ac/include/asm-um/uaccess.h Sat Nov 3 00:47:33 2001
@@ -35,7 +35,7 @@
#define set_fs(x) (current->addr_limit = (x))
extern unsigned long end_vm;
-extern unsigned long physmem;
+extern unsigned long uml_physmem;
#define under_task_size(addr, size) \
(((unsigned long) (addr) < TASK_SIZE) && \