patch-2.3.16 linux/include/asm-ppc/system.h

• Lines: 63
• Date: Tue Aug 31 11:36:43 1999
• Orig file: v2.3.15/linux/include/asm-ppc/system.h
• Orig date: Tue Aug 3 08:01:29 1999

diff -u --recursive --new-file v2.3.15/linux/include/asm-ppc/system.h linux/include/asm-ppc/system.h
@@ -1,9 +1,16 @@
+/*
+ * $Id: system.h,v 1.47 1999/08/22 12:31:08 paulus Exp $
+ *
+ * Copyright (C) 1999 Cort Dougan <cort@cs.nmt.edu>
+ */
 #ifndef __PPC_SYSTEM_H
 #define __PPC_SYSTEM_H
 
 #include <linux/kdev_t.h>
+
 #include <asm/processor.h>
 #include <asm/atomic.h>
+#include <asm/irq_control.h>
 
 /*
  * Memory barrier.
@@ -28,9 +35,6 @@
 extern void xmon_irq(int, void *, struct pt_regs *);
 extern void xmon(struct pt_regs *excp);
 
-#define __save_flags(flags)	({\
-	__asm__ __volatile__ ("mfmsr %0" : "=r" ((flags)) : : "memory"); })
-#define __save_and_cli(flags)	({__save_flags(flags);__cli();})
 
 /* Data cache block flush - write out the cache line containing the
    specified address and then invalidate it in the cache. */
@@ -39,25 +43,6 @@
 	asm("dcbf %0,%1; sync" : : "r" (line), "r" (0));
 }
 
-extern __inline__ void __restore_flags(unsigned long flags)
-{
-        extern atomic_t ppc_n_lost_interrupts;
-	extern void do_lost_interrupts(unsigned long);
-
-        if ((flags & MSR_EE) && atomic_read(&ppc_n_lost_interrupts) != 0) {
-                do_lost_interrupts(flags);
-        } else {
-                __asm__ __volatile__ ("sync; mtmsr %0; isync"
-                              : : "r" (flags) : "memory");
-        }
-}
-
-
-extern void __sti(void);
-extern void __cli(void);
-extern int _disable_interrupts(void);
-extern void _enable_interrupts(int);
-
 extern void print_backtrace(unsigned long *);
 extern void show_regs(struct pt_regs * regs);
 extern void flush_instruction_cache(void);
@@ -87,8 +72,7 @@
 
 struct thread_struct;
 extern struct task_struct *_switch(struct thread_struct *prev,
-				     struct thread_struct *next,
-				     unsigned long context);
+				   struct thread_struct *next);
 
 extern unsigned int rtas_data;