diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-01-27 23:08:44 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-01-28 17:20:18 -0500 |
commit | 08125d3edab90644724652eedec3e219e3e0f2e7 (patch) | |
tree | 682c5b86d8390925f60037af924236c274b02e63 /arch/x86/kernel/apic.c | |
parent | f6f52baf2613dd319e9ba3f3319bf1f1c442e4b3 (diff) |
x86: rename ->ESR_DISABLE to ->disable_esr
the ->ESR_DISABLE shouting variant was used to enable the esr_disable
macro wrappers. Those ugly macros are removed now so we can rename
->ESR_DISABLE to ->disable_esr
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/apic.c')
-rw-r--r-- | arch/x86/kernel/apic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/apic.c b/arch/x86/kernel/apic.c index 69d8c30d5711..3853ed76c888 100644 --- a/arch/x86/kernel/apic.c +++ b/arch/x86/kernel/apic.c | |||
@@ -1107,7 +1107,7 @@ static void __cpuinit lapic_setup_esr(void) | |||
1107 | return; | 1107 | return; |
1108 | } | 1108 | } |
1109 | 1109 | ||
1110 | if (apic->ESR_DISABLE) { | 1110 | if (apic->disable_esr) { |
1111 | /* | 1111 | /* |
1112 | * Something untraceable is creating bad interrupts on | 1112 | * Something untraceable is creating bad interrupts on |
1113 | * secondary quads ... for the moment, just leave the | 1113 | * secondary quads ... for the moment, just leave the |
@@ -1157,7 +1157,7 @@ void __cpuinit setup_local_APIC(void) | |||
1157 | 1157 | ||
1158 | #ifdef CONFIG_X86_32 | 1158 | #ifdef CONFIG_X86_32 |
1159 | /* Pound the ESR really hard over the head with a big hammer - mbligh */ | 1159 | /* Pound the ESR really hard over the head with a big hammer - mbligh */ |
1160 | if (lapic_is_integrated() && apic->ESR_DISABLE) { | 1160 | if (lapic_is_integrated() && apic->disable_esr) { |
1161 | apic_write(APIC_ESR, 0); | 1161 | apic_write(APIC_ESR, 0); |
1162 | apic_write(APIC_ESR, 0); | 1162 | apic_write(APIC_ESR, 0); |
1163 | apic_write(APIC_ESR, 0); | 1163 | apic_write(APIC_ESR, 0); |