diff for duplicates of <20090628151026.GB25076@localhost> diff --git a/a/1.txt b/N1/1.txt index 74e4984..fc205fb 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -22,43 +22,43 @@ Thank you. > > --- a/include/linux/vmstat.h > > +++ b/include/linux/vmstat.h > > @@ -167,14 +167,7 @@ static inline unsigned long zone_page_state(struct zone *zone, -> > } +> > A } > > -> > extern unsigned long global_lru_pages(void); +> > A extern unsigned long global_lru_pages(void); > > - > > -static inline unsigned long zone_lru_pages(struct zone *zone) > > -{ -> > - return (zone_page_state(zone, NR_ACTIVE_ANON) -> > - + zone_page_state(zone, NR_ACTIVE_FILE) -> > - + zone_page_state(zone, NR_INACTIVE_ANON) -> > - + zone_page_state(zone, NR_INACTIVE_FILE)); +> > - A A A return (zone_page_state(zone, NR_ACTIVE_ANON) +> > - A A A A A A A + zone_page_state(zone, NR_ACTIVE_FILE) +> > - A A A A A A A + zone_page_state(zone, NR_INACTIVE_ANON) +> > - A A A A A A A + zone_page_state(zone, NR_INACTIVE_FILE)); > > -} > > +extern unsigned long zone_lru_pages(void); > > -> > #ifdef CONFIG_NUMA -> > /* +> > A #ifdef CONFIG_NUMA +> > A /* > > diff --git a/mm/vmscan.c b/mm/vmscan.c > > index 026f452..4281c6f 100644 > > --- a/mm/vmscan.c > > +++ b/mm/vmscan.c > > @@ -2123,10 +2123,31 @@ void wakeup_kswapd(struct zone *zone, int order) > > -> > unsigned long global_lru_pages(void) -> > { -> > - return global_page_state(NR_ACTIVE_ANON) -> > - + global_page_state(NR_ACTIVE_FILE) -> > - + global_page_state(NR_INACTIVE_ANON) -> > - + global_page_state(NR_INACTIVE_FILE); -> > + int nr; +> > A unsigned long global_lru_pages(void) +> > A { +> > - A A A return global_page_state(NR_ACTIVE_ANON) +> > - A A A A A A A + global_page_state(NR_ACTIVE_FILE) +> > - A A A A A A A + global_page_state(NR_INACTIVE_ANON) +> > - A A A A A A A + global_page_state(NR_INACTIVE_FILE); +> > + A A A int nr; > > + -> > + nr = global_page_state(zone, NR_ACTIVE_FILE) + -> > + global_page_state(zone, NR_INACTIVE_FILE); +> > + A A A nr = global_page_state(zone, NR_ACTIVE_FILE) + +> > + A A A A A A global_page_state(zone, NR_INACTIVE_FILE); > > + -> > + if (total_swap_pages) -> > + nr += global_page_state(zone, NR_ACTIVE_ANON) + -> > + global_page_state(zone, NR_INACTIVE_ANON); +> > + A A A if (total_swap_pages) +> > + A A A A A A A nr += global_page_state(zone, NR_ACTIVE_ANON) + +> > + A A A A A A A A A A global_page_state(zone, NR_INACTIVE_ANON); > > + -> > + return nr; +> > + A A A return nr; > > +} > > Please change function name too. @@ -221,3 +221,9 @@ index 026f452..3768332 100644 sc.nr_reclaimed += reclaim_state.reclaimed_slab; } while (sc.nr_reclaimed < nr_pages && reclaim_state.reclaimed_slab > 0); + +-- +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 8a35f2f..f1817d7 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -52,43 +52,43 @@ "> > --- a/include/linux/vmstat.h\n" "> > +++ b/include/linux/vmstat.h\n" "> > @@ -167,14 +167,7 @@ static inline unsigned long zone_page_state(struct zone *zone,\n" - "> > \302\240}\n" + "> > A }\n" "> >\n" - "> > \302\240extern unsigned long global_lru_pages(void);\n" + "> > A extern unsigned long global_lru_pages(void);\n" "> > -\n" "> > -static inline unsigned long zone_lru_pages(struct zone *zone)\n" "> > -{\n" - "> > - \302\240 \302\240 \302\240 return (zone_page_state(zone, NR_ACTIVE_ANON)\n" - "> > - \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 + zone_page_state(zone, NR_ACTIVE_FILE)\n" - "> > - \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 + zone_page_state(zone, NR_INACTIVE_ANON)\n" - "> > - \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 + zone_page_state(zone, NR_INACTIVE_FILE));\n" + "> > - A A A return (zone_page_state(zone, NR_ACTIVE_ANON)\n" + "> > - A A A A A A A + zone_page_state(zone, NR_ACTIVE_FILE)\n" + "> > - A A A A A A A + zone_page_state(zone, NR_INACTIVE_ANON)\n" + "> > - A A A A A A A + zone_page_state(zone, NR_INACTIVE_FILE));\n" "> > -}\n" "> > +extern unsigned long zone_lru_pages(void);\n" "> >\n" - "> > \302\240#ifdef CONFIG_NUMA\n" - "> > \302\240/*\n" + "> > A #ifdef CONFIG_NUMA\n" + "> > A /*\n" "> > diff --git a/mm/vmscan.c b/mm/vmscan.c\n" "> > index 026f452..4281c6f 100644\n" "> > --- a/mm/vmscan.c\n" "> > +++ b/mm/vmscan.c\n" "> > @@ -2123,10 +2123,31 @@ void wakeup_kswapd(struct zone *zone, int order)\n" "> >\n" - "> > \302\240unsigned long global_lru_pages(void)\n" - "> > \302\240{\n" - "> > - \302\240 \302\240 \302\240 return global_page_state(NR_ACTIVE_ANON)\n" - "> > - \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 + global_page_state(NR_ACTIVE_FILE)\n" - "> > - \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 + global_page_state(NR_INACTIVE_ANON)\n" - "> > - \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 + global_page_state(NR_INACTIVE_FILE);\n" - "> > + \302\240 \302\240 \302\240 int nr;\n" + "> > A unsigned long global_lru_pages(void)\n" + "> > A {\n" + "> > - A A A return global_page_state(NR_ACTIVE_ANON)\n" + "> > - A A A A A A A + global_page_state(NR_ACTIVE_FILE)\n" + "> > - A A A A A A A + global_page_state(NR_INACTIVE_ANON)\n" + "> > - A A A A A A A + global_page_state(NR_INACTIVE_FILE);\n" + "> > + A A A int nr;\n" "> > +\n" - "> > + \302\240 \302\240 \302\240 nr = global_page_state(zone, NR_ACTIVE_FILE) +\n" - "> > + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240global_page_state(zone, NR_INACTIVE_FILE);\n" + "> > + A A A nr = global_page_state(zone, NR_ACTIVE_FILE) +\n" + "> > + A A A A A A global_page_state(zone, NR_INACTIVE_FILE);\n" "> > +\n" - "> > + \302\240 \302\240 \302\240 if (total_swap_pages)\n" - "> > + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 nr += global_page_state(zone, NR_ACTIVE_ANON) +\n" - "> > + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 global_page_state(zone, NR_INACTIVE_ANON);\n" + "> > + A A A if (total_swap_pages)\n" + "> > + A A A A A A A nr += global_page_state(zone, NR_ACTIVE_ANON) +\n" + "> > + A A A A A A A A A A global_page_state(zone, NR_INACTIVE_ANON);\n" "> > +\n" - "> > + \302\240 \302\240 \302\240 return nr;\n" + "> > + A A A return nr;\n" "> > +}\n" "> \n" "> Please change function name too.\n" @@ -250,6 +250,12 @@ "+\t\t\t\t global_reclaimable_pages());\n" " \t\t\tsc.nr_reclaimed += reclaim_state.reclaimed_slab;\n" " \t\t} while (sc.nr_reclaimed < nr_pages &&\n" - " \t\t\t\treclaim_state.reclaimed_slab > 0);" + " \t\t\t\treclaim_state.reclaimed_slab > 0);\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>" -31067735024f8a093489acce7a7a052f9f39e2b90b89616bd9653a5453206e5a +b531786ebfe75ac65c6bb5d301ca32194734b1fd109730db782ec3ae174f7094
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.