Changeset 074c9bd in mainline for kernel/arch/ia32/include/asm.h

Timestamp:

2010-07-15T10:39:23Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

5c16ce7

Parents:

41ce4d9 (diff), 4003861 (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/ia32/include/asm.h (modified) (2 diffs)

kernel/arch/ia32/include/asm.h

@@ -43 +43 @@
 #include <trace.h>
 
-extern uint32_t interrupt_handler_size;
-
 /** Halt CPU
  *
@@ -429 +427 @@
 extern void asm_delay_loop(uint32_t);
 extern void asm_fake_loop(uint32_t);
+
+extern uintptr_t int_syscall;
 
 extern uintptr_t int_0;