Changeset f6b5593 in mainline for kernel/arch/ia64/include/interrupt.h

Timestamp:

2009-09-21T11:53:03Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

4098e38

Parents:

2f636b6 (diff), c1618ed (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• kernel/arch/ia64/include/interrupt.h (modified) (4 diffs)

kernel/arch/ia64/include/interrupt.h

@@ -40 +40 @@
 
 /** ia64 has 256 INRs. */
-#define INR_COUNT       256
+#define INR_COUNT  256
 
 /*
@@ -47 +47 @@
  * to genarch.
  */
-#define IVT_ITEMS       0
-#define IVT_FIRST       0
+#define IVT_ITEMS  0
+#define IVT_FIRST  0
 
 /** External Interrupt vectors. */
 
-#define VECTOR_TLB_SHOOTDOWN_IPI 0xf0
-#define INTERRUPT_TIMER         255
-#define IRQ_KBD                 (0x01 + LEGACY_INTERRUPT_BASE)
-#define IRQ_MOUSE               (0x0c + LEGACY_INTERRUPT_BASE)
-#define INTERRUPT_SPURIOUS      15
-#define LEGACY_INTERRUPT_BASE   0x20
+#define VECTOR_TLB_SHOOTDOWN_IPI  0xf0
+
+#define INTERRUPT_SPURIOUS  15
+#define INTERRUPT_TIMER     255
+
+#define LEGACY_INTERRUPT_BASE  0x20
+
+#define IRQ_KBD    (0x01 + LEGACY_INTERRUPT_BASE)
+#define IRQ_MOUSE  (0x0c + LEGACY_INTERRUPT_BASE)
 
 /** General Exception codes. */
-#define GE_ILLEGALOP            0
-#define GE_PRIVOP               1
-#define GE_PRIVREG              2
-#define GE_RESREGFLD            3
-#define GE_DISBLDISTRAN         4
-#define GE_ILLEGALDEP           8
+#define GE_ILLEGALOP     0
+#define GE_PRIVOP        1
+#define GE_PRIVREG       2
+#define GE_RESREGFLD     3
+#define GE_DISBLDISTRAN  4
+#define GE_ILLEGALDEP    8
 
-#define EOI     0               /**< The actual value doesn't matter. */
+#define EOI  0  /**< The actual value doesn't matter. */
 
 typedef struct {
@@ -100 +103 @@
         uint128_t f30;
         uint128_t f31;
-                
+        
         uintptr_t ar_bsp;
         uintptr_t ar_bspstore;
@@ -132 +135 @@
 {
         istate->cr_iip = retaddr;
-        istate->cr_ipsr.ri = 0;         /* return to instruction slot #0 */
+        istate->cr_ipsr.ri = 0;    /* return to instruction slot #0 */
 }