diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-26 00:09:08 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-26 00:09:08 +0200 |
| commit | 425dbc6db34dbd679cab1a17135c5910b271a03d (patch) | |
| tree | 220c5c6e10a798707c5b44dfed11e2e18ac7f9d0 /arch/x86/xen | |
| parent | Merge branch 'timers-nohz-for-linus' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
| parent | x86/apic: Remove the unused struct apic::apic_id_mask field (diff) | |
| download | linux-425dbc6db34dbd679cab1a17135c5910b271a03d.tar.xz linux-425dbc6db34dbd679cab1a17135c5910b271a03d.zip | |
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/xen')
| -rw-r--r-- | arch/x86/xen/apic.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/xen/apic.c b/arch/x86/xen/apic.c index db52a7fafcc2..44c88ad1841a 100644 --- a/arch/x86/xen/apic.c +++ b/arch/x86/xen/apic.c @@ -177,7 +177,6 @@ static struct apic xen_pv_apic = { .get_apic_id = xen_get_apic_id, .set_apic_id = xen_set_apic_id, /* Can be NULL on 32-bit. */ - .apic_id_mask = 0xFF << 24, /* Used by verify_local_APIC. Match with what xen_get_apic_id does. */ .cpu_mask_to_apicid_and = flat_cpu_mask_to_apicid_and, |