patch-2.4.0-test7 linux/arch/arm/kernel/entry-armv.S

• Lines: 48
• Date: Sun Aug 13 09:54:15 2000
• Orig file: v2.4.0-test6/linux/arch/arm/kernel/entry-armv.S
• Orig date: Fri Jun 23 21:55:07 2000

diff -u --recursive --new-file v2.4.0-test6/linux/arch/arm/kernel/entry-armv.S linux/arch/arm/kernel/entry-armv.S
@@ -32,8 +32,6 @@
 
 		.text
 
-#define PT_TRACESYS	0x00000002
-
 @ Bad Abort numbers
 @ -----------------
 @
@@ -43,12 +41,6 @@
 #define BAD_IRQ		3
 #define BAD_UNDEFINSTR	4
 
-@ OS version number used in SWIs
-@  RISC OS is 0
-@  RISC iX is 8
-@
-#define OS_NUMBER	9
-
 @
 @ Stack format (ensured by USER_* and SVC_*)
 @
@@ -426,12 +418,15 @@
 		.endm
 
 #elif defined(CONFIG_ARCH_L7200)
-/* Don't use fast interrupts */
+	
+		.equ	irq_base_addr,	IO_BASE_2
+
 		.macro  disable_fiq
 		.endm
  
 		.macro  get_irqnr_and_base, irqnr, irqstat, base
-		ldr     r4, =0xe0001000			@ Virt addr status reg
+		mov     r4, #irq_base_addr		@ Virt addr IRQ regs
+		add	r4, r4, #0x00001000		@ Status reg
 		ldr     \irqstat, [r4]			@ get interrupts
 		mov     \irqnr, #0
 1001:		tst     \irqstat, #1
@@ -727,6 +722,7 @@
 		@
 		bne	do_IRQ
 		mov	r4, #0
+		get_current_task r5
 		b	ret_with_reschedule
 
 		.align	5