diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-25 15:09:08 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-25 15:09:08 -0700 |
| commit | 425dbc6db34dbd679cab1a17135c5910b271a03d (patch) | |
| tree | 220c5c6e10a798707c5b44dfed11e2e18ac7f9d0 /arch/x86/include/asm | |
| parent | 766fd5f6cdaf1d558afba19850493b2603c9625d (diff) | |
| parent | 102bb9fef68a21f357dc813d4792666c8295bc35 (diff) | |
| download | linux-425dbc6db34dbd679cab1a17135c5910b271a03d.tar.bz2 | |
Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86/apic updates from Ingo Molnar:
"Misc cleanups and a small fix"
* 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/apic: Remove the unused struct apic::apic_id_mask field
x86/apic: Fix misspelled APIC
x86/ioapic: Simplify ioapic_setup_resources()
Diffstat (limited to 'arch/x86/include/asm')
| -rw-r--r-- | arch/x86/include/asm/apic.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h index bc27611fa58f..f5befd4945f2 100644 --- a/arch/x86/include/asm/apic.h +++ b/arch/x86/include/asm/apic.h @@ -300,7 +300,6 @@ struct apic { unsigned int (*get_apic_id)(unsigned long x); unsigned long (*set_apic_id)(unsigned int id); - unsigned long apic_id_mask; int (*cpu_mask_to_apicid_and)(const struct cpumask *cpumask, const struct cpumask *andmask, |