patch-2.1.38 linux/arch/sparc/prom/console.c

Next file: linux/arch/sparc/prom/devmap.c
Previous file: linux/arch/sparc/mm/viking.S
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.37/linux/arch/sparc/prom/console.c linux/arch/sparc/prom/console.c
@@ -1,4 +1,4 @@
-/* $Id: console.c,v 1.12 1997/05/01 01:41:30 davem Exp $
+/* $Id: console.c,v 1.14 1997/05/14 20:44:58 davem Exp $
  * console.c: Routines that deal with sending and receiving IO
  *            to/from the current console device using the PROM.
  *
@@ -14,6 +14,9 @@
 #include <asm/system.h>
 #include <linux/string.h>
 
+/* XXX Let's get rid of this thing if we can... */
+extern struct task_struct *current_set[NR_CPUS];
+
 /* Non blocking get character from console input device, returns -1
  * if no input was taken.  This can be used for polling.
  */
@@ -38,6 +41,7 @@
 		}
 		break;
 	case PROM_AP1000:
+	default:
 		i = -1;
 		break;
 	};
@@ -81,6 +85,9 @@
 #endif
 	
 		break;
+	default:
+		i = -1;
+		break;
 	};
 	__asm__ __volatile__("ld [%0], %%g6\n\t" : :
 			     "r" (&current_set[hard_smp_processor_id()]) :
@@ -208,6 +215,7 @@
 		}
 		break;
 	case PROM_AP1000:
+	default:
 		return PROMDEV_I_UNK;
 	};
 	return PROMDEV_O_UNK;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov