patch-2.4.25 linux-2.4.25/arch/ppc/boot/common/misc-simple.c

• Lines: 32
• Date: 2004-02-18 05:36:30.000000000 -0800
• Orig file: linux-2.4.24/arch/ppc/boot/common/misc-simple.c
• Orig date: 2003-08-25 04:44:40.000000000 -0700

diff -urN linux-2.4.24/arch/ppc/boot/common/misc-simple.c linux-2.4.25/arch/ppc/boot/common/misc-simple.c
@@ -75,16 +75,9 @@
 extern void gunzip(void *, int, unsigned char *, int *);
 extern void serial_fixups(void);
 
-/* Allow decompress_kernel to be hooked into.  This is the default. */
-void * __attribute__ ((weak))
-load_kernel(unsigned long load_addr, int num_words, unsigned long cksum,
-		void *bp)
-{
-	return decompress_kernel(load_addr, num_words, cksum, bp);
-}
-
-struct bi_record *
-decompress_kernel(unsigned long load_addr, int num_words, unsigned long cksum)
+static struct bi_record *
+decompress_kernel(unsigned long load_addr, int num_words, unsigned long cksum,
+		void *ignored)
 {
 #ifdef INTERACTIVE_CONSOLE
 	int timer = 0;
@@ -271,3 +264,11 @@
 
 	return (struct bi_record *)rec_loc;
 }
+
+/* Allow decompress_kernel to be hooked into.  This is the default. */
+void * __attribute__ ((weak))
+load_kernel(unsigned long load_addr, int num_words, unsigned long cksum,
+		void *bp)
+{
+	return decompress_kernel(load_addr, num_words, cksum, bp);
+}