summaryrefslogtreecommitdiffstats
path: root/Documentation/kasan.txt
diff options
context:
space:
mode:
authorJonathan Corbet <corbet@lwn.net>2015-06-08 17:04:11 -0600
committerJonathan Corbet <corbet@lwn.net>2015-06-08 17:04:11 -0600
commitf8785d94fc4e93cacbdb930ec3654fc035a375ec (patch)
treeacc108fa14eee8503e42c2f014091d2f9b02ee3a /Documentation/kasan.txt
parent8d13be53384866cc30cb09cb32afca04f902f523 (diff)
parent0d03943c0b50ad47ec6bb157a5d02d6ba9da477e (diff)
downloadlinux-f8785d94fc4e93cacbdb930ec3654fc035a375ec.tar.bz2
Merge branch 'doc/4.2' into docs-next
Diffstat (limited to 'Documentation/kasan.txt')
-rw-r--r--Documentation/kasan.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/kasan.txt b/Documentation/kasan.txt
index 4692241789b1..0d32355a4c34 100644
--- a/Documentation/kasan.txt
+++ b/Documentation/kasan.txt
@@ -150,7 +150,7 @@ AddressSanitizer dedicates 1/8 of kernel memory to its shadow memory
(e.g. 16TB to cover 128TB on x86_64) and uses direct mapping with a scale and
offset to translate a memory address to its corresponding shadow address.
-Here is the function witch translate an address to its corresponding shadow
+Here is the function which translates an address to its corresponding shadow
address:
static inline void *kasan_mem_to_shadow(const void *addr)