projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "perf vendor events intel: Add metrics for Icelake Server"
[linux-2.6-microblaze.git]
/
mm
/
ioremap.c
diff --git
a/mm/ioremap.c
b/mm/ioremap.c
index
d1dcc7e
..
8ee0136
100644
(file)
--- a/
mm/ioremap.c
+++ b/
mm/ioremap.c
@@
-16,16
+16,16
@@
#include "pgalloc-track.h"
#ifdef CONFIG_HAVE_ARCH_HUGE_VMAP
#include "pgalloc-track.h"
#ifdef CONFIG_HAVE_ARCH_HUGE_VMAP
-static
bool __ro_after_init iomap_max_page_shift = PAGE_SHIFT
;
+static
unsigned int __ro_after_init iomap_max_page_shift = BITS_PER_LONG - 1
;
static int __init set_nohugeiomap(char *str)
{
static int __init set_nohugeiomap(char *str)
{
- iomap_max_page_shift = P
4D
_SHIFT;
+ iomap_max_page_shift = P
AGE
_SHIFT;
return 0;
}
early_param("nohugeiomap", set_nohugeiomap);
#else /* CONFIG_HAVE_ARCH_HUGE_VMAP */
return 0;
}
early_param("nohugeiomap", set_nohugeiomap);
#else /* CONFIG_HAVE_ARCH_HUGE_VMAP */
-static const
bool
iomap_max_page_shift = PAGE_SHIFT;
+static const
unsigned int
iomap_max_page_shift = PAGE_SHIFT;
#endif /* CONFIG_HAVE_ARCH_HUGE_VMAP */
int ioremap_page_range(unsigned long addr,
#endif /* CONFIG_HAVE_ARCH_HUGE_VMAP */
int ioremap_page_range(unsigned long addr,