summaryrefslogtreecommitdiff
path: root/manual/resource.texi
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@redhat.com>2010-05-14 11:15:22 +0200
committerAndreas Schwab <schwab@redhat.com>2010-05-14 13:13:53 +0200
commite9691db5366a2990ccebf157c757ae60258b46d6 (patch)
treef17aa7f144b1acde14902700a13f95055bab6c70 /manual/resource.texi
parent5e6e747fa224df1159f7eb32bc26d44cad0dbb17 (diff)
parent6d270188ef3fe10125b8723ed69ebdc9e90e914e (diff)
Merge remote branch 'origin/release/2.11/master' into fedora/2.11/master
Diffstat (limited to 'manual/resource.texi')
-rw-r--r--manual/resource.texi2
1 files changed, 1 insertions, 1 deletions
diff --git a/manual/resource.texi b/manual/resource.texi
index 4a814c9e4a..05495722f9 100644
--- a/manual/resource.texi
+++ b/manual/resource.texi
@@ -1288,7 +1288,7 @@ protected from concurrent accesses from different processors.
The POSIX standard up to this date is of not much help to solve this
problem. The Linux kernel provides a set of interfaces to allow
specifying @emph{affinity sets} for a process. The scheduler will
-schedule the thread or process on on CPUs specified by the affinity
+schedule the thread or process on CPUs specified by the affinity
masks. The interfaces which the GNU C library define follow to some
extend the Linux kernel interface.