projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
[firefly-linux-kernel-4.4.55.git]
/
include
/
linux
/
hugetlb.h
diff --git
a/include/linux/hugetlb.h
b/include/linux/hugetlb.h
index 59225ef27d15062813e4799ad95e6df2f57241be..19644e0016bdbb4837e1fa8f28cd276797fd00a4 100644
(file)
--- a/
include/linux/hugetlb.h
+++ b/
include/linux/hugetlb.h
@@
-231,6
+231,9
@@
struct hstate {
struct huge_bootmem_page {
struct list_head list;
struct hstate *hstate;
+#ifdef CONFIG_HIGHMEM
+ phys_addr_t phys;
+#endif
};
struct page *alloc_huge_page_node(struct hstate *h, int nid);