Changeset 0dc2fec in mainline for kernel/arch/ia32/src/smp/apic.c

Timestamp:

2016-05-22T19:19:43Z (9 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/src/smp/apic.c (modified) (1 diff)

kernel/arch/ia32/src/smp/apic.c

@@ -72 +72 @@
  *
  */
-volatile uint32_t *l_apic = (uint32_t *) UINT32_C(0xfee00000);
-volatile uint32_t *io_apic = (uint32_t *) UINT32_C(0xfec00000);
+volatile uint32_t *l_apic = (uint32_t *) L_APIC_BASE;
+volatile uint32_t *io_apic = (uint32_t *) IO_APIC_BASE;
 
 uint32_t apic_id_mask = 0;