Commit ad8a2142 authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman
Browse files

tty/vt: consolemap: use | for binary addition 



Unicode letters are composed as a bit shifts and sums of three values.
Use "|" and not "+" for these bit operations. The former is indeed more
appropriate.

Reviewed-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20220607104946.18710-9-jslaby@suse.cz


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e16cb6fe

drivers/tty/vt/consolemap.c

+2 −2
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ static void set_inverse_trans_unicode(struct vc_data *conp, 
				glyph = p2[k];

				if (glyph >= 0 && glyph < MAX_GLYPH

					       && q[glyph] < 32)

		  			q[glyph] = (i << 11) + (j << 6) + k;

					q[glyph] = (i << 11) | (j << 6) | k;

			}

		}

	}
@@ -788,7 +788,7 @@ int con_get_unimap(struct vc_data *vc, ushort ct, ushort __user *uct, struct uni 
						continue;

					if (ect < ct) {

						unilist[ect].unicode =

							(i<<11)+(j<<6)+k;

							(i<<11) | (j<<6) | k;

						unilist[ect].fontpos = *p2;

					}

					ect++;