From: Mark Kettenis <mark.kettenis@xs4all.nl>
Subject: Re: [EXT] ioapic(4) cleanup diff
To: Hans-Jörg Höxer <hshoexer@genua.de>
Cc: tech@openbsd.org, Hans-Joerg_Hoexer@genua.de
Date: Fri, 05 Sep 2025 19:02:20 +0200

> Date: Tue, 2 Sep 2025 14:28:37 +0200
> From: Hans-Jörg Höxer <hshoexer@genua.de>
> 
> Hi,
> 
> On Sat, Aug 30, 2025 at 09:25:27PM +0200, Mark Kettenis wrote:
> > ...
> > Index: arch/amd64/amd64/genassym.cf
> > ===================================================================
> > RCS file: /cvs/src/sys/arch/amd64/amd64/genassym.cf,v
> > diff -u -p -r1.47 genassym.cf
> > --- arch/amd64/amd64/genassym.cf	10 Jul 2025 13:59:27 -0000	1.47
> > +++ arch/amd64/amd64/genassym.cf	28 Aug 2025 19:29:41 -0000
> > @@ -12,7 +12,6 @@ include <machine/pte.h>
> >  include <machine/vmparam.h>
> >  include <machine/intr.h>
> >  include <machine/tss.h>
> > -include <machine/i82093var.h>
> >  
> >  export	SONPROC
> >  
> > @@ -140,10 +139,6 @@ member	ih_arg
> >  member	ih_next
> >  member	ih_level
> >  member	IH_COUNT	ih_count.ec_count
> > -
> > -struct	ioapic_softc
> > -member	IOAPIC_SC_REG	sc_reg
> > -member	IOAPIC_SC_DATA	sc_data
> >  
> >  # pte fields
> >  export	PG_V
> 
> alongside those, we could also clean up struct intrhand and struct
> intrsources some more:

I committed my diff now.  Maybe give it a few days before you pile
this on top of that.  But otherwise:

ok kettenis@

> diff --git a/sys/arch/amd64/amd64/genassym.cf b/sys/arch/amd64/amd64/genassym.cf
> index 84d1c992b70..80cafa440f4 100644
> --- a/sys/arch/amd64/amd64/genassym.cf
> +++ b/sys/arch/amd64/amd64/genassym.cf
> @@ -128,14 +128,10 @@ member	is_recurse
>  member	is_resume
>  member	is_handlers
>  member	is_pic
> -member	is_flags
>  member	is_pin
> -member	is_type
>  member	is_maxlevel
>  
>  struct	intrhand
> -member	ih_fun
> -member	ih_arg
>  member	ih_next
>  member	ih_level
>  member	IH_COUNT	ih_count.ec_count
> 
> [2:application/pkcs7-signature Show Save:smime.p7s (5kB)]
>