Changeset 0dc2fec in mainline for kernel/arch/ia32/include/arch/smp/apic.h

Timestamp:

2016-05-22T19:19:43Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

b272c67a

Parents:

153c7a29 (diff), af2254ec (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/arch/smp/apic.h (modified) (2 diffs)

kernel/arch/ia32/include/arch/smp/apic.h

@@ -36 +36 @@
 #define KERN_ia32_APIC_H_
 
+#define L_APIC_BASE     0xfee00000
+#define IO_APIC_BASE    0xfec00000
+
+#ifndef __ASM__
+
 #include <typedefs.h>
 #include <cpu.h>
@@ -364 +369 @@
 extern void io_apic_enable_irqs(uint16_t);
 
+#endif  /* __ASM__ */
+
 #endif