From: Samuel Thibault Date: Sun, 19 Apr 2009 18:05:02 +0000 (+0000) Subject: Revert "console ASCII glyph 1:1 mapping" X-Git-Tag: v2.6.29.2~9 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cbe8fe4ae7f8bcc410c105810b263abf24439a53;p=thirdparty%2Fkernel%2Fstable.git Revert "console ASCII glyph 1:1 mapping" upstream commit: c0b7988200a82290287c6f4cd49585007f73175a This reverts commit 1c55f18717304100a5f624c923f7cb6511b4116d. Ingo Brueckl was assuming that reverting to 1:1 mapping for chars >= 128 was not useful, but it happens to be: due to the limitations of the Linux console, when a blind user wants to read BIG5 on it, he has no other way than loading a font without SFM and let the 1:1 mapping permit the screen reader to get the BIG5 encoding. Signed-off-by: Samuel Thibault Cc: stable@kernel.org Signed-off-by: Linus Torvalds Signed-off-by: Chris Wright --- diff --git a/drivers/char/vt.c b/drivers/char/vt.c index 7900bd63b36da..60453ab3608ff 100644 --- a/drivers/char/vt.c +++ b/drivers/char/vt.c @@ -2271,7 +2271,7 @@ rescan_last_byte: continue; /* nothing to display */ } /* Glyph not found */ - if ((!(vc->vc_utf && !vc->vc_disp_ctrl) && c < 128) && !(c & ~charmask)) { + if ((!(vc->vc_utf && !vc->vc_disp_ctrl) || c < 128) && !(c & ~charmask)) { /* In legacy mode use the glyph we get by a 1:1 mapping. This would make absolutely no sense with Unicode in mind, but do this for ASCII characters since a font may lack