oneechanhax/phunix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove intr_disabled() as interrupts are always disabled in the kernel now.

Browse Source
This commit is contained in:
Ben Gras 2010-04-26 15:32:42 +00:00
parent 1718924b10
commit 86e8eff905
2 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
kernel/arch/i386/i8259.c
View File

@ -23,16 +23,6 @@
#define ICW4_PC_AEOI_SLAVE 0x0B /* not SFNM, buffered, auto EOI, 8086 */ #define ICW4_PC_AEOI_SLAVE 0x0B /* not SFNM, buffered, auto EOI, 8086 */
#define ICW4_PC_AEOI_MASTER 0x0F /* not SFNM, buffered, auto EOI, 8086 */ #define ICW4_PC_AEOI_MASTER 0x0F /* not SFNM, buffered, auto EOI, 8086 */
/*===========================================================================*
* intr_disabled *
*===========================================================================*/
PRIVATE int intr_disabled(void)
{
if(!(read_cpu_flags() & X86_FLAG_I))
return 1;
return 0;
}
/*===========================================================================* /*===========================================================================*
* intr_init * * intr_init *
*===========================================================================*/ *===========================================================================*/
@ -43,8 +33,6 @@ PUBLIC int intr_init(const int mine, const int auto_eoi)
* use the BIOS locations instead. The flag "mine" is set if the 8259s are * use the BIOS locations instead. The flag "mine" is set if the 8259s are
* to be programmed for MINIX, or to be reset to what the BIOS expects. * to be programmed for MINIX, or to be reset to what the BIOS expects.
*/ */
if (!intr_disabled())
intr_disable();
/* The AT and newer PS/2 have two interrupt controllers, one master, /* The AT and newer PS/2 have two interrupt controllers, one master,
* one slaved at IRQ 2. (We don't have to deal with the PC that * one slaved at IRQ 2. (We don't have to deal with the PC that

6
kernel/profile.c
View File

@ -40,16 +40,12 @@ PUBLIC void init_profile_clock(u32_t freq)
{ {
int irq; int irq;
intr_disable();
if((irq = arch_init_profile_clock(freq)) >= 0) { if((irq = arch_init_profile_clock(freq)) >= 0) {
/* Register interrupt handler for statistical system profiling. */ /* Register interrupt handler for statistical system profiling. */
profile_clock_hook.proc_nr_e = CLOCK; profile_clock_hook.proc_nr_e = CLOCK;
put_irq_handler(&profile_clock_hook, irq, profile_clock_handler); put_irq_handler(&profile_clock_hook, irq, profile_clock_handler);
enable_irq(&profile_clock_hook); enable_irq(&profile_clock_hook);
} }
intr_enable();
} }
/*===========================================================================* /*===========================================================================*
@ -57,9 +53,7 @@ PUBLIC void init_profile_clock(u32_t freq)
*===========================================================================*/ *===========================================================================*/
PUBLIC void stop_profile_clock() PUBLIC void stop_profile_clock()
{ {
intr_disable();
arch_stop_profile_clock(); arch_stop_profile_clock();
intr_enable();
/* Unregister interrupt handler. */ /* Unregister interrupt handler. */
disable_irq(&profile_clock_hook); disable_irq(&profile_clock_hook);