summaryrefslogtreecommitdiffstats
path: root/Documentation/kasan.txt
diff options
context:
space:
mode:
authorJonathan Corbet2015-06-09 01:04:11 +0200
committerJonathan Corbet2015-06-09 01:04:11 +0200
commitf8785d94fc4e93cacbdb930ec3654fc035a375ec (patch)
treeacc108fa14eee8503e42c2f014091d2f9b02ee3a /Documentation/kasan.txt
parentMerge branch 'core/documentation' of git://git.kernel.org/pub/scm/linux/kerne... (diff)
parentDocumentation: filesystems: updated struct file_operations documentation in v... (diff)
downloadkernel-qcow2-linux-f8785d94fc4e93cacbdb930ec3654fc035a375ec.tar.gz
kernel-qcow2-linux-f8785d94fc4e93cacbdb930ec3654fc035a375ec.tar.xz
kernel-qcow2-linux-f8785d94fc4e93cacbdb930ec3654fc035a375ec.zip
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)