Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

x86, apic: get rid of *_APIC_ID_MASK definitions

Browse source 
Impact: cleanup

Remove the *_APIC_ID_MASK subarch definitions and move them straight
to the genapic driver initialization code.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar 2009-01-28 15:08:53 +01:00
parent 5b8127277b
commit 94af187552
10 changed files with 5 additions and 14 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,8 +1,6 @@
#ifndef __ASM_MACH_APICDEF_H
#define __ASM_MACH_APICDEF_H
#define BIGSMP_APIC_ID_MASK (0xFF<<24)
static inline unsigned bigsmp_get_apic_id(unsigned long x)
{
return (x >> 24) & 0xFF;

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

@ -1,8 +1,6 @@
#ifndef __ASM_ES7000_APICDEF_H
#define __ASM_ES7000_APICDEF_H
#define ES7000_APIC_ID_MASK (0xFF<<24)
static inline unsigned int es7000_get_apic_id(unsigned long x)
{
return (x >> 24) & 0xFF;

1
arch/x86/include/asm/mach-default/mach_apicdef.h
View file

@ -6,7 +6,6 @@
#ifdef CONFIG_X86_64
#define SET_APIC_ID(x) (apic->set_apic_id(x))
#else
#define DEFAULT_APIC_ID_MASK (0x0F<<24)
static inline unsigned default_get_apic_id(unsigned long x)
{

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

@ -1,8 +1,6 @@
#ifndef __ASM_NUMAQ_APICDEF_H
#define __ASM_NUMAQ_APICDEF_H
#define NUMAQ_APIC_ID_MASK (0xF<<24)
static inline unsigned int numaq_get_apic_id(unsigned long x)
{
return (x >> 24) & 0x0F;

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

@ -1,8 +1,6 @@
#ifndef __ASM_SUMMIT_APICDEF_H
#define __ASM_SUMMIT_APICDEF_H
#define SUMMIT_APIC_ID_MASK (0xFF<<24)
static inline unsigned summit_get_apic_id(unsigned long x)
{
return (x >> 24) & 0xFF;

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 = BIGSMP_APIC_ID_MASK,
.apic_id_mask = 0xFF << 24,
.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 = DEFAULT_APIC_ID_MASK,
.apic_id_mask = 0x0F << 24,
.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 = ES7000_APIC_ID_MASK,
.apic_id_mask = 0xFF << 24,
.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 = NUMAQ_APIC_ID_MASK,
.apic_id_mask = 0x0F << 24,
.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 = SUMMIT_APIC_ID_MASK,
.apic_id_mask = 0xFF << 24,
.cpu_mask_to_apicid = cpu_mask_to_apicid,
.cpu_mask_to_apicid_and = cpu_mask_to_apicid_and,