Merge with Linux 2.4.0-test12.

3 files changed, 16 insertions, 41 deletions

diff --git a/include/asm-arm/arch-rpc/memory.h b/include/asm-arm/arch-rpc/memory.h
index 2b3899173..cf562f87f 100644
--- a/include/asm-arm/arch-rpc/memory.h
+++ b/include/asm-arm/arch-rpc/memory.h
@@ -25,6 +25,12 @@
 #define TASK_SIZE_26	(0x04000000UL)
 
 /*
+ * This decides where the kernel will search for a free chunk of vm
+ * space during mmap's.
+ */
+#define TASK_UNMAPPED_BASE (TASK_SIZE / 3)
+
+/*
  * Page offset: 3GB
  */
 #define PAGE_OFFSET	(0xc0000000UL)
diff --git a/include/asm-arm/arch-rpc/processor.h b/include/asm-arm/arch-rpc/processor.h
deleted file mode 100644
index b64eaebfc..000000000
--- a/include/asm-arm/arch-rpc/processor.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- *  linux/include/asm-arm/arch-rpc/processor.h
- *
- *  Copyright (C) 1996-1999 Russell King.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- *  Changelog:
- *   10-Sep-1996 RMK	Created
- *   21-Mar-1999 RMK	Added asm/arch/memory.h
- */
-
-#ifndef __ASM_ARCH_PROCESSOR_H
-#define __ASM_ARCH_PROCESSOR_H
-
-/*
- * Bus types
- */
-#define EISA_bus 0
-#define EISA_bus__is_a_macro /* for versions in ksyms.c */
-#define MCA_bus 0
-#define MCA_bus__is_a_macro /* for versions in ksyms.c */
-
-/* This decides where the kernel will search for a free chunk of vm
- * space during mmap's.
- */
-#define TASK_UNMAPPED_BASE (TASK_SIZE / 3)
-
-#endif
diff --git a/include/asm-arm/arch-rpc/uncompress.h b/include/asm-arm/arch-rpc/uncompress.h
index 0834d287e..dde1bfc7a 100644
--- a/include/asm-arm/arch-rpc/uncompress.h
+++ b/include/asm-arm/arch-rpc/uncompress.h
@@ -56,7 +56,7 @@ static const unsigned long palette_4[16] = {
 #define palette_setpixel(p)	*(unsigned long *)(IO_START+0x00400000) = 0x10000000|((p) & 255)
 #define palette_write(v)	*(unsigned long *)(IO_START+0x00400000) = 0x00000000|((v) & 0x00ffffff)
 
-static struct param_struct * const params = (struct param_struct *)Z_PARAMS_BASE;
+extern struct param_struct params;
 
 #ifndef STANDALONE_DEBUG 
 /*
@@ -69,8 +69,8 @@ static void puts(const char *s)
 	unsigned char c;
 	char *ptr;
 
-	x = params->video_x;
-	y = params->video_y;
+	x = params.video_x;
+	y = params.video_y;
 
 	while ( ( c = *(unsigned char *)s++ ) != '\0' ) {
 		if ( c == '\n' ) {
@@ -79,7 +79,7 @@ static void puts(const char *s)
 				y--;
 			}
 		} else {
-			ptr = VIDMEM + ((y*video_num_columns*params->bytes_per_char_v+x)*bytes_per_char_h);
+			ptr = VIDMEM + ((y*video_num_columns*params.bytes_per_char_v+x)*bytes_per_char_h);
 			ll_write_char(ptr, c|(white<<16));
 			if ( ++x >= video_num_columns ) {
 				x = 0;
@@ -90,8 +90,8 @@ static void puts(const char *s)
 		}
 	}
 
-	params->video_x = x;
-	params->video_y = y;
+	params.video_x = x;
+	params.video_y = y;
 }
 
 static void error(char *x);
@@ -103,9 +103,9 @@ static void arch_decomp_setup(void)
 {
 	int i;
 	
-	video_num_lines = params->video_num_rows;
-	video_num_columns = params->video_num_cols;
-	bytes_per_char_h = params->bytes_per_char_h;
+	video_num_lines = params.video_num_rows;
+	video_num_columns = params.video_num_cols;
+	bytes_per_char_h = params.bytes_per_char_h;
 	video_size_row = video_num_columns * bytes_per_char_h;
 	if (bytes_per_char_h == 4)
 		for (i = 0; i < 256; i++)
@@ -140,7 +140,7 @@ static void arch_decomp_setup(void)
 		white = 7;
 	}
 
-	if (params->nr_pages * params->page_size < 4096*1024) error("<4M of mem\n");
+	if (params.nr_pages * params.page_size < 4096*1024) error("<4M of mem\n");
 }
 #endif