diff for duplicates of <1471526765.4319.31.camel@perches.com> diff --git a/a/1.txt b/N1/1.txt index 35643c7..8e3b7a8 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -5,9 +5,9 @@ On Thu, 2016-08-18 at 13:31 +0200, Michal Hocko wrote: > diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c [] > @@ -721,6 +721,13 @@ void __weak arch_show_smap(struct seq_file *m, struct vm_area_struct *vma) -> { -> } -> +> { +> } +> > +static void print_name_value_kb(struct seq_file *m, const char *name, unsigned long val) > +{ > + seq_puts(m, name); @@ -23,29 +23,23 @@ $ git log --stat -p -1 49f87a2773000ced0c850639975f43134de48342 -- fs/seq_file.c Maybe this change in fs/proc/meminfo.c should be made into a public function. -$ git log --stat -p -1 5e27340c20516104c38668e597b3200f339fc64d +$ git log --stat -p -1 5e27340c20516104c38668e597b3200f339fc64d static void show_val_kb(struct seq_file *m, const char *s, unsigned long num) +{ -+ char v[32]; -+ static const char blanks[7] = {' ', ' ', ' ', ' ',' ', ' ', ' '}; -+ int len; ++ char v[32]; ++ static const char blanks[7] = {' ', ' ', ' ', ' ',' ', ' ', ' '}; ++ int len; + -+ len = num_to_str(v, sizeof(v), num << (PAGE_SHIFT - 10)); ++ len = num_to_str(v, sizeof(v), num << (PAGE_SHIFT - 10)); + -+ seq_write(m, s, 16); ++ seq_write(m, s, 16); + -+ if (len > 0) { -+ if (len < 8) -+ seq_write(m, blanks, 8 - len); ++ if (len > 0) { ++ if (len < 8) ++ seq_write(m, blanks, 8 - len); + -+ seq_write(m, v, len); -+ } -+ seq_write(m, " kB\n", 4); ++ seq_write(m, v, len); ++ } ++ seq_write(m, " kB\n", 4); +} - --- -To unsubscribe, send a message with 'unsubscribe linux-mm' in -the body to majordomo@kvack.org. For more info on Linux MM, -see: http://www.linux-mm.org/ . -Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> diff --git a/a/content_digest b/N1/content_digest index 18ee581..c3f566d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -17,9 +17,9 @@ "> diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c\n" "[]\n" "> @@ -721,6 +721,13 @@ void __weak arch_show_smap(struct seq_file *m, struct vm_area_struct *vma)\n" - "> {\n" - "> }\n" - "> \n" + "> \302\240{\n" + "> \302\240}\n" + "> \302\240\n" "> +static void print_name_value_kb(struct seq_file *m, const char *name, unsigned long val)\n" "> +{\n" "> +\tseq_puts(m, name);\n" @@ -35,31 +35,25 @@ "Maybe this change in fs/proc/meminfo.c should be\n" "made into a public function.\n" "\n" - "$ git log --stat -p -1 5e27340c20516104c38668e597b3200f339fc64d\n" + "$\302\240git log --stat -p -1\302\240\302\2405e27340c20516104c38668e597b3200f339fc64d\n" "\n" "static void show_val_kb(struct seq_file *m, const char *s, unsigned long num)\n" "+{\n" - "+ char v[32];\n" - "+ static const char blanks[7] = {' ', ' ', ' ', ' ',' ', ' ', ' '};\n" - "+ int len;\n" + "+\302\240\302\240\302\240\302\240\302\240\302\240\302\240char v[32];\n" + "+\302\240\302\240\302\240\302\240\302\240\302\240\302\240static const char blanks[7] = {' ', ' ', ' ', ' ',' ', ' ', ' '};\n" + "+\302\240\302\240\302\240\302\240\302\240\302\240\302\240int len;\n" "+\n" - "+ len = num_to_str(v, sizeof(v), num << (PAGE_SHIFT - 10));\n" + "+\302\240\302\240\302\240\302\240\302\240\302\240\302\240len = num_to_str(v, sizeof(v), num << (PAGE_SHIFT - 10));\n" "+\n" - "+ seq_write(m, s, 16);\n" + "+\302\240\302\240\302\240\302\240\302\240\302\240\302\240seq_write(m, s, 16);\n" "+\n" - "+ if (len > 0) {\n" - "+ if (len < 8)\n" - "+ seq_write(m, blanks, 8 - len);\n" + "+\302\240\302\240\302\240\302\240\302\240\302\240\302\240if (len > 0) {\n" + "+\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240if (len < 8)\n" + "+\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240seq_write(m, blanks, 8 - len);\n" "+\n" - "+ seq_write(m, v, len);\n" - "+ }\n" - "+ seq_write(m, \" kB\\n\", 4);\n" - "+}\n" - "\n" - "--\n" - "To unsubscribe, send a message with 'unsubscribe linux-mm' in\n" - "the body to majordomo@kvack.org. For more info on Linux MM,\n" - "see: http://www.linux-mm.org/ .\n" - "Don't email: <a href=mailto:\"dont@kvack.org\"> email@kvack.org </a>" + "+\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240seq_write(m, v, len);\n" + "+\302\240\302\240\302\240\302\240\302\240\302\240\302\240}\n" + "+\302\240\302\240\302\240\302\240\302\240\302\240\302\240seq_write(m, \" kB\\n\", 4);\n" + +} -e2d713b708bf95ec33b626f438f2490b3e63976968ccde09ab835e2aa598d862 +56509e40fb85699c44cd195c07f94922d593e093e4ed5fb60785c3928a620fcf
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.