xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Fonts: Make font size unsigned in font_desc"

Browse Source 
This reverts commit 78e008dca2 which is
commit 7cb415003468d41aecd6877ae088c38f6c0fc174 upstream.

It breaks the Android kernel ABI and is not needed for Android devices,
so it is safe to revert for now.  If it is determined that it is needed
in the future, it can be brought back in an abi-preserving way.

Bug: 161946584
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I6070f402034c1d22ea70db2d1be160b0d0270b8e
This commit is contained in:
Greg Kroah-Hartman
2022-07-28 10:32:57 +02:00
parent 8324f66c71
commit a73f6da5a3
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/video/console/sticore.c
View File

@@ -503,7 +503,7 @@ sti_select_fbfont(struct sti_cooked_rom *cooked_rom, const char *fbfont_name)
if (!fbfont) if (!fbfont)
return NULL; return NULL;
pr_info("STI selected %ux%u framebuffer font %s for sticon\n", pr_info("STI selected %dx%d framebuffer font %s for sticon\n",
fbfont->width, fbfont->height, fbfont->name); fbfont->width, fbfont->height, fbfont->name);
bpc = ((fbfont->width+7)/8) * fbfont->height; bpc = ((fbfont->width+7)/8) * fbfont->height;

2
include/linux/font.h
View File

@@ -16,7 +16,7 @@
struct font_desc { struct font_desc {
int idx; int idx;
const char *name; const char *name;
unsigned int width, height; int width, height;
const void *data; const void *data;
int pref; int pref;
}; };