update

[l4.git] / kernel / fiasco / src / drivers / arm / processor-arm.cpp

diff --git a/kernel/fiasco/src/drivers/arm/processor-arm.cpp b/kernel/fiasco/src/drivers/arm/processor-arm.cpp
index e315ce8e6b0faf0f34d467f85b2900420fdb8928..d067e37f034f024c5d57dc373ab251f4c422693d 100644 (file)
--- a/kernel/fiasco/src/drivers/arm/processor-arm.cpp
+++ b/kernel/fiasco/src/drivers/arm/processor-arm.cpp
@@ -145,9 +145,9 @@ IMPLEMENTATION[arm && mp]:
 IMPLEMENT static inline
 unsigned Proc::cpu_id()
 {
-  unsigned int cpunum;
-  __asm__("mrc p15, 0, %0, c0, c0, 5": "=r" (cpunum));
-  return cpunum & 0xf;
+  unsigned mpidr;
+  __asm__("mrc p15, 0, %0, c0, c0, 5": "=r" (mpidr));
+  return mpidr & 0x7; // mind gic softirq
 }
 
 //----------------------------------------------------------------