projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] i386: Implement X86_FEATURE_SYNC_RDTSC on i386
[powerpc.git]
/
include
/
asm-i386
/
apic.h
diff --git
a/include/asm-i386/apic.h
b/include/asm-i386/apic.h
index
cc6b165
..
1e8f6f2
100644
(file)
--- a/
include/asm-i386/apic.h
+++ b/
include/asm-i386/apic.h
@@
-2,6
+2,7
@@
#define __ASM_APIC_H
#include <linux/pm.h>
#define __ASM_APIC_H
#include <linux/pm.h>
+#include <linux/delay.h>
#include <asm/fixmap.h>
#include <asm/apicdef.h>
#include <asm/processor.h>
#include <asm/fixmap.h>
#include <asm/apicdef.h>
#include <asm/processor.h>
@@
-64,12
+65,8
@@
static __inline fastcall unsigned long native_apic_read(unsigned long reg)
return *((volatile unsigned long *)(APIC_BASE+reg));
}
return *((volatile unsigned long *)(APIC_BASE+reg));
}
-static __inline__ void apic_wait_icr_idle(void)
-{
- while ( apic_read( APIC_ICR ) & APIC_ICR_BUSY )
- cpu_relax();
-}
-
+void apic_wait_icr_idle(void);
+unsigned long safe_apic_wait_icr_idle(void);
int get_physical_broadcast(void);
#ifdef CONFIG_X86_GOOD_APIC
int get_physical_broadcast(void);
#ifdef CONFIG_X86_GOOD_APIC
@@
-117,6
+114,7
@@
extern void enable_NMI_through_LVT0 (void * dummy);
#define ARCH_APICTIMER_STOPS_ON_C3 1
extern int timer_over_8254;
#define ARCH_APICTIMER_STOPS_ON_C3 1
extern int timer_over_8254;
+extern int local_apic_timer_c2_ok;
#else /* !CONFIG_X86_LOCAL_APIC */
static inline void lapic_shutdown(void) { }
#else /* !CONFIG_X86_LOCAL_APIC */
static inline void lapic_shutdown(void) { }