patch-2.1.92 linux/drivers/char/apm_bios.c

• Lines: 28
• Date: Wed Apr 1 14:41:32 1998
• Orig file: v2.1.91/linux/drivers/char/apm_bios.c
• Orig date: Tue Mar 17 22:18:14 1998

diff -u --recursive --new-file v2.1.91/linux/drivers/char/apm_bios.c linux/drivers/char/apm_bios.c
@@ -231,10 +231,10 @@
 		"pushl %%fs\n\t" \
 		"pushl %%gs\n\t" \
 		"xorl %%edx, %%edx\n\t" \
-		"mov %%dx, %%ds\n\t" \
-		"mov %%dx, %%es\n\t" \
-		"mov %%dx, %%fs\n\t" \
-		"mov %%dx, %%gs\n\t"
+		"movl %%dx, %%ds\n\t" \
+		"movl %%dx, %%es\n\t" \
+		"movl %%dx, %%fs\n\t" \
+		"movl %%dx, %%gs\n\t"
 #	define APM_DO_RESTORE_SEGS	\
 		"popl %%gs\n\t" \
 		"popl %%fs\n\t" \
@@ -1159,8 +1159,10 @@
 	static struct proc_dir_entry *ent;
 
 #ifdef __SMP__
-	printk(KERN_NOTICE "APM disabled: APM is not SMP safe.\n");
-	return;
+	if (smp_num_cpus > 1) {
+		printk(KERN_NOTICE "APM disabled: APM is not SMP safe.\n");
+		return;
+	}
 #endif
 	if (apm_bios_info.version == 0) {
 		printk(KERN_INFO "APM BIOS not found.\n");