FOC/L4RE: Upstream revision 42

2013-01-14 12:18:53 +01:00
parent 808d228872
commit 34af60da11
364 changed files with 7500 additions and 5211 deletions
--- 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
 }

 //----------------------------------------------------------------