Merge branch 'master' into perfmon

5 files changed, 16 insertions, 6 deletions

diff --git a/arch/x86/machine/boot.c b/arch/x86/machine/boot.c
index afc41d7..6934896 100644
--- a/arch/x86/machine/boot.c
+++ b/arch/x86/machine/boot.c
@@ -350,14 +350,17 @@ boot_setup_paging(struct multiboot_raw_info *mbi, unsigned long eax)
     return pmap_setup_paging();
 }
 
+#ifdef CONFIG_X86_PAE
+#define BOOT_PAE_LABEL " PAE"
+#else /* CONFIG_X86_PAE */
+#define BOOT_PAE_LABEL
+#endif /* CONFIG_X86_PAE */
+
 void __init
 boot_log_info(void)
 {
     log_info(KERNEL_NAME "/" CONFIG_SUBARCH " " KERNEL_VERSION
-#ifdef CONFIG_X86_PAE
-             " PAE"
-#endif /* CONFIG_X86_PAE */
-             );
+             BOOT_PAE_LABEL);
 }
 
 static void * __init
diff --git a/arch/x86/machine/cpu.h b/arch/x86/machine/cpu.h
index 7675822..d7a6498 100644
--- a/arch/x86/machine/cpu.h
+++ b/arch/x86/machine/cpu.h
@@ -24,6 +24,9 @@
  * L1 cache line size.
  *
  * XXX Use this value until processor selection is available.
+ *
+ * TODO Add macros to specifically align to the cache line size, and to
+ * do so only in SMP configurations.
  */
 #define CPU_L1_SIZE 64
 
@@ -706,6 +709,7 @@ INIT_OP_DECLARE(cpu_setup);
 /*
  * This init operation provides :
  *  - cpu_count()
+ *  - access to percpu variables on all processors
  */
 INIT_OP_DECLARE(cpu_mp_probe);
 
diff --git a/arch/x86/machine/lapic.c b/arch/x86/machine/lapic.c
index 1a81a18..180a1a2 100644
--- a/arch/x86/machine/lapic.c
+++ b/arch/x86/machine/lapic.c
@@ -95,7 +95,7 @@ struct lapic_register {
     uint32_t reserved0;
     uint32_t reserved1;
     uint32_t reserved2;
-} __packed;
+};
 
 /*
  * Local APIC register map.
@@ -171,7 +171,7 @@ struct lapic_map {
     const struct lapic_register reserved19;
     struct lapic_register timer_dcr;
     const struct lapic_register reserved20;
-} __packed;
+};
 
 /*
  * Address where local APIC registers are mapped.
diff --git a/arch/x86/machine/pmap.c b/arch/x86/machine/pmap.c
index 5ed0502..2b4c23c 100644
--- a/arch/x86/machine/pmap.c
+++ b/arch/x86/machine/pmap.c
@@ -1546,6 +1546,7 @@ pmap_update(struct pmap *pmap)
         spinlock_unlock(&queue->lock);
     }
 
+    /* TODO Improve scalability */
     cpumap_for_each(&oplist->cpumap, cpu) {
         request = &array->requests[cpu];
 
diff --git a/arch/x86/machine/strace.h b/arch/x86/machine/strace.h
index 2f686a0..b55f6b8 100644
--- a/arch/x86/machine/strace.h
+++ b/arch/x86/machine/strace.h
@@ -16,6 +16,8 @@
  *
  *
  * Stack tracing.
+ *
+ * TODO Make it possible to debug without the frame pointer.
  */
 
 #ifndef _X86_STRACE_H