Changeset bfd7aac in mainline for kernel/arch/amd64

Timestamp:

2010-02-17T19:19:08Z (16 years ago)

Author:

Lukas Mejdrech <lukasmejdrech@…>

Branches:

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

Children:

1e2e0c1e

Parents:

01a9ef5 (diff), b8da2a3 (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/amd64

Files:

• include/memstr.h (modified) (2 diffs)
• src/debugger.c (modified) (2 diffs)

kernel/arch/amd64/include/memstr.h

@@ -27 +27 @@
  */
 
-/** @addtogroup amd64   
+/** @addtogroup amd64
  * @{
  */
@@ -38 +38 @@
 #define memcpy(dst, src, cnt)  __builtin_memcpy((dst), (src), (cnt))
 
-extern void memsetw(void *dst, size_t cnt, uint16_t x);
-extern void memsetb(void *dst, size_t cnt, uint8_t x);
-
-extern int memcmp(const void *a, const void *b, size_t cnt);
+extern void memsetw(void *, size_t, uint16_t);
+extern void memsetb(void *, size_t, uint8_t);
 
 #endif

kernel/arch/amd64/src/debugger.c

@@ -201 +201 @@
 
         /* Send IPI */
-#ifdef CONFIG_SMP
 //      ipi_broadcast(VECTOR_DEBUG_IPI);
-#endif  
 
         return curidx;
@@ -262 +260 @@
         spinlock_unlock(&bkpoint_lock);
         interrupts_restore(ipl);
-#ifdef CONFIG_SMP
-//      ipi_broadcast(VECTOR_DEBUG_IPI);        
-#endif
+//      ipi_broadcast(VECTOR_DEBUG_IPI);
 }