Changeset c621f4aa in mainline for kernel/arch/arm32/include/interrupt.h

Timestamp:

2010-07-25T10:11:13Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

377cce8

Parents:

24a2517 (diff), a2da43c (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 with mainline.

File:

• kernel/arch/arm32/include/interrupt.h (modified) (2 diffs)

kernel/arch/arm32/include/interrupt.h

@@ -37 +37 @@
 #define KERN_arm32_INTERRUPT_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/exception.h>
 
 /** Initial size of exception dispatch table. */
-#define IVT_ITEMS       6
+#define IVT_ITEMS  6
 
 /** Index of the first item in exception dispatch table. */
-#define IVT_FIRST       0
-
+#define IVT_FIRST  0
 
 extern void interrupt_init(void);
@@ -52 +51 @@
 extern void interrupts_restore(ipl_t ipl);
 extern ipl_t interrupts_read(void);
-
+extern bool interrupts_disabled(void);
 
 #endif