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 tag 's390-6.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
[sfrench/cifs-2.6.git]
/
arch
/
s390
/
include
/
asm
/
pgtable.h
diff --git
a/arch/s390/include/asm/pgtable.h
b/arch/s390/include/asm/pgtable.h
index c1f6b46ec555b332a10ac26efe7c090b51c65d9a..6822a11c2c8ad35627b23fc3910bdaf266c9bada 100644
(file)
--- a/
arch/s390/include/asm/pgtable.h
+++ b/
arch/s390/include/asm/pgtable.h
@@
-34,7
+34,7
@@
enum {
PG_DIRECT_MAP_MAX
};
-extern atomic_long_t
direct_pages_count[PG_DIRECT_MAP_MAX]
;
+extern atomic_long_t
__bootdata_preserved(direct_pages_count[PG_DIRECT_MAP_MAX])
;
static inline void update_page_count(int level, long count)
{