patch-2.2.0-pre6 linux/include/asm-arm/proc-armo/system.h

• Lines: 123
• Date: Thu Jan 7 15:51:33 1999
• Orig file: v2.2.0-pre5/linux/include/asm-arm/proc-armo/system.h
• Orig date: Tue Dec 22 14:16:58 1998

diff -u --recursive --new-file v2.2.0-pre5/linux/include/asm-arm/proc-armo/system.h linux/include/asm-arm/proc-armo/system.h
@@ -40,74 +40,74 @@
 /*
  * Save the current interrupt enable state & disable IRQs
  */
-#define __save_flags_cli(x)		\
-	do {				\
-	  unsigned long temp;		\
-	  __asm__ __volatile__(		\
-"	mov	%0, pc\n"		\
-"	orr	%1, %0, #0x08000000\n"	\
-"	and	%0, %0, #0x0c000000\n"	\
-"	teqp	%1, #0\n"		\
-	  : "=r" (x), "=r" (temp)	\
-	  :				\
-	  : "memory");			\
+#define __save_flags_cli(x)				\
+	do {						\
+	  unsigned long temp;				\
+	  __asm__ __volatile__(				\
+"	mov	%0, pc		@ save_flags_cli\n"	\
+"	orr	%1, %0, #0x08000000\n"			\
+"	and	%0, %0, #0x0c000000\n"			\
+"	teqp	%1, #0\n"				\
+	  : "=r" (x), "=r" (temp)			\
+	  :						\
+	  : "memory");					\
 	} while (0)
 	
 /*
  * Enable IRQs
  */
-#define __sti()				\
-	do {				\
-	  unsigned long temp;		\
-	  __asm__ __volatile__(		\
-"	mov	%0, pc\n"		\
-"	bic	%0, %0, #0x08000000\n"	\
-"	teqp	%0, #0\n"		\
-	  : "=r" (temp)			\
-	  :				\
-	  : "memory");			\
+#define __sti()					\
+	do {					\
+	  unsigned long temp;			\
+	  __asm__ __volatile__(			\
+"	mov	%0, pc		@ sti\n"	\
+"	bic	%0, %0, #0x08000000\n"		\
+"	teqp	%0, #0\n"			\
+	  : "=r" (temp)				\
+	  :					\
+	  : "memory");				\
 	} while(0)
 
 /*
  * Disable IRQs
  */
-#define __cli()				\
-	do {				\
-	  unsigned long temp;		\
-	  __asm__ __volatile__(		\
-"	mov	%0, pc\n"		\
-"	orr	%0, %0, #0x08000000\n"	\
-"	teqp	%0, #0\n"		\
-	  : "=r" (temp)			\
-	  :				\
-	  : "memory");			\
+#define __cli()					\
+	do {					\
+	  unsigned long temp;			\
+	  __asm__ __volatile__(			\
+"	mov	%0, pc		@ cli\n"	\
+"	orr	%0, %0, #0x08000000\n"		\
+"	teqp	%0, #0\n"			\
+	  : "=r" (temp)				\
+	  :					\
+	  : "memory");				\
 	} while(0)
 
 /*
  * save current IRQ & FIQ state
  */
-#define __save_flags(x)			\
-	do {				\
-	  __asm__ __volatile__(		\
-"	mov	%0, pc\n"		\
-"	and	%0, %0, #0x0c000000\n"	\
-	  : "=r" (x));			\
+#define __save_flags(x)				\
+	do {					\
+	  __asm__ __volatile__(			\
+"	mov	%0, pc		@ save_flags\n"	\
+"	and	%0, %0, #0x0c000000\n"		\
+	  : "=r" (x));				\
 	} while (0)
 
 /*
  * restore saved IRQ & FIQ state
  */
-#define __restore_flags(x)		\
-	do {				\
-	  unsigned long temp;		\
-	  __asm__ __volatile__(		\
-"	mov	%0, pc\n"		\
-"	bic	%0, %0, #0x0c000000\n"	\
-"	orr	%0, %0, %1\n"		\
-"	teqp	%0, #0\n"		\
-	  : "=r" (temp)			\
-	  : "r" (x)			\
-	  : "memory");			\
+#define __restore_flags(x)				\
+	do {						\
+	  unsigned long temp;				\
+	  __asm__ __volatile__(				\
+"	mov	%0, pc		@ restore_flags\n"	\
+"	bic	%0, %0, #0x0c000000\n"			\
+"	orr	%0, %0, %1\n"				\
+"	teqp	%0, #0\n"				\
+	  : "=r" (temp)					\
+	  : "r" (x)					\
+	  : "memory");					\
 	} while (0)
 
 #ifdef __SMP__