git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
asm-i386
/
apic.h
diff --git
a/include/asm-i386/apic.h
b/include/asm-i386/apic.h
index
cc54194
..
f9d1dff
100644
(file)
--- a/
include/asm-i386/apic.h
+++ b/
include/asm-i386/apic.h
@@
-16,20
+16,8
@@
#define APIC_VERBOSE 1
#define APIC_DEBUG 2
#define APIC_VERBOSE 1
#define APIC_DEBUG 2
-extern int enable_local_apic;
extern int apic_verbosity;
extern int apic_verbosity;
-static inline void lapic_disable(void)
-{
- enable_local_apic = -1;
- clear_bit(X86_FEATURE_APIC, boot_cpu_data.x86_capability);
-}
-
-static inline void lapic_enable(void)
-{
- enable_local_apic = 1;
-}
-
/*
* Define the default level of output to be very little
* This can be turned up by using apic=verbose for more
/*
* Define the default level of output to be very little
* This can be turned up by using apic=verbose for more
@@
-42,23
+30,34
@@
static inline void lapic_enable(void)
} while (0)
} while (0)
+extern void generic_apic_probe(void);
+
#ifdef CONFIG_X86_LOCAL_APIC
/*
* Basic functions accessing APICs.
*/
#ifdef CONFIG_X86_LOCAL_APIC
/*
* Basic functions accessing APICs.
*/
+#ifdef CONFIG_PARAVIRT
+#include <asm/paravirt.h>
+#else
+#define apic_write native_apic_write
+#define apic_write_atomic native_apic_write_atomic
+#define apic_read native_apic_read
+#endif
-static __inline void apic_write(unsigned long reg, unsigned long v)
+static __inline fastcall void native_apic_write(unsigned long reg,
+ unsigned long v)
{
*((volatile unsigned long *)(APIC_BASE+reg)) = v;
}
{
*((volatile unsigned long *)(APIC_BASE+reg)) = v;
}
-static __inline void apic_write_atomic(unsigned long reg, unsigned long v)
+static __inline fastcall void native_apic_write_atomic(unsigned long reg,
+ unsigned long v)
{
xchg((volatile unsigned long *)(APIC_BASE+reg), v);
}
{
xchg((volatile unsigned long *)(APIC_BASE+reg), v);
}
-static __inline
unsigned long
apic_read(unsigned long reg)
+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));
}
@@
-108,7
+107,7
@@
extern void sync_Arb_IDs (void);
extern void init_bsp_APIC (void);
extern void setup_local_APIC (void);
extern void init_apic_mappings (void);
extern void init_bsp_APIC (void);
extern void setup_local_APIC (void);
extern void init_apic_mappings (void);
-extern void smp_local_timer_interrupt (
struct pt_regs * regs
);
+extern void smp_local_timer_interrupt (
void
);
extern void setup_boot_APIC_clock (void);
extern void setup_secondary_APIC_clock (void);
extern int APIC_init_uniprocessor (void);
extern void setup_boot_APIC_clock (void);
extern void setup_secondary_APIC_clock (void);
extern int APIC_init_uniprocessor (void);
@@
-117,10
+116,8
@@
extern void enable_APIC_timer(void);
extern void enable_NMI_through_LVT0 (void * dummy);
extern void enable_NMI_through_LVT0 (void * dummy);
-extern int disable_timer_pin_1;
-
#ifndef CONFIG_XEN
#ifndef CONFIG_XEN
-void smp_send_timer_broadcast_ipi(
struct pt_regs *regs
);
+void smp_send_timer_broadcast_ipi(
void
);
void switch_APIC_timer_to_ipi(void *cpumask);
void switch_ipi_to_APIC_timer(void *cpumask);
#define ARCH_APICTIMER_STOPS_ON_C3 1
void switch_APIC_timer_to_ipi(void *cpumask);
void switch_ipi_to_APIC_timer(void *cpumask);
#define ARCH_APICTIMER_STOPS_ON_C3 1
@@
-128,8
+125,6
@@
void switch_ipi_to_APIC_timer(void *cpumask);
extern int timer_over_8254;
extern int timer_over_8254;
-extern void dmi_check_apic(void);
-
#else /* !CONFIG_X86_LOCAL_APIC */
static inline void lapic_shutdown(void) { }
#else /* !CONFIG_X86_LOCAL_APIC */
static inline void lapic_shutdown(void) { }