projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'x86/alternatives', 'x86/cleanups', 'x86/commandline', 'x86/crashdump...
[cascardo/linux.git]
/
include
/
asm-x86
/
apic.h
diff --git
a/include/asm-x86/apic.h
b/include/asm-x86/apic.h
index
133c998
..
65590c9
100644
(file)
--- a/
include/asm-x86/apic.h
+++ b/
include/asm-x86/apic.h
@@
-1,5
+1,5
@@
-#ifndef
_ASM_X86
_APIC_H
-#define
_ASM_X86
_APIC_H
+#ifndef
ASM_X86_
_APIC_H
+#define
ASM_X86_
_APIC_H
#include <linux/pm.h>
#include <linux/delay.h>
#include <linux/pm.h>
#include <linux/delay.h>
@@
-54,6
+54,11
@@
extern int disable_apic;
#endif
extern int is_vsmp_box(void);
#endif
extern int is_vsmp_box(void);
+extern void xapic_wait_icr_idle(void);
+extern u32 safe_xapic_wait_icr_idle(void);
+extern u64 xapic_icr_read(void);
+extern void xapic_icr_write(u32, u32);
+extern int setup_profiling_timer(unsigned int);
static inline void native_apic_write(unsigned long reg, u32 v)
{
static inline void native_apic_write(unsigned long reg, u32 v)
{
@@
-76,9
+81,7
@@
extern int get_physical_broadcast(void);
static inline void ack_APIC_irq(void)
{
/*
static inline void ack_APIC_irq(void)
{
/*
- * ack_APIC_irq() actually gets compiled as a single instruction:
- * - a single rmw on Pentium/82489DX
- * - a single write on P6+ cores (CONFIG_X86_GOOD_APIC)
+ * ack_APIC_irq() actually gets compiled as a single instruction
* ... yummie.
*/
* ... yummie.
*/
@@
-128,4
+131,4
@@
static inline void init_apic_mappings(void) { }
#endif /* !CONFIG_X86_LOCAL_APIC */
#endif /* !CONFIG_X86_LOCAL_APIC */
-#endif /*
__ASM
_APIC_H */
+#endif /*
ASM_X86_
_APIC_H */