diff options
author | Mateusz Guzik <mjg@FreeBSD.org> | 2020-09-01 21:23:59 +0000 |
---|---|---|
committer | Mateusz Guzik <mjg@FreeBSD.org> | 2020-09-01 21:23:59 +0000 |
commit | ab6c81a218fdb86607085694cff871a4e9944c45 (patch) | |
tree | bfa06d4bc69220cdd057738d26eb24165a49c978 | |
parent | d90f2c361712e7f6e9270a67c54529e906a5ae5b (diff) |
Notes
40 files changed, 15 insertions, 63 deletions
diff --git a/sys/x86/acpica/madt.c b/sys/x86/acpica/madt.c index 5c1e5b9f88484..5683f7eb321d5 100644 --- a/sys/x86/acpica/madt.c +++ b/sys/x86/acpica/madt.c @@ -405,7 +405,6 @@ madt_setup_cpus_handler(ACPI_SUBTABLE_HEADER *entry, void *arg) } } - /* * Add an I/O APIC from an entry in the table. */ diff --git a/sys/x86/cpufreq/est.c b/sys/x86/cpufreq/est.c index 073a94ae0cae1..258a9c493d0f4 100644 --- a/sys/x86/cpufreq/est.c +++ b/sys/x86/cpufreq/est.c @@ -888,7 +888,6 @@ static device_method_t est_methods[] = { /* ACPI interface */ DEVMETHOD(acpi_get_features, est_features), - {0, 0} }; diff --git a/sys/x86/cpufreq/hwpstate_amd.c b/sys/x86/cpufreq/hwpstate_amd.c index 561769f4c640c..ee67da43de53e 100644 --- a/sys/x86/cpufreq/hwpstate_amd.c +++ b/sys/x86/cpufreq/hwpstate_amd.c @@ -153,7 +153,6 @@ static device_method_t hwpstate_methods[] = { /* ACPI interface */ DEVMETHOD(acpi_get_features, hwpstate_features), - {0, 0} }; diff --git a/sys/x86/cpufreq/p4tcc.c b/sys/x86/cpufreq/p4tcc.c index e7360b4e67986..89bfef3f69300 100644 --- a/sys/x86/cpufreq/p4tcc.c +++ b/sys/x86/cpufreq/p4tcc.c @@ -57,7 +57,7 @@ __FBSDID("$FreeBSD$"); #include <dev/acpica/acpivar.h> #include "acpi_if.h" - + struct p4tcc_softc { device_t dev; int set_count; @@ -97,7 +97,6 @@ static device_method_t p4tcc_methods[] = { /* ACPI interface */ DEVMETHOD(acpi_get_features, p4tcc_features), - {0, 0} }; diff --git a/sys/x86/cpufreq/powernow.c b/sys/x86/cpufreq/powernow.c index 1e45e1db30a14..da55985573874 100644 --- a/sys/x86/cpufreq/powernow.c +++ b/sys/x86/cpufreq/powernow.c @@ -146,7 +146,6 @@ struct pst_header { #define ACPI_PN8_CTRL_TO_RVO(x) (((x) >> 28) & 0x03) #define ACPI_PN8_CTRL_TO_IRT(x) (((x) >> 30) & 0x03) - #define WRITE_FIDVID(fid, vid, ctrl) \ wrmsr(MSR_AMDK7_FIDVID_CTL, \ (((ctrl) << 32) | (1ULL << 16) | ((vid) << 8) | (fid))) @@ -169,7 +168,6 @@ static int pn7_fid_to_mult[32] = { 150, 225, 160, 165, 170, 180, 0, 0, }; - static int pn8_fid_to_mult[64] = { 40, 45, 50, 55, 60, 65, 70, 75, 80, 85, 90, 95, 100, 105, 110, 115, @@ -262,7 +260,6 @@ static device_method_t pn_methods[] = { DEVMETHOD(cpufreq_drv_get, pn_get), DEVMETHOD(cpufreq_drv_settings, pn_settings), DEVMETHOD(cpufreq_drv_type, pn_type), - {0, 0} }; diff --git a/sys/x86/cpufreq/smist.c b/sys/x86/cpufreq/smist.c index f878ed89494ca..f95939001ecba 100644 --- a/sys/x86/cpufreq/smist.c +++ b/sys/x86/cpufreq/smist.c @@ -100,7 +100,6 @@ static device_method_t smist_methods[] = { DEVMETHOD(cpufreq_drv_get, smist_get), DEVMETHOD(cpufreq_drv_type, smist_type), DEVMETHOD(cpufreq_drv_settings, smist_settings), - {0, 0} }; diff --git a/sys/x86/include/acpica_machdep.h b/sys/x86/include/acpica_machdep.h index 05e8711c16faa..d6694be9c3736 100644 --- a/sys/x86/include/acpica_machdep.h +++ b/sys/x86/include/acpica_machdep.h @@ -70,7 +70,7 @@ int acpi_release_global_lock(volatile uint32_t *); #define ACPI_RELEASE_GLOBAL_LOCK(GLptr, Acq) do { \ (Acq) = acpi_release_global_lock(&((GLptr)->GlobalLock)); \ } while (0) - + enum intr_trigger; enum intr_polarity; diff --git a/sys/x86/include/apicreg.h b/sys/x86/include/apicreg.h index d0173e2ecaf8d..fb8b3b92e6586 100644 --- a/sys/x86/include/apicreg.h +++ b/sys/x86/include/apicreg.h @@ -110,12 +110,10 @@ * 3F0 Reserved */ - /****************************************************************************** * global defines, etc. */ - /****************************************************************************** * LOCAL APIC structure */ @@ -286,7 +284,6 @@ typedef struct IOAPIC ioapic_t; #endif /* !LOCORE */ - /****************************************************************************** * various code 'logical' values */ @@ -412,7 +409,6 @@ typedef struct IOAPIC ioapic_t; #define APIC_LVT_TM 0x00008000 #define APIC_LVT_M 0x00010000 - /* fields in LVT Timer */ #define APIC_LVTT_VECTOR 0x000000ff #define APIC_LVTT_DS 0x00001000 diff --git a/sys/x86/include/apicvar.h b/sys/x86/include/apicvar.h index 0f4961c1d631f..f1794afa0bbd3 100644 --- a/sys/x86/include/apicvar.h +++ b/sys/x86/include/apicvar.h @@ -229,7 +229,6 @@ struct apic_ops { void (*disable_vector)(u_int, u_int); void (*free_vector)(u_int, u_int, u_int); - /* PMC */ int (*enable_pmc)(void); void (*disable_pmc)(void); diff --git a/sys/x86/include/apm_bios.h b/sys/x86/include/apm_bios.h index 05bef867a2f13..5c855afde1be0 100644 --- a/sys/x86/include/apm_bios.h +++ b/sys/x86/include/apm_bios.h @@ -76,7 +76,6 @@ #define APME_NOPMEVENT 0x80 #define APME_NOAPMPRESENT 0x86 - /* device code */ #define PMDV_APMBIOS 0x0000 #define PMDV_ALLDEV 0x0001 diff --git a/sys/x86/include/bus.h b/sys/x86/include/bus.h index b1675ee26cf40..0e9d2f1122597 100644 --- a/sys/x86/include/bus.h +++ b/sys/x86/include/bus.h @@ -194,7 +194,6 @@ bus_space_free(bus_space_tag_t t __unused, bus_space_handle_t bsh __unused, { } - /* * Read a 1, 2, 4, or 8 byte quantity from bus space * described by tag/handle/offset. @@ -362,7 +361,6 @@ static __inline void bus_space_read_region_4(bus_space_tag_t tag, bus_size_t offset, u_int32_t *addr, size_t count); - static __inline void bus_space_read_region_1(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, u_int8_t *addr, size_t count) diff --git a/sys/x86/include/bus_dma.h b/sys/x86/include/bus_dma.h index b4da787e9cfcd..c7d5ce2bc2687 100644 --- a/sys/x86/include/bus_dma.h +++ b/sys/x86/include/bus_dma.h @@ -192,4 +192,3 @@ _bus_dmamap_complete(bus_dma_tag_t dmat, bus_dmamap_t map, } #endif /* !_X86_BUS_DMA_H_ */ - diff --git a/sys/x86/include/elf.h b/sys/x86/include/elf.h index 2e5e5b31b4bde..e587b52202e85 100644 --- a/sys/x86/include/elf.h +++ b/sys/x86/include/elf.h @@ -122,7 +122,6 @@ typedef struct { /* Auxiliary vector entry on initial stack */ } a_un; } Elf32_Auxinfo; - typedef struct { /* Auxiliary vector entry on initial stack */ long a_type; /* Entry type. */ union { diff --git a/sys/x86/iommu/intel_drv.c b/sys/x86/iommu/intel_drv.c index e16fa2bbb6978..fbd4f7a0ee826 100644 --- a/sys/x86/iommu/intel_drv.c +++ b/sys/x86/iommu/intel_drv.c @@ -866,7 +866,6 @@ dmar_find_nonpci(u_int id, u_int entry_type, uint16_t *rid) return (NULL); } - struct dmar_unit * dmar_find_hpet(device_t dev, uint16_t *rid) { diff --git a/sys/x86/iommu/intel_idpgtbl.c b/sys/x86/iommu/intel_idpgtbl.c index 76cda797a160b..9fd06d49d3b01 100644 --- a/sys/x86/iommu/intel_idpgtbl.c +++ b/sys/x86/iommu/intel_idpgtbl.c @@ -267,7 +267,7 @@ end: dmar_flush_write_bufs(unit); DMAR_UNLOCK(unit); } - + return (res); } diff --git a/sys/x86/isa/atpic.c b/sys/x86/isa/atpic.c index 218fdb17035ad..bb902610b0f4d 100644 --- a/sys/x86/isa/atpic.c +++ b/sys/x86/isa/atpic.c @@ -310,7 +310,6 @@ atpic_disable_intr(struct intsrc *isrc) { } - static int atpic_vector(struct intsrc *isrc) { @@ -562,7 +561,7 @@ static int atpic_probe(device_t dev) { int result; - + result = ISA_PNP_PROBE(device_get_parent(dev), dev, atpic_ids); if (result <= 0) device_quiet(dev); diff --git a/sys/x86/isa/atrtc.c b/sys/x86/isa/atrtc.c index 524d958329c70..cad8015435d0b 100644 --- a/sys/x86/isa/atrtc.c +++ b/sys/x86/isa/atrtc.c @@ -617,7 +617,6 @@ static device_method_t atrtc_isa_methods[] = { /* clock interface */ DEVMETHOD(clock_gettime, atrtc_gettime), DEVMETHOD(clock_settime, atrtc_settime), - { 0, 0 } }; @@ -639,7 +638,6 @@ static device_method_t atrtc_acpi_methods[] = { /* clock interface */ DEVMETHOD(clock_gettime, atrtc_gettime), DEVMETHOD(clock_settime, atrtc_settime), - { 0, 0 } }; diff --git a/sys/x86/isa/clock.c b/sys/x86/isa/clock.c index b867789c7b1ac..0438e4def2c98 100644 --- a/sys/x86/isa/clock.c +++ b/sys/x86/isa/clock.c @@ -543,7 +543,7 @@ attimer_stop(struct eventtimer *et) { device_t dev = (device_t)et->et_priv; struct attimer_softc *sc = device_get_softc(dev); - + sc->mode = MODE_STOP; sc->period = 0; set_i8254_freq(sc->mode, sc->period); @@ -563,7 +563,7 @@ static int attimer_probe(device_t dev) { int result; - + result = ISA_PNP_PROBE(device_get_parent(dev), dev, attimer_ids); /* ENOENT means no PnP-ID, device is hinted. */ if (result == ENOENT) { diff --git a/sys/x86/isa/isa.c b/sys/x86/isa/isa.c index 7a98a2bf9ed88..49402b44ffbaa 100644 --- a/sys/x86/isa/isa.c +++ b/sys/x86/isa/isa.c @@ -97,7 +97,7 @@ isa_alloc_resource(device_t bus, device_t child, int type, int *rid, struct isa_device* idev = DEVTOISA(child); struct resource_list *rl = &idev->id_resources; struct resource_list_entry *rle; - + if (!passthrough && !isdefault) { rle = resource_list_find(rl, type, *rid); if (!rle) { diff --git a/sys/x86/isa/isa_dma.c b/sys/x86/isa/isa_dma.c index d4f4ebf032118..661dcd8c0825a 100644 --- a/sys/x86/isa/isa_dma.c +++ b/sys/x86/isa/isa_dma.c @@ -95,7 +95,6 @@ isa_dma_init(int chan, u_int bouncebufsize, int flag) panic("isa_dma_init: channel out of range"); #endif - /* Try malloc() first. It works better if it works. */ buf = malloc(bouncebufsize, M_DEVBUF, flag); if (buf != NULL) { @@ -576,7 +575,7 @@ static int atdma_probe(device_t dev) { int result; - + if ((result = ISA_PNP_PROBE(device_get_parent(dev), dev, atdma_ids)) <= 0) device_quiet(dev); return(result); diff --git a/sys/x86/isa/nmi.c b/sys/x86/isa/nmi.c index 92e9ba30d927f..dc830744d49a9 100644 --- a/sys/x86/isa/nmi.c +++ b/sys/x86/isa/nmi.c @@ -61,7 +61,7 @@ isa_nmi(int cd) int eisa_port = inb(0x461); log(LOG_CRIT, "NMI ISA %x, EISA %x\n", isa_port, eisa_port); - + if (isa_port & NMI_PARITY) { log(LOG_CRIT, "RAM parity error, likely hardware failure."); retval = 1; diff --git a/sys/x86/isa/orm.c b/sys/x86/isa/orm.c index fee9aae8b5f68..6c16a8f63b272 100644 --- a/sys/x86/isa/orm.c +++ b/sys/x86/isa/orm.c @@ -163,7 +163,7 @@ orm_detach(device_t dev) { int i; struct orm_softc *sc = device_get_softc(dev); - + for (i = 0; i < sc->rnum; i++) bus_release_resource(dev, SYS_RES_MEMORY, sc->rid[i], sc->res[i]); diff --git a/sys/x86/pci/pci_bus.c b/sys/x86/pci/pci_bus.c index 7c5df9ae9de00..0487c8475f43c 100644 --- a/sys/x86/pci/pci_bus.c +++ b/sys/x86/pci/pci_bus.c @@ -397,7 +397,6 @@ legacy_pcib_identify(driver_t *driver, device_t parent) devclass_get_device(pci_devclass, 0)) return; - bus = 0; retry: for (slot = 0; slot <= PCI_SLOTMAX; slot++) { @@ -675,7 +674,6 @@ static devclass_t hostb_devclass; DEFINE_CLASS_0(pcib, legacy_pcib_driver, legacy_pcib_methods, 1); DRIVER_MODULE(pcib, legacy, legacy_pcib_driver, hostb_devclass, 0, 0); - /* * Install placeholder to claim the resources owned by the * PCI bus interface. This could be used to extract the @@ -737,7 +735,6 @@ static device_method_t pcibios_pcib_pci_methods[] = { /* pcib interface */ DEVMETHOD(pcib_route_interrupt, legacy_pcib_route_interrupt), - {0, 0} }; diff --git a/sys/x86/pci/qpi.c b/sys/x86/pci/qpi.c index 73e19351b6c47..f567d680ad96c 100644 --- a/sys/x86/pci/qpi.c +++ b/sys/x86/pci/qpi.c @@ -211,7 +211,6 @@ static device_method_t qpi_methods[] = { DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), - { 0, 0 } }; diff --git a/sys/x86/x86/busdma_bounce.c b/sys/x86/x86/busdma_bounce.c index 59c4ed206b372..338e985f63321 100644 --- a/sys/x86/x86/busdma_bounce.c +++ b/sys/x86/x86/busdma_bounce.c @@ -215,7 +215,7 @@ bounce_bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment, error = bounce_bus_dma_zone_setup(newtag); else error = 0; - + if (error != 0) free(newtag, M_DEVBUF); else @@ -394,7 +394,6 @@ bounce_bus_dmamap_destroy(bus_dma_tag_t dmat, bus_dmamap_t map) return (0); } - /* * Allocate a piece of memory that can be efficiently mapped into * bus device space based on the constraints lited in the dma tag. diff --git a/sys/x86/x86/identcpu.c b/sys/x86/x86/identcpu.c index f169a0821b38f..938c24d1951f6 100644 --- a/sys/x86/x86/identcpu.c +++ b/sys/x86/x86/identcpu.c @@ -779,7 +779,6 @@ printcpuinfo(void) * http://www.intel.com/assets/pdf/appnote/241618.pdf */ if (cpu_high > 0) { - /* * Here we should probably set up flags indicating * whether or not various features are available. @@ -1277,7 +1276,6 @@ identblue(void) return IDENTBLUE_IBMCPU; } - /* * identifycyrix() set lower 16 bits of cyrix_did as follows: * diff --git a/sys/x86/x86/io_apic.c b/sys/x86/x86/io_apic.c index f7835948ccf7c..da5b5c36cb999 100644 --- a/sys/x86/x86/io_apic.c +++ b/sys/x86/x86/io_apic.c @@ -510,7 +510,6 @@ ioapic_enable_intr(struct intsrc *isrc) apic_enable_vector(intpin->io_cpu, intpin->io_vector); } - static void ioapic_disable_intr(struct intsrc *isrc) { @@ -1054,7 +1053,6 @@ static device_method_t ioapic_pci_methods[] = { /* Device interface */ DEVMETHOD(device_probe, ioapic_pci_probe), DEVMETHOD(device_attach, ioapic_pci_attach), - { 0, 0 } }; @@ -1146,7 +1144,6 @@ static device_method_t apic_methods[] = { DEVMETHOD(device_identify, apic_identify), DEVMETHOD(device_probe, apic_probe), DEVMETHOD(device_attach, apic_attach), - { 0, 0 } }; diff --git a/sys/x86/x86/legacy.c b/sys/x86/x86/legacy.c index 217fa2e23e912..991f31673b614 100644 --- a/sys/x86/x86/legacy.c +++ b/sys/x86/x86/legacy.c @@ -91,7 +91,6 @@ static device_method_t legacy_methods[] = { DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), - { 0, 0 } }; @@ -242,7 +241,6 @@ legacy_read_ivar(device_t dev, device_t child, int which, uintptr_t *result) } return 0; } - static int legacy_write_ivar(device_t dev, device_t child, int which, uintptr_t value) diff --git a/sys/x86/x86/local_apic.c b/sys/x86/x86/local_apic.c index 878b0a0fa969a..ed060c91195de 100644 --- a/sys/x86/x86/local_apic.c +++ b/sys/x86/x86/local_apic.c @@ -666,7 +666,6 @@ native_lapic_create(u_int apic_id, int boot_cpu) lapics[apic_id].la_ioint_irqs[IDT_EVTCHN - APIC_IO_INTS] = IRQ_EVTCHN; #endif - #ifdef SMP cpu_add(apic_id, boot_cpu); #endif @@ -1564,7 +1563,6 @@ native_apic_alloc_vectors(u_int apic_id, u_int *irqs, u_int count, u_int align) first = 0; mtx_lock_spin(&icu_lock); for (vector = 0; vector < APIC_NUM_IOINTS; vector++) { - /* Vector is in use, end run. */ if (lapics[apic_id].la_ioint_irqs[vector] != IRQ_FREE) { run = 0; diff --git a/sys/x86/x86/mca.c b/sys/x86/x86/mca.c index cfdf0cb805dec..03100e77d4559 100644 --- a/sys/x86/x86/mca.c +++ b/sys/x86/x86/mca.c @@ -789,7 +789,7 @@ mca_scan(enum scan_mode mode, int *recoverablep) } mca_record_entry(mode, &rec); } - + #ifdef DEV_APIC /* * If this is a bank this CPU monitors via CMCI, diff --git a/sys/x86/x86/mp_x86.c b/sys/x86/x86/mp_x86.c index df17cfd6b1374..0f528f6567eef 100644 --- a/sys/x86/x86/mp_x86.c +++ b/sys/x86/x86/mp_x86.c @@ -1146,7 +1146,6 @@ set_interrupt_apic_ids(void) } } - #ifdef COUNT_XINVLTLB_HITS u_int xhits_gbl[MAXCPU]; u_int xhits_pg[MAXCPU]; diff --git a/sys/x86/x86/mptable.c b/sys/x86/x86/mptable.c index 81e9157c3ba6b..5cc42863cf386 100644 --- a/sys/x86/x86/mptable.c +++ b/sys/x86/x86/mptable.c @@ -496,7 +496,6 @@ mptable_probe_cpus_handler(u_char *entry, void *arg) } } - static void mptable_setup_cpus_handler(u_char *entry, void *arg) { @@ -581,7 +580,6 @@ mptable_parse_apics_and_busses_handler(u_char *entry, void *arg __unused) enum busTypes bus_type; int i; - switch (*entry) { case MPCT_ENTRY_BUS: bus = (bus_entry_ptr)entry; diff --git a/sys/x86/x86/mptable_pci.c b/sys/x86/x86/mptable_pci.c index bb5ec4fac66ff..d4bda2183ba17 100644 --- a/sys/x86/x86/mptable_pci.c +++ b/sys/x86/x86/mptable_pci.c @@ -230,7 +230,6 @@ static device_method_t mptable_pcib_pci_methods[] = { /* pcib interface */ DEVMETHOD(pcib_route_interrupt, mptable_pci_route_interrupt), - {0, 0} }; diff --git a/sys/x86/x86/nexus.c b/sys/x86/x86/nexus.c index 64ebee7f1f641..91e33fa2278f9 100644 --- a/sys/x86/x86/nexus.c +++ b/sys/x86/x86/nexus.c @@ -187,7 +187,6 @@ static device_method_t nexus_methods[] = { DEVMETHOD(pcib_release_msix, nexus_release_msix), DEVMETHOD(pcib_map_msi, nexus_map_msi), #endif - { 0, 0 } }; @@ -537,7 +536,7 @@ static int nexus_unmap_resource(device_t bus, device_t child, int type, struct resource *r, struct resource_map *map) { - + /* * If this is a memory resource, unmap it. */ diff --git a/sys/x86/x86/x86_mem.c b/sys/x86/x86/x86_mem.c index 8bc4d3917a03a..227c9b1719ad1 100644 --- a/sys/x86/x86/x86_mem.c +++ b/sys/x86/x86/x86_mem.c @@ -507,7 +507,6 @@ x86_mrsetvariable(struct mem_range_softc *sc, struct mem_range_desc *mrd, /* Exact match? */ if (curr_md->mr_base == mrd->mr_base && curr_md->mr_len == mrd->mr_len) { - /* Whoops, owned by someone. */ if (curr_md->mr_flags & MDF_BUSY) return (EBUSY); diff --git a/sys/x86/xen/hvm.c b/sys/x86/xen/hvm.c index a0a0e4b751532..9b5b588234c49 100644 --- a/sys/x86/xen/hvm.c +++ b/sys/x86/xen/hvm.c @@ -416,7 +416,7 @@ xen_hvm_resume(bool suspend_cancelled) /* Register vcpu_info area for CPU#0. */ xen_hvm_cpu_init(); } - + static void xen_hvm_sysinit(void *arg __unused) { diff --git a/sys/x86/xen/pv.c b/sys/x86/xen/pv.c index e86efde1fe393..34fcbd990491b 100644 --- a/sys/x86/xen/pv.c +++ b/sys/x86/xen/pv.c @@ -406,7 +406,6 @@ xen_pv_start_all_aps(void) mtx_init(&ap_boot_mtx, "ap boot", NULL, MTX_SPIN); for (cpu = 1; cpu < mp_ncpus; cpu++) { - /* attempt to start the Application Processor */ if (!start_xen_ap(cpu)) panic("AP #%d failed to start!", cpu); diff --git a/sys/x86/xen/xen_apic.c b/sys/x86/xen/xen_apic.c index 78471eb1d9971..01dae36de2e8b 100644 --- a/sys/x86/xen/xen_apic.c +++ b/sys/x86/xen/xen_apic.c @@ -61,7 +61,6 @@ __FBSDID("$FreeBSD$"); #define XEN_APIC_UNSUPPORTED \ panic("%s: not available in Xen PV port.", __func__) - /*--------------------------- Forward Declarations ---------------------------*/ #ifdef SMP static driver_filter_t xen_smp_rendezvous_action; @@ -549,7 +548,6 @@ xen_cpu_ipi_init(int cpu) ipi_handle = DPCPU_ID_GET(cpu, ipi_handle); for (ipi = xen_ipis, idx = 0; idx < nitems(xen_ipis); ipi++, idx++) { - if (ipi->filter == NULL) { ipi_handle[idx] = NULL; continue; diff --git a/sys/x86/xen/xen_intr.c b/sys/x86/xen/xen_intr.c index f230794d3a50f..435db2e316933 100644 --- a/sys/x86/xen/xen_intr.c +++ b/sys/x86/xen/xen_intr.c @@ -560,7 +560,6 @@ xen_intr_handle_upcall(struct trapframe *trap_frame) (*pc->evtchn_intrcnt)++; while (l1 != 0) { - l1i = (l1i + 1) % LONG_BIT; masked_l1 = l1 & ((~0UL) << l1i); @@ -1573,7 +1572,7 @@ xen_intr_port(xen_intr_handle_t handle) isrc = xen_intr_isrc(handle); if (isrc == NULL) return (0); - + return (isrc->xi_port); } diff --git a/sys/x86/xen/xen_nexus.c b/sys/x86/xen/xen_nexus.c index 65d4281a14261..2469abb63266f 100644 --- a/sys/x86/xen/xen_nexus.c +++ b/sys/x86/xen/xen_nexus.c @@ -157,7 +157,6 @@ static device_method_t nexus_xen_methods[] = { DEVMETHOD(pcib_alloc_msix, nexus_xen_alloc_msix), DEVMETHOD(pcib_release_msix, nexus_xen_release_msix), DEVMETHOD(pcib_map_msi, nexus_xen_map_msi), - { 0, 0 } }; |