projects
/
GitHub
/
LineageOS
/
android_kernel_samsung_universal7580.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'cpus4096-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[GitHub/LineageOS/android_kernel_samsung_universal7580.git]
/
arch
/
x86
/
kernel
/
cpu
/
mcheck
/
mce_64.c
diff --git
a/arch/x86/kernel/cpu/mcheck/mce_64.c
b/arch/x86/kernel/cpu/mcheck/mce_64.c
index 9ab65be82427461529b4e4814f151d408cd8d1a4..65a339678ece817b3b27fa56afb5ee97aae8d027 100644
(file)
--- a/
arch/x86/kernel/cpu/mcheck/mce_64.c
+++ b/
arch/x86/kernel/cpu/mcheck/mce_64.c
@@
-580,7
+580,7
@@
static ssize_t mce_read(struct file *filp, char __user *ubuf, size_t usize,
char __user *buf = ubuf;
int i, err;
- cpu_tsc = kmalloc(
NR_CPUS
* sizeof(long), GFP_KERNEL);
+ cpu_tsc = kmalloc(
nr_cpu_ids
* sizeof(long), GFP_KERNEL);
if (!cpu_tsc)
return -ENOMEM;