diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-06-24 13:56:52 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-06-24 13:56:52 +1000 |
| commit | 0b4ea7518c810731259fd15bcd3c6a8a8a07d78c (patch) | |
| tree | ab6c22a23fbddc80b1beb3dc370e05e63f7d064b /mm | |
| parent | cec255d7617e11e9da857e62057528aa2b659a06 (diff) | |
| parent | e44ba033c5654dbfda53461c9b1f7dd9bd1d198f (diff) | |
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
arch/arm/mach-ep93xx/dma-m2p.c
arch/s390/kvm/sie64a.S
drivers/mtd/maps/pxa2xx-flash.c
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/Kconfig b/mm/Kconfig index 8ca47a5ee9c8..f2f1ca19ed53 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -356,7 +356,7 @@ config CLEANCACHE for clean pages that the kernel's pageframe replacement algorithm (PFRA) would like to keep around, but can't since there isn't enough memory. So when the PFRA "evicts" a page, it first attempts to use - cleancacne code to put the data contained in that page into + cleancache code to put the data contained in that page into "transcendent memory", memory that is not directly accessible or addressable by the kernel and is of unknown and possibly time-varying size. And when a cleancache-enabled |