[parisc-linux-cvs] linux-2.5 tausq

[Randolph Chung]

> 	.              : Makefile 
> 	arch/parisc/kernel: parisc_ksyms.c process.c 
> 	arch/parisc/mm : init.c 
> 
> Log message:
> fix compile problems when CONFIG_BINFMT_SOM is not defined. boots on a500

kinda ugly...  feel free to fix it properly :-)

Index: Makefile
===================================================================
RCS file: /var/cvs/linux-2.5/Makefile,v
retrieving revision 1.104
diff -u -p -r1.104 Makefile
--- Makefile	8 Apr 2003 17:38:53 -0000	1.104
+++ Makefile	10 Apr 2003 04:41:39 -0000
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 5
 SUBLEVEL = 67
-EXTRAVERSION = -pa1
+EXTRAVERSION = -pa2
 
 # *DOCUMENTATION*
 # To see a list of typical targets execute "make help"
Index: arch/parisc/kernel/parisc_ksyms.c
===================================================================
RCS file: /var/cvs/linux-2.5/arch/parisc/kernel/parisc_ksyms.c,v
retrieving revision 1.15
diff -u -p -r1.15 parisc_ksyms.c
--- arch/parisc/kernel/parisc_ksyms.c	25 Feb 2003 12:39:22 -0000	1.15
+++ arch/parisc/kernel/parisc_ksyms.c	10 Apr 2003 04:41:40 -0000
@@ -39,7 +39,9 @@ EXPORT_SYMBOL(disable_irq);
 #include <asm/processor.h>
 EXPORT_SYMBOL(kernel_thread);
 EXPORT_SYMBOL(boot_cpu_data);
+#ifdef CONFIG_BINFMT_SOM
 EXPORT_SYMBOL(map_hpux_gateway_page);
+#endif
 #ifdef CONFIG_EISA
 EXPORT_SYMBOL(EISA_bus);
 #endif
Index: arch/parisc/kernel/process.c
===================================================================
RCS file: /var/cvs/linux-2.5/arch/parisc/kernel/process.c,v
retrieving revision 1.14
diff -u -p -r1.14 process.c
--- arch/parisc/kernel/process.c	12 Mar 2003 07:21:06 -0000	1.14
+++ arch/parisc/kernel/process.c	10 Apr 2003 04:41:40 -0000
@@ -251,7 +251,9 @@ copy_thread(int nr, unsigned long clone_
 	 * Make them const so the compiler knows they live in .text */
 	extern void * const ret_from_kernel_thread;
 	extern void * const child_return;
+#ifdef CONFIG_BINFMT_SOM
 	extern void * const hpux_child_return;
+#endif
 
 	*cregs = *pregs;
 
@@ -295,7 +297,11 @@ copy_thread(int nr, unsigned long clone_
 			+ (pregs->gr[21] & (INIT_THREAD_SIZE - 1));
 		cregs->gr[30] = usp;
 		if (p->personality == PER_HPUX) {
+#ifdef CONFIG_BINFMT_SOM
 			cregs->kpc = (unsigned long) &hpux_child_return;
+#else
+			BUG();
+#endif
 		} else {
 			cregs->kpc = (unsigned long) &child_return;
 		}
Index: arch/parisc/mm/init.c
===================================================================
RCS file: /var/cvs/linux-2.5/arch/parisc/mm/init.c,v
retrieving revision 1.11
diff -u -p -r1.11 init.c
--- arch/parisc/mm/init.c	5 Mar 2003 21:15:38 -0000	1.11
+++ arch/parisc/mm/init.c	10 Apr 2003 04:41:40 -0000
@@ -671,6 +671,7 @@ static void __init gateway_init(void)
 		PAGE_SIZE, PAGE_GATEWAY);
 }
 
+#ifdef CONFIG_BINFMT_SOM
 void
 map_hpux_gateway_page(struct task_struct *tsk, struct mm_struct *mm)
 {
@@ -739,6 +740,7 @@ map_hpux_gateway_page(struct task_struct
 	pg_table = (pte_t *) __va(pg_table) + start_pte;
 	set_pte(pg_table, __mk_pte(address, PAGE_GATEWAY));
 }
+#endif
 
 extern void flush_tlb_all_local(void);
 

-- 
Randolph Chung
Debian GNU/Linux Developer, hppa/ia64 ports
http://www.tausq.org/