projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Don't trigger full rebuild via CONFIG_MTRR
[powerpc.git]
/
include
/
asm-i386
/
apic.h
diff --git
a/include/asm-i386/apic.h
b/include/asm-i386/apic.h
index
8c454aa
..
1d8362c
100644
(file)
--- a/
include/asm-i386/apic.h
+++ b/
include/asm-i386/apic.h
@@
-1,7
+1,6
@@
#ifndef __ASM_APIC_H
#define __ASM_APIC_H
#ifndef __ASM_APIC_H
#define __ASM_APIC_H
-#include <linux/config.h>
#include <linux/pm.h>
#include <asm/fixmap.h>
#include <asm/apicdef.h>
#include <linux/pm.h>
#include <asm/fixmap.h>
#include <asm/apicdef.h>
@@
-132,6
+131,13
@@
extern unsigned int nmi_watchdog;
extern int disable_timer_pin_1;
extern int disable_timer_pin_1;
+void smp_send_timer_broadcast_ipi(struct pt_regs *regs);
+void switch_APIC_timer_to_ipi(void *cpumask);
+void switch_ipi_to_APIC_timer(void *cpumask);
+#define ARCH_APICTIMER_STOPS_ON_C3 1
+
+extern int timer_over_8254;
+
#else /* !CONFIG_X86_LOCAL_APIC */
static inline void lapic_shutdown(void) { }
#else /* !CONFIG_X86_LOCAL_APIC */
static inline void lapic_shutdown(void) { }