> Date: Tue, 7 Jun 2016 12:57:16 +1000
> From: David Gwynne <[email protected]>
> 
> nothing using splsoftfd or splausoft on sparc64 so we can remove them.
> 
> ok?

ok kettenis@

> Index: dev/fd.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/sparc64/dev/fd.c,v
> retrieving revision 1.45
> diff -u -p -r1.45 fd.c
> --- dev/fd.c  12 Jul 2014 18:44:43 -0000      1.45
> +++ dev/fd.c  7 Jun 2016 02:56:23 -0000
> @@ -542,7 +542,6 @@ fdcattach(fdc, pri)
>               return (-1);
>       }
>  
> -     printf(" softpri %d", PIL_FDSOFT);
>       if (fdc->sc_flags & FDC_NOEJECT)
>               printf(": manual eject");
>       printf("\n");
> Index: include/psl.h
> ===================================================================
> RCS file: /cvs/src/sys/arch/sparc64/include/psl.h,v
> retrieving revision 1.29
> diff -u -p -r1.29 psl.h
> --- include/psl.h     7 Mar 2016 13:21:51 -0000       1.29
> +++ include/psl.h     7 Jun 2016 02:56:23 -0000
> @@ -46,8 +46,6 @@
>  
>  /* Interesting spl()s */
>  #define PIL_SCSI     3
> -#define PIL_FDSOFT   4
> -#define PIL_AUSOFT   4
>  #define PIL_BIO              5
>  #define PIL_VIDEO    5
>  #define PIL_TTY              6
> @@ -402,12 +400,6 @@ SPLHOLD(splsoftint, 1)
>  #define      splsoftclock    splsoftint
>  #define      splsoftnet      splsoftint
>  
> -/* audio software interrupts are at software level 4 */
> -SPLHOLD(splausoft, PIL_AUSOFT)
> -
> -/* floppy software interrupts are at software level 4 too */
> -SPLHOLD(splfdsoft, PIL_FDSOFT)
> -
>  /* Block devices */
>  SPLHOLD(splbio, PIL_BIO)
>  
> @@ -447,8 +439,6 @@ SPLHOLD(splhigh, PIL_HIGH)
>  
>  #define      spl0()          spl0X(__FILE__, __LINE__)
>  #define      splsoftint()    splsoftintX(__FILE__, __LINE__)
> -#define      splausoft()     splausoftX(__FILE__, __LINE__)
> -#define      splfdsoft()     splfdsoftX(__FILE__, __LINE__)
>  #define      splbio()        splbioX(__FILE__, __LINE__)
>  #define      splnet()        splnetX(__FILE__, __LINE__)
>  #define      spltty()        splttyX(__FILE__, __LINE__)
> 
> 

Reply via email to