lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86: prepare unification of include/asm-x86/apic_32/64.h

Browse Source 
White space and coding style clenaup.

Move the K8 local apic defines to apicdef.h, where they belong

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Thomas Gleixner
2008-01-30 13:30:14 +01:00
committed by Ingo Molnar
parent 2d539553c9
commit cff90dbfe4
3 changed files with 48 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
include/asm-x86/apic_32.h
View File

@@ -17,8 +17,6 @@
#define APIC_VERBOSE 1 #define APIC_VERBOSE 1
#define APIC_DEBUG 2 #define APIC_DEBUG 2
extern int apic_verbosity;
/* /*
* Define the default level of output to be very little * Define the default level of output to be very little
* This can be turned up by using apic=verbose for more * This can be turned up by using apic=verbose for more
@@ -35,6 +33,11 @@ extern void generic_apic_probe(void);
#ifdef CONFIG_X86_LOCAL_APIC #ifdef CONFIG_X86_LOCAL_APIC
extern int apic_verbosity;
extern int timer_over_8254;
extern int local_apic_timer_c2_ok;
extern int local_apic_timer_disabled;
/* /*
* Basic functions accessing APICs. * Basic functions accessing APICs.
*/ */
@@ -65,9 +68,9 @@ 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));
} }
void apic_wait_icr_idle(void); extern void apic_wait_icr_idle(void);
unsigned long safe_apic_wait_icr_idle(void); extern unsigned long safe_apic_wait_icr_idle(void);
int get_physical_broadcast(void); extern int get_physical_broadcast(void);
#ifdef CONFIG_X86_GOOD_APIC #ifdef CONFIG_X86_GOOD_APIC
# define FORCE_READ_AROUND_WRITE 0 # define FORCE_READ_AROUND_WRITE 0
@@ -108,16 +111,10 @@ extern void smp_local_timer_interrupt (void);
extern void setup_boot_APIC_clock(void); extern void setup_boot_APIC_clock(void);
extern void setup_secondary_APIC_clock(void); extern void setup_secondary_APIC_clock(void);
extern int APIC_init_uniprocessor(void); extern int APIC_init_uniprocessor(void);
extern void enable_NMI_through_LVT0(void *dummy); extern void enable_NMI_through_LVT0(void *dummy);
#define ARCH_APICTIMER_STOPS_ON_C3 1 #define ARCH_APICTIMER_STOPS_ON_C3 1
extern int timer_over_8254;
extern int local_apic_timer_c2_ok;
extern int local_apic_timer_disabled;
#else /* !CONFIG_X86_LOCAL_APIC */ #else /* !CONFIG_X86_LOCAL_APIC */
static inline void lapic_shutdown(void) { } static inline void lapic_shutdown(void) { }
#define local_apic_timer_c2_ok 1 #define local_apic_timer_c2_ok 1

7
include/asm-x86/apic_64.h
View File

@@ -87,13 +87,6 @@ extern void setup_APIC_extended_lvt(unsigned char lvt_off, unsigned char vector,
extern int apic_is_clustered_box(void); extern int apic_is_clustered_box(void);
#define K8_APIC_EXT_LVT_BASE 0x500
#define K8_APIC_EXT_INT_MSG_FIX 0x0
#define K8_APIC_EXT_INT_MSG_SMI 0x2
#define K8_APIC_EXT_INT_MSG_NMI 0x4
#define K8_APIC_EXT_INT_MSG_EXT 0x7
#define K8_APIC_EXT_LVT_ENTRY_THRESHOLD 0
#define ARCH_APICTIMER_STOPS_ON_C3 1 #define ARCH_APICTIMER_STOPS_ON_C3 1
extern unsigned boot_cpu_id; extern unsigned boot_cpu_id;

8
include/asm-x86/apicdef.h
View File

@@ -116,6 +116,14 @@
#define APIC_TDR_DIV_32 0x8 #define APIC_TDR_DIV_32 0x8
#define APIC_TDR_DIV_64 0x9 #define APIC_TDR_DIV_64 0x9
#define APIC_TDR_DIV_128 0xA #define APIC_TDR_DIV_128 0xA
#define K8_APIC_EXT_LVT_BASE 0x500
#define K8_APIC_EXT_INT_MSG_FIX 0x0
#define K8_APIC_EXT_INT_MSG_SMI 0x2
#define K8_APIC_EXT_INT_MSG_NMI 0x4
#define K8_APIC_EXT_INT_MSG_EXT 0x7
#define K8_APIC_EXT_LVT_ENTRY_THRESHOLD 0
#define APIC_BASE (fix_to_virt(FIX_APIC_BASE)) #define APIC_BASE (fix_to_virt(FIX_APIC_BASE))
#ifdef CONFIG_X86_32 #ifdef CONFIG_X86_32