mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

x86, apic: refactor ->apic_id_mask & APIC_ID_MASK 

- spread out the namespace on a per driver basis

 - get rid of wrapper macros

Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar 2009-01-28 14:59:17 +01:00
parent ca6c8ed464
commit 5b8127277b
13 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/include/asm/bigsmp/apicdef.h
View File

@ -1,7 +1,7 @@
#ifndef __ASM_MACH_APICDEF_H
#define __ASM_MACH_APICDEF_H
#define APIC_ID_MASK (0xFF<<24)
#define BIGSMP_APIC_ID_MASK (0xFF<<24)
static inline unsigned bigsmp_get_apic_id(unsigned long x)
{

2
arch/x86/include/asm/es7000/apicdef.h
View File

@ -1,7 +1,7 @@
#ifndef __ASM_ES7000_APICDEF_H
#define __ASM_ES7000_APICDEF_H
#define APIC_ID_MASK (0xFF<<24)
#define ES7000_APIC_ID_MASK (0xFF<<24)
static inline unsigned int es7000_get_apic_id(unsigned long x)
{

3
arch/x86/include/asm/mach-default/mach_apicdef.h
View File

@ -4,10 +4,9 @@
#include <asm/apic.h>
#ifdef CONFIG_X86_64
#define APIC_ID_MASK (apic->apic_id_mask)
#define SET_APIC_ID(x) (apic->set_apic_id(x))
#else
#define APIC_ID_MASK (0xF<<24)
#define DEFAULT_APIC_ID_MASK (0x0F<<24)
static inline unsigned default_get_apic_id(unsigned long x)
{

2
arch/x86/include/asm/mach-generic/mach_apicdef.h
View File

@ -3,8 +3,6 @@
#ifndef APIC_DEFINITION
#include <asm/genapic.h>
#define APIC_ID_MASK (apic->apic_id_mask)
#endif
#endif /* _ASM_X86_MACH_GENERIC_MACH_APICDEF_H */

2
arch/x86/include/asm/numaq/apicdef.h
View File

@ -1,7 +1,7 @@
#ifndef __ASM_NUMAQ_APICDEF_H
#define __ASM_NUMAQ_APICDEF_H
#define APIC_ID_MASK (0xF<<24)
#define NUMAQ_APIC_ID_MASK (0xF<<24)
static inline unsigned int numaq_get_apic_id(unsigned long x)
{

2
arch/x86/include/asm/summit/apicdef.h
View File

@ -1,7 +1,7 @@
#ifndef __ASM_SUMMIT_APICDEF_H
#define __ASM_SUMMIT_APICDEF_H
#define APIC_ID_MASK (0xFF<<24)
#define SUMMIT_APIC_ID_MASK (0xFF<<24)
static inline unsigned summit_get_apic_id(unsigned long x)
{

4
arch/x86/kernel/apic.c
View File

@ -1009,11 +1009,11 @@ int __init verify_local_APIC(void)
*/
reg0 = apic_read(APIC_ID);
apic_printk(APIC_DEBUG, "Getting ID: %x\n", reg0);
apic_write(APIC_ID, reg0 ^ APIC_ID_MASK);
apic_write(APIC_ID, reg0 ^ apic->apic_id_mask);
reg1 = apic_read(APIC_ID);
apic_printk(APIC_DEBUG, "Getting ID: %x\n", reg1);
apic_write(APIC_ID, reg0);
if (reg1 != (reg0 ^ APIC_ID_MASK))
if (reg1 != (reg0 ^ apic->apic_id_mask))
return 0;
/*

2
arch/x86/kernel/genapic_flat_64.c
View File

@ -352,7 +352,7 @@ struct genapic apic_physflat = {
.get_apic_id = flat_get_apic_id,
.set_apic_id = set_apic_id,
.apic_id_mask = 0xFFu<<24,
.apic_id_mask = 0xFFu << 24,
.cpu_mask_to_apicid = physflat_cpu_mask_to_apicid,
.cpu_mask_to_apicid_and = physflat_cpu_mask_to_apicid_and,

2
arch/x86/mach-generic/bigsmp.c
View File

@ -92,7 +92,7 @@ struct genapic apic_bigsmp = {
.get_apic_id = bigsmp_get_apic_id,
.set_apic_id = NULL,
.apic_id_mask = APIC_ID_MASK,
.apic_id_mask = BIGSMP_APIC_ID_MASK,
.cpu_mask_to_apicid = cpu_mask_to_apicid,
.cpu_mask_to_apicid_and = cpu_mask_to_apicid_and,

2
arch/x86/mach-generic/default.c
View File

@ -73,7 +73,7 @@ struct genapic apic_default = {
.get_apic_id = default_get_apic_id,
.set_apic_id = NULL,
.apic_id_mask = APIC_ID_MASK,
.apic_id_mask = DEFAULT_APIC_ID_MASK,
.cpu_mask_to_apicid = cpu_mask_to_apicid,
.cpu_mask_to_apicid_and = cpu_mask_to_apicid_and,

2
arch/x86/mach-generic/es7000.c
View File

@ -128,7 +128,7 @@ struct genapic apic_es7000 = {
.get_apic_id = es7000_get_apic_id,
.set_apic_id = NULL,
.apic_id_mask = APIC_ID_MASK,
.apic_id_mask = ES7000_APIC_ID_MASK,
.cpu_mask_to_apicid = cpu_mask_to_apicid,
.cpu_mask_to_apicid_and = cpu_mask_to_apicid_and,

2
arch/x86/mach-generic/numaq.c
View File

@ -92,7 +92,7 @@ struct genapic apic_numaq = {
.get_apic_id = numaq_get_apic_id,
.set_apic_id = NULL,
.apic_id_mask = APIC_ID_MASK,
.apic_id_mask = NUMAQ_APIC_ID_MASK,
.cpu_mask_to_apicid = cpu_mask_to_apicid,
.cpu_mask_to_apicid_and = cpu_mask_to_apicid_and,

2
arch/x86/mach-generic/summit.c
View File

@ -72,7 +72,7 @@ struct genapic apic_summit = {
.get_apic_id = summit_get_apic_id,
.set_apic_id = NULL,
.apic_id_mask = APIC_ID_MASK,
.apic_id_mask = SUMMIT_APIC_ID_MASK,
.cpu_mask_to_apicid = cpu_mask_to_apicid,
.cpu_mask_to_apicid_and = cpu_mask_to_apicid_and,