* - lumpy-reclaim-v2-tidy.patch removed from -mm tree
@ 2007-02-17 2:15 akpm
0 siblings, 0 replies; 2+ messages in thread
From: akpm @ 2007-02-17 2:15 UTC (permalink / raw)
To: akpm, a.p.zijlstra, apw, mm-commits
The patch titled
lumpy-reclaim-v2-tidy
has been removed from the -mm tree. Its filename was
lumpy-reclaim-v2-tidy.patch
This patch was dropped because it was folded into lumpy-reclaim-v2.patch
------------------------------------------------------
Subject: lumpy-reclaim-v2-tidy
From: Andrew Morton <akpm@osdl.org>
Cc: Andy Whitcroft <apw@shadowen.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
include/linux/swap.h | 3 ++-
mm/vmscan.c | 35 +++++++++++++++++++++--------------
2 files changed, 23 insertions(+), 15 deletions(-)
diff -puN include/linux/swap.h~lumpy-reclaim-v2-tidy include/linux/swap.h
--- a/include/linux/swap.h~lumpy-reclaim-v2-tidy
+++ a/include/linux/swap.h
@@ -189,7 +189,8 @@ extern int rotate_reclaimable_page(struc
extern void swap_setup(void);
/* linux/mm/vmscan.c */
-extern unsigned long try_to_free_pages(struct zone **, int, gfp_t);
+extern unsigned long try_to_free_pages(struct zone **zones, int order,
+ gfp_t gfp_mask);
extern unsigned long shrink_all_memory(unsigned long nr_pages);
extern int vm_swappiness;
extern int remove_mapping(struct address_space *mapping, struct page *page);
diff -puN mm/vmscan.c~lumpy-reclaim-v2-tidy mm/vmscan.c
--- a/mm/vmscan.c~lumpy-reclaim-v2-tidy
+++ a/mm/vmscan.c
@@ -614,12 +614,12 @@ keep:
}
/*
- * Attempt to remove the specified page from its LRU. Only take this
- * page if it is of the appropriate PageActive status. Pages which
- * are being freed elsewhere are also ignored.
+ * Attempt to remove the specified page from its LRU. Only take this page if it
+ * is of the appropriate PageActive status. Pages which are being freed
+ * elsewhere are also ignored.
*
- * @page: page to consider
- * @active: active/inactive flag only take pages of this type
+ * page: page to consider
+ * active: active/inactive flag only take pages of this type
*
* returns 0 on success, -ve errno on failure.
*/
@@ -657,6 +657,7 @@ int __isolate_lru_page(struct page *page
* @src: The LRU list to pull pages off.
* @dst: The temp list to put pages on to.
* @scanned: The number of pages that were scanned.
+ * @order: The caller's attempted allocation order
*
* returns how many pages were moved onto *@dst.
*/
@@ -665,12 +666,16 @@ static unsigned long isolate_lru_pages(u
unsigned long *scanned, int order)
{
unsigned long nr_taken = 0;
- struct page *page, *tmp;
- unsigned long scan, pfn, end_pfn, page_pfn;
- int active;
- int zone_id;
+ unsigned long scan;
for (scan = 0; scan < nr_to_scan && !list_empty(src); scan++) {
+ struct page *page;
+ unsigned long pfn;
+ unsigned long end_pfn;
+ unsigned long page_pfn;
+ int active;
+ int zone_id;
+
page = lru_to_page(src);
prefetchw_prev_lru_page(page, src, flags);
@@ -705,24 +710,26 @@ static unsigned long isolate_lru_pages(u
pfn = page_pfn & ~((1 << order) - 1);
end_pfn = pfn + (1 << order);
for (; pfn < end_pfn; pfn++) {
+ struct page *cursor_page;
+
if (unlikely(pfn == page_pfn))
continue;
if (unlikely(!pfn_valid(pfn)))
break;
- tmp = pfn_to_page(pfn);
- if (unlikely(page_zone_id(tmp) != zone_id))
+ cursor_page = pfn_to_page(pfn);
+ if (unlikely(page_zone_id(cursor_page) != zone_id))
continue;
scan++;
- switch (__isolate_lru_page(tmp, active)) {
+ switch (__isolate_lru_page(cursor_page, active)) {
case 0:
- list_move(&tmp->lru, dst);
+ list_move(&cursor_page->lru, dst);
nr_taken++;
break;
case -EBUSY:
/* else it is being freed elsewhere */
- list_move(&tmp->lru, src);
+ list_move(&cursor_page->lru, src);
default:
break;
}
_
Patches currently in -mm which might be from akpm@osdl.org are
origin.patch
macintosh-mangle-caps-lock-events-on-adb-keyboards.patch
git-acpi.patch
git-dvb.patch
git-ia64.patch
git-ieee1394.patch
git-libata-all.patch
sata_nv-add-back-some-verbosity-into-adma-error_handler.patch
git-lxdialog-fixup.patch
git-mtd.patch
git-ubi.patch
update-smc91x-driver-with-arm-versatile-board-info.patch
drivers-net-ns83820c-add-paramter-to-disable-auto.patch
git-backlight.patch
net-uninline-skb_put.patch
git-ioat-vs-git-md-accel.patch
ioat-warning-fix.patch
drivers-scsi-mca_53c9xc-save_flags-cli-removal.patch
scsi-cover-up-bugs-fix-up-compiler-warnings-in-megaraid-driver.patch
git-block-xfs-barriers-broke.patch
git-ipwireless_cs.patch
arch-i386-kernel-alternativec-dont-include-bugsh.patch
lumpy-reclaim-v2.patch
lumpy-reclaim-v2-tidy.patch
deprecate-smbfs-in-favour-of-cifs.patch
procfs-fix-race-between-proc_readdir-and-remove_proc_entry-fix.patch
block_write_full_page-handle-enospc.patch
filesystem-disk-errors-at-boot-time-caused-by-probe.patch
allow-access-to-proc-pid-fd-after-setuid-fix.patch
factor-outstanding-i-o-error-handling-tidy.patch
consolidate-generic_writepages-and-mpage_writepages-tidy.patch
sync_sb_inodes-propagate-errors.patch
mips-convert-to-use-shared-apm-emulation-fix.patch
schedule_on_each_cpu-use-preempt_disable.patch
implement-flush_work-sanity.patch
implement-flush_work_keventd.patch
flush_workqueue-use-preempt_disable-to-hold-off-cpu-hotplug.patch
aio-use-flush_work.patch
kblockd-use-flush_work.patch
relayfs-use-flush_keventd_work.patch
tg3-use-flush_keventd_work.patch
e1000-use-flush_keventd_work.patch
libata-use-flush_work.patch
phy-use-flush_work.patch
extend-notifier_call_chain-to-count-nr_calls-made.patch
extend-notifier_call_chain-to-count-nr_calls-made-fixes-2.patch
define-and-use-new-eventscpu_lock_acquire-and-cpu_lock_release-fix.patch
eliminate-lock_cpu_hotplug-in-kernel-schedc-fix.patch
move-page-writeback-acounting-out-of-macros.patch
per-backing_dev-dirty-and-writeback-page-accounting.patch
ext2-reservations.patch
edac-new-opteron-athlon64-memory-controller-driver.patch
fsaio-add-a-wait-queue-arg-to-the-wait_bit-action-routine-gfs2-fix.patch
fsaio-enable-wait-bit-based-filtered-wakeups-to-work-for-aio-fix.patch
aio-is-unlikely.patch
sched2-sched-domain-sysctl-use-ctl_unnumbered.patch
mm-implement-swap-prefetching-use-ctl_unnumbered.patch
swap_prefetch-vs-zoned-counters.patch
add-include-linux-freezerh-and-move-definitions-from-prefetch.patch
rcu-preemptible-rcu.patch
local_t-powerpc-extension-fix.patch
readahead-kconfig-options-fix.patch
readahead-minmax_ra_pages.patch
readahead-sysctl-parameters.patch
readahead-sysctl-parameters-use-ctl_unnumbered.patch
readahead-context-based-method-locking-fix.patch
readahead-context-based-method-locking-fix-2.patch
readahead-call-scheme-ifdef-fix.patch
readahead-call-scheme-build-fix.patch
readahead-nfsd-case-fix.patch
make-copy_from_user_inatomic-not-zero-the-tail-on-i386-vs-reiser4.patch
resier4-add-include-linux-freezerh-and-move-definitions-from.patch
make-kmem_cache_destroy-return-void-reiser4.patch
reiser4-hardirq-include-fix.patch
reiser4-run-truncate_inode_pages-in-reiser4_delete_inode.patch
reiser4-get_sb_dev-fix.patch
reiser4-vs-zoned-allocator.patch
reiser4-temp-fix.patch
reiser4-kmem_cache_t-removal.patch
reiser4-test_clear_page_dirty.patch
reiser4-vs-git-block.patch
reiser4-vs-git-block-2.patch
statistics-infrastructure-fix-buffer-overflow-in-histogram-with-linear-tidy.patch
slim-main-include-fix.patch
nr_blockdev_pages-in_interrupt-warning.patch
device-suspend-debug.patch
mutex-subsystem-synchro-test-module-fix.patch
slab-leaks3-default-y.patch
vdso-print-fatal-signals-use-ctl_unnumbered.patch
restore-rogue-readahead-printk.patch
put_bh-debug.patch
e1000-printk-warning-fixes.patch
acpi_format_exception-debug.patch
add-debugging-aid-for-memory-initialisation-problems-fix.patch
kmap_atomic-debugging.patch
shrink_slab-handle-bad-shrinkers.patch
ia64-enable-config_debug_spinlock_sleep.patch
squash-ipc-warnings.patch
squash-udf-warnings.patch
^ permalink raw reply [flat|nested] 2+ messages in thread
* - lumpy-reclaim-v2-tidy.patch removed from -mm tree
@ 2007-03-06 0:43 akpm
0 siblings, 0 replies; 2+ messages in thread
From: akpm @ 2007-03-06 0:43 UTC (permalink / raw)
To: akpm, a.p.zijlstra, apw, mm-commits
The patch titled
lumpy-reclaim-v2-tidy
has been removed from the -mm tree. Its filename was
lumpy-reclaim-v2-tidy.patch
This patch was dropped because it was folded into lumpy-reclaim-v2.patch
------------------------------------------------------
Subject: lumpy-reclaim-v2-tidy
From: Andrew Morton <akpm@osdl.org>
Cc: Andy Whitcroft <apw@shadowen.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
include/linux/swap.h | 3 ++-
mm/vmscan.c | 35 +++++++++++++++++++++--------------
2 files changed, 23 insertions(+), 15 deletions(-)
diff -puN include/linux/swap.h~lumpy-reclaim-v2-tidy include/linux/swap.h
--- a/include/linux/swap.h~lumpy-reclaim-v2-tidy
+++ a/include/linux/swap.h
@@ -189,7 +189,8 @@ extern int rotate_reclaimable_page(struc
extern void swap_setup(void);
/* linux/mm/vmscan.c */
-extern unsigned long try_to_free_pages(struct zone **, int, gfp_t);
+extern unsigned long try_to_free_pages(struct zone **zones, int order,
+ gfp_t gfp_mask);
extern unsigned long shrink_all_memory(unsigned long nr_pages);
extern int vm_swappiness;
extern int remove_mapping(struct address_space *mapping, struct page *page);
diff -puN mm/vmscan.c~lumpy-reclaim-v2-tidy mm/vmscan.c
--- a/mm/vmscan.c~lumpy-reclaim-v2-tidy
+++ a/mm/vmscan.c
@@ -616,12 +616,12 @@ keep:
}
/*
- * Attempt to remove the specified page from its LRU. Only take this
- * page if it is of the appropriate PageActive status. Pages which
- * are being freed elsewhere are also ignored.
+ * Attempt to remove the specified page from its LRU. Only take this page if it
+ * is of the appropriate PageActive status. Pages which are being freed
+ * elsewhere are also ignored.
*
- * @page: page to consider
- * @active: active/inactive flag only take pages of this type
+ * page: page to consider
+ * active: active/inactive flag only take pages of this type
*
* returns 0 on success, -ve errno on failure.
*/
@@ -659,6 +659,7 @@ int __isolate_lru_page(struct page *page
* @src: The LRU list to pull pages off.
* @dst: The temp list to put pages on to.
* @scanned: The number of pages that were scanned.
+ * @order: The caller's attempted allocation order
*
* returns how many pages were moved onto *@dst.
*/
@@ -667,12 +668,16 @@ static unsigned long isolate_lru_pages(u
unsigned long *scanned, int order)
{
unsigned long nr_taken = 0;
- struct page *page, *tmp;
- unsigned long scan, pfn, end_pfn, page_pfn;
- int active;
- int zone_id;
+ unsigned long scan;
for (scan = 0; scan < nr_to_scan && !list_empty(src); scan++) {
+ struct page *page;
+ unsigned long pfn;
+ unsigned long end_pfn;
+ unsigned long page_pfn;
+ int active;
+ int zone_id;
+
page = lru_to_page(src);
prefetchw_prev_lru_page(page, src, flags);
@@ -707,24 +712,26 @@ static unsigned long isolate_lru_pages(u
pfn = page_pfn & ~((1 << order) - 1);
end_pfn = pfn + (1 << order);
for (; pfn < end_pfn; pfn++) {
+ struct page *cursor_page;
+
if (unlikely(pfn == page_pfn))
continue;
if (unlikely(!pfn_valid(pfn)))
break;
- tmp = pfn_to_page(pfn);
- if (unlikely(page_zone_id(tmp) != zone_id))
+ cursor_page = pfn_to_page(pfn);
+ if (unlikely(page_zone_id(cursor_page) != zone_id))
continue;
scan++;
- switch (__isolate_lru_page(tmp, active)) {
+ switch (__isolate_lru_page(cursor_page, active)) {
case 0:
- list_move(&tmp->lru, dst);
+ list_move(&cursor_page->lru, dst);
nr_taken++;
break;
case -EBUSY:
/* else it is being freed elsewhere */
- list_move(&tmp->lru, src);
+ list_move(&cursor_page->lru, src);
default:
break;
}
_
Patches currently in -mm which might be from akpm@osdl.org are
origin.patch
macintosh-mangle-caps-lock-events-on-adb-keyboards.patch
git-ia64.patch
git-ieee1394.patch
sata_nv-add-back-some-verbosity-into-adma-error_handler.patch
git-ubi.patch
update-smc91x-driver-with-arm-versatile-board-info.patch
drivers-net-ns83820c-add-paramter-to-disable-auto.patch
net-uninline-skb_put.patch
git-ioat-vs-git-md-accel.patch
ioat-warning-fix.patch
drivers-scsi-mca_53c9xc-save_flags-cli-removal.patch
scsi-cover-up-bugs-fix-up-compiler-warnings-in-megaraid-driver.patch
git-ipwireless_cs.patch
arch-i386-kernel-alternativec-dont-include-bugsh.patch
lumpy-reclaim-v2.patch
lumpy-reclaim-v2-tidy.patch
deprecate-smbfs-in-favour-of-cifs.patch
procfs-fix-race-between-proc_readdir-and-remove_proc_entry-fix.patch
factor-outstanding-i-o-error-handling-tidy.patch
block_write_full_page-handle-enospc.patch
filesystem-disk-errors-at-boot-time-caused-by-probe.patch
allow-access-to-proc-pid-fd-after-setuid-fix.patch
fix-__d_path-for-lazy-unmounts-and-make-it-unambiguous-tidy.patch
consolidate-generic_writepages-and-mpage_writepages-tidy.patch
sync_sb_inodes-propagate-errors.patch
mips-convert-to-use-shared-apm-emulation-fix.patch
schedule_on_each_cpu-use-preempt_disable.patch
implement-flush_work-sanity.patch
implement-flush_work_keventd.patch
flush_workqueue-use-preempt_disable-to-hold-off-cpu-hotplug.patch
aio-use-flush_work.patch
kblockd-use-flush_work.patch
relayfs-use-flush_keventd_work.patch
tg3-use-flush_keventd_work.patch
e1000-use-flush_keventd_work.patch
libata-use-flush_work.patch
phy-use-flush_work.patch
extend-notifier_call_chain-to-count-nr_calls-made.patch
extend-notifier_call_chain-to-count-nr_calls-made-fixes-2.patch
define-and-use-new-eventscpu_lock_acquire-and-cpu_lock_release-fix.patch
eliminate-lock_cpu_hotplug-in-kernel-schedc-fix.patch
move-page-writeback-acounting-out-of-macros.patch
per-backing_dev-dirty-and-writeback-page-accounting.patch
ext2-reservations.patch
edac-new-opteron-athlon64-memory-controller-driver.patch
aio-is-unlikely.patch
sched2-sched-domain-sysctl-use-ctl_unnumbered.patch
mm-implement-swap-prefetching-use-ctl_unnumbered.patch
swap_prefetch-vs-zoned-counters.patch
add-include-linux-freezerh-and-move-definitions-from-prefetch.patch
rcu-preemptible-rcu.patch
atomich-add-atomic64-cmpxchg-xchg-and-add_unless-to-powerpc-fix.patch
atomich-add-atomic64-cmpxchg-xchg-and-add_unless-to-powerpc-fix-2.patch
local_t-powerpc-extension-fix.patch
local_t-powerpc-extension-fix-build-fix.patch
readahead-kconfig-options-fix.patch
readahead-minmax_ra_pages.patch
readahead-sysctl-parameters.patch
readahead-sysctl-parameters-use-ctl_unnumbered.patch
readahead-context-based-method-locking-fix.patch
readahead-context-based-method-locking-fix-2.patch
readahead-call-scheme-ifdef-fix.patch
readahead-call-scheme-build-fix.patch
readahead-nfsd-case-fix.patch
make-copy_from_user_inatomic-not-zero-the-tail-on-i386-vs-reiser4.patch
resier4-add-include-linux-freezerh-and-move-definitions-from.patch
make-kmem_cache_destroy-return-void-reiser4.patch
reiser4-hardirq-include-fix.patch
reiser4-run-truncate_inode_pages-in-reiser4_delete_inode.patch
reiser4-get_sb_dev-fix.patch
reiser4-vs-zoned-allocator.patch
reiser4-temp-fix.patch
reiser4-kmem_cache_t-removal.patch
reiser4-test_clear_page_dirty.patch
statistics-infrastructure-fix-buffer-overflow-in-histogram-with-linear-tidy.patch
slim-main-include-fix.patch
nr_blockdev_pages-in_interrupt-warning.patch
device-suspend-debug.patch
mutex-subsystem-synchro-test-module-fix.patch
slab-leaks3-default-y.patch
vdso-print-fatal-signals-use-ctl_unnumbered.patch
restore-rogue-readahead-printk.patch
put_bh-debug.patch
e1000-printk-warning-fixes.patch
acpi_format_exception-debug.patch
add-debugging-aid-for-memory-initialisation-problems-fix.patch
kmap_atomic-debugging.patch
shrink_slab-handle-bad-shrinkers.patch
ia64-enable-config_debug_spinlock_sleep.patch
squash-ipc-warnings.patch
squash-udf-warnings.patch
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-03-06 0:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-02-17 2:15 - lumpy-reclaim-v2-tidy.patch removed from -mm tree akpm
2007-03-06 0:43 akpm
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.