--- zzzz-none-000/linux-2.4.17/drivers/char/keyboard.c	2001-09-18 20:39:51.000000000 +0000
+++ sangam-fb-322/linux-2.4.17/drivers/char/keyboard.c	2004-11-24 13:23:18.000000000 +0000
@@ -253,6 +253,9 @@
 	} else if (sysrq_pressed) {
 		if (!up_flag) {
 			handle_sysrq(kbd_sysrq_xlate[keycode], kbd_pt_regs, kbd, tty);
+#ifdef CONFIG_KGDB_SYSRQ
+                        sysrq_pressed = 0; /* in case we miss the "up" event */
+#endif
 			goto out;
 		}
 	}
@@ -319,7 +322,7 @@
 			compute_shiftstate();
 			kbd->slockstate = 0; /* play it safe */
 #else
-			keysym =  U(plain_map[keycode]);
+			keysym = U(key_maps[0][keycode]);
 			type = KTYP(keysym);
 			if (type == KT_SHIFT)
 			  (*key_handler[type])(keysym & 0xff, up_flag);
@@ -750,7 +753,7 @@
 	    k = i*BITS_PER_LONG;
 	    for(j=0; j<BITS_PER_LONG; j++,k++)
 	      if(test_bit(k, key_down)) {
-		sym = U(plain_map[k]);
+		sym = U(key_maps[0][k]);
 		if(KTYP(sym) == KT_SHIFT || KTYP(sym) == KT_SLOCK) {
 		  val = KVAL(sym);
 		  if (val == KVAL(K_CAPSSHIFT))