projects
/
platform
/
kernel
/
linux-rpi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[platform/kernel/linux-rpi.git]
/
arch
/
x86
/
mm
/
init.c
diff --git
a/arch/x86/mm/init.c
b/arch/x86/mm/init.c
index
5c32a76
..
7a8fc26
100644
(file)
--- a/
arch/x86/mm/init.c
+++ b/
arch/x86/mm/init.c
@@
-930,7
+930,7
@@
unsigned long max_swapfile_size(void)
if (boot_cpu_has_bug(X86_BUG_L1TF)) {
/* Limit the swap file size to MAX_PA/2 for L1TF workaround */
if (boot_cpu_has_bug(X86_BUG_L1TF)) {
/* Limit the swap file size to MAX_PA/2 for L1TF workaround */
- unsigned long l
1tf_limit = l1tf_pfn_limit() + 1
;
+ unsigned long l
ong l1tf_limit = l1tf_pfn_limit()
;
/*
* We encode swap offsets also with 3 bits below those for pfn
* which makes the usable limit higher.
/*
* We encode swap offsets also with 3 bits below those for pfn
* which makes the usable limit higher.
@@
-938,7
+938,7
@@
unsigned long max_swapfile_size(void)
#if CONFIG_PGTABLE_LEVELS > 2
l1tf_limit <<= PAGE_SHIFT - SWP_OFFSET_FIRST_BIT;
#endif
#if CONFIG_PGTABLE_LEVELS > 2
l1tf_limit <<= PAGE_SHIFT - SWP_OFFSET_FIRST_BIT;
#endif
- pages = min_t(unsigned long, l1tf_limit, pages);
+ pages = min_t(unsigned long
long
, l1tf_limit, pages);
}
return pages;
}
}
return pages;
}