Changeset 8fb1bf82 in mainline for kernel/arch/ia32/src/smp

Timestamp:

2010-11-25T13:42:50Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8df8415

Parents:

a93d79a (diff), eb667613 (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.

Location:

kernel/arch/ia32/src/smp

Files:

• apic.c (modified) (2 diffs)
• mps.c (modified) (1 diff)

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

@@ -72 +72 @@
  *
  */
-volatile uint32_t *l_apic = (uint32_t *) 0xfee00000;
-volatile uint32_t *io_apic = (uint32_t *) 0xfec00000;
+volatile uint32_t *l_apic = (uint32_t *) UINT32_C(0xfee00000);
+volatile uint32_t *io_apic = (uint32_t *) UINT32_C(0xfec00000);
 
 uint32_t apic_id_mask = 0;
@@ -184 +184 @@
          * Other interrupts will be forwarded to the lowest priority CPU.
          */
-        io_apic_disable_irqs(0xffff);
+        io_apic_disable_irqs(0xffffU);
         
         irq_initialize(&l_apic_timer_irq);

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

@@ -52 +52 @@
  */
 
-#define FS_SIGNATURE  0x5f504d5f
-#define CT_SIGNATURE  0x504d4350
+#define FS_SIGNATURE  UINT32_C(0x5f504d5f)
+#define CT_SIGNATURE  UINT32_C(0x504d4350)
 
 static struct mps_fs *fs;