patch-2.1.51 linux/arch/ppc/kernel/misc.S

• Lines: 64
• Date: Sat Aug 16 09:51:08 1997
• Orig file: v2.1.50/linux/arch/ppc/kernel/misc.S
• Orig date: Mon Aug 4 16:25:36 1997

diff -u --recursive --new-file v2.1.50/linux/arch/ppc/kernel/misc.S linux/arch/ppc/kernel/misc.S
@@ -64,6 +64,7 @@
 	mtmsr	r3		/* Update machine state */
 	blr
 
+#if 0
 /*
  * Restore 'flags'
  *	__restore_flags(long val)
@@ -79,11 +80,13 @@
 	mtmsr	r3
 	isync
 	blr
-
+#endif
+	
 /*
  * We were about to enable interrupts but we have to simulate
  * some interrupts that were lost by enable_irq first.
  */
+	.globl do_lost_interrupts
 do_lost_interrupts:
 	stwu	r1,-16(r1)
 	mflr	r0
@@ -243,7 +246,6 @@
 	bdnz	00b
 	blr	
 
-#ifdef CONFIG_PMAC
 _GLOBAL(ide_insw)
 	mtctr	r5
 	subi	r4,r4,2
@@ -259,7 +261,6 @@
 	sthx	r5,0,r3	
 	bdnz	00b
 	blr	
-#endif
 
 /*
  * Extended precision shifts
@@ -298,7 +299,7 @@
 _GLOBAL(_get_SP)
 	mr	r3,r1		/* Close enough */
 	blr
-	
+
 _GLOBAL(_get_PVR)
 	mfspr	r3,PVR
 	blr
@@ -308,6 +309,7 @@
 	lfs	0,0(r3)
 	stfd	0,0(r4)
 	blr
+
 /*
  * Fetch the current SR register
  *   get_SR(int index)
@@ -317,7 +319,6 @@
 	mr	r3,r4
 	blr
 
-	
 _GLOBAL(cvt_df)
 cvt_df:
 	lfd	0,0(r3)