git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec...
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
mm
/
pat.c
diff --git
a/arch/x86/mm/pat.c
b/arch/x86/mm/pat.c
index acc15b23b74342df6188d0fd0e7b356e1530e8bb..64121a18b8cb33902b6161435136aa86b619a152 100644
(file)
--- a/
arch/x86/mm/pat.c
+++ b/
arch/x86/mm/pat.c
@@
-302,7
+302,7
@@
int reserve_memtype(u64 start, u64 end, unsigned long req_type,
return -EINVAL;
}
- new = k
m
alloc(sizeof(struct memtype), GFP_KERNEL);
+ new = k
z
alloc(sizeof(struct memtype), GFP_KERNEL);
if (!new)
return -ENOMEM;