Update of /cvsroot/linux-vax/kernel-2.4/arch/i386/boot/compressed
In directory usw-pr-cvs1:/tmp/cvs-serv10929/i386/boot/compressed
Modified Files:
Makefile misc.c
Log Message:
synch 2.4.15 commit 35
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/i386/boot/compressed/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- Makefile 14 Jan 2001 19:19:57 -0000 1.1.1.1
+++ Makefile 10 Apr 2002 14:23:20 -0000 1.2
@@ -9,7 +9,6 @@
OBJECTS = $(HEAD) misc.o
-CFLAGS = $(CPPFLAGS) -O2 -DSTDC_HEADERS
ZLDFLAGS = -e startup_32
#
Index: misc.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/i386/boot/compressed/misc.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -r1.1.1.2 -r1.2
--- misc.c 25 Feb 2001 23:15:16 -0000 1.1.1.2
+++ misc.c 10 Apr 2002 14:23:20 -0000 1.2
@@ -9,9 +9,11 @@
* High loaded stuff by Hans Lermen & Werner Almesberger, Feb. 1996
*/
+#include <linux/linkage.h>
#include <linux/vmalloc.h>
#include <linux/tty.h>
#include <asm/io.h>
+
/*
* gzip declarations
*/
@@ -21,6 +23,14 @@
#undef memset
#undef memcpy
+
+/*
+ * Why do we do this? Don't ask me..
+ *
+ * Incomprehensible are the ways of bootloaders.
+ */
+static void* memset(void *, int, size_t);
+static void* memcpy(void *, __const void *, size_t);
#define memzero(s, n) memset ((s), 0, (n))
typedef unsigned char uch;
@@ -114,6 +124,10 @@
static int vidport;
static int lines, cols;
+#ifdef CONFIG_MULTIQUAD
+static void *xquad_portio = NULL;
+#endif
+
#include "../../../../lib/inflate.c"
static void *malloc(int size)
@@ -194,7 +208,7 @@
outb_p(0xff & (pos >> 1), vidport+1);
}
-void* memset(void* s, int c, size_t n)
+static void* memset(void* s, int c, size_t n)
{
int i;
char *ss = (char*)s;
@@ -203,7 +217,7 @@
return s;
}
-void* memcpy(void* __dest, __const void* __src,
+static void* memcpy(void* __dest, __const void* __src,
size_t __n)
{
int i;
@@ -291,7 +305,7 @@
short b;
} stack_start = { & user_stack [STACK_SIZE] , __KERNEL_DS };
-void setup_normal_output_buffer(void)
+static void setup_normal_output_buffer(void)
{
#ifdef STANDARD_MEMORY_BIOS_CALL
if (EXT_MEM_K < 1024) error("Less than 2MB of memory.\n");
@@ -307,7 +321,7 @@
uch *high_buffer_start; int hcount;
};
-void setup_output_buffer_if_we_run_high(struct moveparams *mv)
+static void setup_output_buffer_if_we_run_high(struct moveparams *mv)
{
high_buffer_start = (uch *)(((ulg)&end) + HEAP_SIZE);
#ifdef STANDARD_MEMORY_BIOS_CALL
@@ -329,7 +343,7 @@
mv->high_buffer_start = high_buffer_start;
}
-void close_output_buffer_if_we_run_high(struct moveparams *mv)
+static void close_output_buffer_if_we_run_high(struct moveparams *mv)
{
if (bytes_out > low_buffer_size) {
mv->lcount = low_buffer_size;
@@ -342,7 +356,7 @@
}
-int decompress_kernel(struct moveparams *mv, void *rmode)
+asmlinkage int decompress_kernel(struct moveparams *mv, void *rmode)
{
real_mode = rmode;
|
