Merge branch 'for-2.6.26' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer...

[linux-2.6] / include / asm-sparc64 / pil.h

diff --git a/include/asm-sparc64/pil.h b/include/asm-sparc64/pil.h
index 79f827eb3f5d55edca8e1c8a2fb93a30253e9972..2f5d126f7163b45285c2cd6958ea3095a5b950e7 100644 (file)
--- a/include/asm-sparc64/pil.h
+++ b/include/asm-sparc64/pil.h
@@ -5,9 +5,9 @@
 /* To avoid some locking problems, we hard allocate certain PILs
  * for SMP cross call messages that must do a etrap/rtrap.
  *
- * A cli() does not block the cross call delivery, so when SMP
- * locking is an issue we reschedule the event into a PIL interrupt
- * which is blocked by cli().
+ * A local_irq_disable() does not block the cross call delivery, so
+ * when SMP locking is an issue we reschedule the event into a PIL
+ * interrupt which is blocked by local_irq_disable().
  *
  * In fact any XCALL which has to etrap/rtrap has a problem because
  * it is difficult to prevent rtrap from running BH's, and that would
@@ -17,12 +17,6 @@
 #define PIL_SMP_RECEIVE_SIGNAL 2
 #define PIL_SMP_CAPTURE                3
 #define PIL_SMP_CTX_NEW_VERSION        4
-
-#ifndef __ASSEMBLY__
-#define PIL_RESERVED(PIL)      ((PIL) == PIL_SMP_CALL_FUNC || \
-                                (PIL) == PIL_SMP_RECEIVE_SIGNAL || \
-                                (PIL) == PIL_SMP_CAPTURE || \
-                                (PIL) == PIL_SMP_CTX_NEW_VERSION)
-#endif
+#define PIL_DEVICE_IRQ         5
 
 #endif /* !(_SPARC64_PIL_H) */