summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-11-12 01:29:22 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-12 01:29:22 +0100
commit63f45b80947cb0819673860f6970f483e2cab21d (patch)
tree6b0d46c7da70786c15ee893d8a48aa866ae3742c /mm
parent[PATCH] kill libata scsi_wait_req usage (make libata compile with scsi-misc c... (diff)
parentearlyuserspace/README: fix homonym err (diff)
downloadlinux-63f45b80947cb0819673860f6970f483e2cab21d.tar.xz
linux-63f45b80947cb0819673860f6970f483e2cab21d.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
Diffstat (limited to 'mm')
-rw-r--r--mm/slab.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/slab.c b/mm/slab.c
index e291f5e1afbb..8a73dcfc6a27 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -434,7 +434,7 @@ struct kmem_cache {
/* Optimization question: fewer reaps means less
* probability for unnessary cpucache drain/refill cycles.
*
- * OTHO the cpuarrays can contain lots of objects,
+ * OTOH the cpuarrays can contain lots of objects,
* which could lock up otherwise freeable slabs.
*/
#define REAPTIMEOUT_CPUC (2*HZ)