patch-2.1.131 linux/arch/alpha/kernel/process.c

• Lines: 43
• Date: Tue Dec 1 09:33:59 1998
• Orig file: v2.1.130/linux/arch/alpha/kernel/process.c
• Orig date: Fri Oct 23 22:01:19 1998

diff -u --recursive --new-file v2.1.130/linux/arch/alpha/kernel/process.c linux/arch/alpha/kernel/process.c
@@ -133,18 +133,15 @@
 				strncpy((char *)cpup->ipc_buffer, restart_cmd,
 					sizeof(cpup->ipc_buffer));
 			}
-		}
-		else {
+		} else {
 			flags |=  0x00040000UL; /* "remain halted" */
 		}
 			
 		cpup->flags = flags;					       
 		mb();						
 
-		if (alpha_use_srm_setup) {
-			reset_for_srm();
-			set_hae(srm_hae);
-		}
+		reset_for_srm();
+		set_hae(srm_hae);
 
 #ifdef CONFIG_DUMMY_CONSOLE
 		/* This has the effect of reseting the VGA video origin.  */
@@ -156,10 +153,8 @@
 	/* Reset rtc to defaults.  */
 	{
 		unsigned char control;
-		unsigned long flags;
 
-		/* I'm not sure if i really need to disable interrupts here. */
-		save_and_cli(flags);
+		cli();
 
 		/* Reset periodic interrupt frequency.  */
 		CMOS_WRITE(0x26, RTC_FREQ_SELECT);
@@ -170,7 +165,7 @@
 		CMOS_WRITE(control, RTC_CONTROL);	
 		CMOS_READ(RTC_INTR_FLAGS);
 
-		restore_flags(flags);
+		sti();
 	}
 #endif