diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2019-11-10 17:36:07 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2019-11-10 17:41:15 +0100 |
| commit | e45601b0780b2c81a6448cdafd952cb98112b9f4 (patch) | |
| tree | 2f980cbf0cdad3b51a65dfd8d75761671c4b8093 /linux/dev/glue/block.c | |
| parent | 7f51764417ba51667ad5bfa0c1756eba4c1a8ad4 (diff) | |
| download | gnumach-e45601b0780b2c81a6448cdafd952cb98112b9f4.tar.gz gnumach-e45601b0780b2c81a6448cdafd952cb98112b9f4.tar.bz2 gnumach-e45601b0780b2c81a6448cdafd952cb98112b9f4.zip | |
spl: Remove intpri array
And simplify prtnull vs intnull vs linux_bad_intr.
* i386/i386/ipl.h (intpri): Remove declaration
* i386/i386/pic.c (prtnull_count): Remove variable.
(prtnull): Remove function.
* i386/i386/pic.h (prtnull): Remove declaration.
* i386/i386at/autoconf.c (take_dev_irq, take_ctlr_irq): Use ivect instead of
intpri to determine irq availability. Do not set intpri.
* i386/i386at/pic_isa.c (ivect): Replace prtnull with intnull.
(intpri): Remove array.
* linux/dev/arch/i386/kernel/irq.c (linux_intr_pri): Remove variable.
(linux_bad_intr): Remove function.
(setup_x86_irq): Do not check intpri coherency. Do not set intpri. Set
default ivect to intnull instead of linux_bad_intr.
(probe_irq_on): Check ivect against intnull instead of linux_bad_intr.
Do not set intpri.
(probe_irq_off): Likewise.
(reserve_mach_irqs): Do not check against prtnull.
(old_clock_pri): Remove variable.
(init_IRQ): Do not set intpri. Do not set ivect to linux_bad_intr.
(restore_IRQ): Do not set ivect.
* i386/i386/pit.c (clkstart): Do not set intpri.
* i386/i386at/kd_mouse.c (kd_mouse_open, kd_mouse_close): Likewise.
* linux/dev/drivers/block/genhd.c (device_setup): Do not set linux_intr_pri.
* linux/dev/glue/block.c (init_partition, device_open): Likewise.
* linux/dev/glue/net.c (device_open): Likewise.
* linux/dev/glue/glue.h (linux_intr_pri, linux_bad_intr): Remove
declarations.
Diffstat (limited to 'linux/dev/glue/block.c')
| -rw-r--r-- | linux/dev/glue/block.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/linux/dev/glue/block.c b/linux/dev/glue/block.c index 0a5b1c87..a8cb9b3f 100644 --- a/linux/dev/glue/block.c +++ b/linux/dev/glue/block.c @@ -943,7 +943,6 @@ init_partition (struct name_map *np, kdev_t *dev, if (gd->part[MINOR (d->inode.i_rdev)].nr_sects <= 0 || gd->part[MINOR (d->inode.i_rdev)].start_sect < 0) continue; - linux_intr_pri = SPL6; d->file.f_flags = 0; d->file.f_mode = O_RDONLY; if (ds->fops->open && (*ds->fops->open) (&d->inode, &d->file)) @@ -1089,7 +1088,6 @@ device_open (ipc_port_t reply_port, mach_msg_type_name_t reply_port_type, if (ds->fops->open) { td.inode.i_rdev = dev; - linux_intr_pri = SPL6; err = (*ds->fops->open) (&td.inode, &td.file); if (err) { |