diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-24 13:15:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-24 13:15:25 -0700 |
| commit | 2b849570264d9f802485e327b7a4b0c52991d26a (patch) | |
| tree | 4f2f93a77f614877d4fc4a98a8b100fbe3dcebf0 /Documentation | |
| parent | 62c4d9afa4bcf5315e2745a17a0228bf65b9ba40 (diff) | |
| parent | 1d00015e268f9142de0b504b3e4a4905155276f2 (diff) | |
| download | linux-3.10-2b849570264d9f802485e327b7a4b0c52991d26a.tar.gz linux-3.10-2b849570264d9f802485e327b7a4b0c52991d26a.tar.bz2 linux-3.10-2b849570264d9f802485e327b7a4b0c52991d26a.zip | |
Merge tag 'stable/for-linus-3.6-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/mm
Pull frontswap updates from Konrad Rzeszutek Wilk:
"Cleanups in code and documentation. Little bit of refactoring for
cleaner look."
* tag 'stable/for-linus-3.6-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/mm:
mm/frontswap: cleanup doc and comment error
mm: frontswap: remove unneeded headers
mm: frontswap: split out function to clear a page out
mm: frontswap: remove unnecessary check during initialization
mm: frontswap: make all branches of if statement in put page consistent
mm: frontswap: split frontswap_shrink further to simplify locking
mm: frontswap: split out __frontswap_unuse_pages
mm: frontswap: split out __frontswap_curr_pages
mm: frontswap: trivial coding convention issues
mm: frontswap: remove casting from function calls through ops structure
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/vm/frontswap.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/vm/frontswap.txt b/Documentation/vm/frontswap.txt index 37067cf455f..5ef2d136642 100644 --- a/Documentation/vm/frontswap.txt +++ b/Documentation/vm/frontswap.txt @@ -25,7 +25,7 @@ with the specified swap device number (aka "type"). A "store" will copy the page to transcendent memory and associate it with the type and offset associated with the page. A "load" will copy the page, if found, from transcendent memory into kernel memory, but will NOT remove the page -from from transcendent memory. An "invalidate_page" will remove the page +from transcendent memory. An "invalidate_page" will remove the page from transcendent memory and an "invalidate_area" will remove ALL pages associated with the swap type (e.g., like swapoff) and notify the "device" to refuse further stores with that swap type. @@ -99,7 +99,7 @@ server configured with a large amount of RAM... without pre-configuring how much of the RAM is available for each of the clients! In the virtual case, the whole point of virtualization is to statistically -multiplex physical resources acrosst the varying demands of multiple +multiplex physical resources across the varying demands of multiple virtual machines. This is really hard to do with RAM and efforts to do it well with no kernel changes have essentially failed (except in some well-publicized special-case workloads). |