iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'for-5.16-vsprintf-pgp' into for-linus

Browse Source
This commit is contained in:
Petr Mladek
2021-11-02 10:39:27 +01:00
parent 24a1dffbec 6a7ca80f40
commit 40e64a88da
3510 changed files with 210462 additions and 82280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/vsprintf.c
View File

@ -17,7 +17,7 @@
* - scnprintf and vscnprintf
*/
#include <stdarg.h>
#include <linux/stdarg.h>
#include <linux/build_bug.h>
#include <linux/clk.h>
#include <linux/clk-provider.h>
@ -2020,10 +2020,15 @@ static const struct page_flags_fields pff[] = {
static
char *format_page_flags(char *buf, char *end, unsigned long flags)
{
unsigned long main_flags = flags & (BIT(NR_PAGEFLAGS) - 1);
unsigned long main_flags = flags & PAGEFLAGS_MASK;
bool append = false;
int i;
buf = number(buf, end, flags, default_flag_spec);
if (buf < end)
*buf = '(';
buf++;
/* Page flags from the main area. */
if (main_flags) {
buf = format_flags(buf, end, main_flags, pageflag_names);
@ -2052,6 +2057,9 @@ char *format_page_flags(char *buf, char *end, unsigned long flags)
append = true;
}
if (buf < end)
*buf = ')';
buf++;
return buf;
}