aboutsummaryrefslogtreecommitdiff
path: root/include/asm-x86/apic.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-10-06 16:18:26 +0200
committerIngo Molnar <mingo@elte.hu>2008-10-06 18:06:53 +0200
commit0962f402af1bb0b53ccee626785d202a10c12fff (patch)
tree26fa57193f16e45c6e0557049d02164f129077ed /include/asm-x86/apic.h
parent19268ed7449c561694d048a34601a30e2d1aaf79 (diff)
parent8d7ccaa545490cdffdfaff0842436a8dd85cf47b (diff)
Merge branch 'x86/prototypes' into x86-v28-for-linus-phase1
Conflicts: arch/x86/kernel/process_32.c Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/apic.h')
-rw-r--r--include/asm-x86/apic.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/asm-x86/apic.h b/include/asm-x86/apic.h
index d0ace3d63a2..4a59f0d6e38 100644
--- a/include/asm-x86/apic.h
+++ b/include/asm-x86/apic.h
@@ -54,6 +54,11 @@ extern int disable_apic;
#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)
{