Moved definition of the PAUSE macro to <cpu.h>, respectively
<arch/cpu.h>. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28221 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -17,6 +17,10 @@
|
||||
#endif // !_ASSEMBLER
|
||||
|
||||
|
||||
#undef PAUSE
|
||||
#define PAUSE() asm volatile ("pause;")
|
||||
|
||||
|
||||
// MSR registers (possibly Intel specific)
|
||||
#define IA32_MSR_APIC_BASE 0x1b
|
||||
|
||||
|
||||
@@ -15,6 +15,12 @@
|
||||
#include <arch/cpu.h>
|
||||
|
||||
|
||||
// define PAUSE, if not done in arch/cpu.h
|
||||
#ifndef PAUSE
|
||||
# define PAUSE()
|
||||
#endif
|
||||
|
||||
|
||||
/* CPU local data structure */
|
||||
|
||||
typedef struct cpu_ent {
|
||||
|
||||
@@ -33,12 +33,6 @@
|
||||
# define TRACE(x) ;
|
||||
#endif
|
||||
|
||||
#if __INTEL__
|
||||
# define PAUSE() asm volatile ("pause;")
|
||||
#else
|
||||
# define PAUSE()
|
||||
#endif
|
||||
|
||||
#define MSG_POOL_SIZE (SMP_MAX_CPUS * 4)
|
||||
|
||||
struct smp_msg {
|
||||
|
||||
@@ -14,6 +14,7 @@
|
||||
|
||||
#include <arch/timer.h>
|
||||
#include <boot/kernel_args.h>
|
||||
#include <cpu.h>
|
||||
#include <smp.h>
|
||||
#include <thread.h>
|
||||
#include <util/AutoLock.h>
|
||||
@@ -36,12 +37,6 @@ static per_cpu_timer_data sPerCPU[B_MAX_CPU_COUNT];
|
||||
# define TRACE(x) ;
|
||||
#endif
|
||||
|
||||
#if __INTEL__
|
||||
# define PAUSE() asm volatile ("pause;")
|
||||
#else
|
||||
# define PAUSE()
|
||||
#endif
|
||||
|
||||
|
||||
status_t
|
||||
timer_init(kernel_args *args)
|
||||
|
||||
Reference in New Issue
Block a user