diff --git a/[refs] b/[refs] index b0350070d0f3..4a62296535fe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a2c8990aed5ab000491732b07c8c4465d1b389b8 +refs/heads/master: a539f3533b78e39a22723d6d3e1e11b6c14454d9 diff --git a/trunk/include/linux/mmzone.h b/trunk/include/linux/mmzone.h index d7152002e18d..217bcf6bca77 100644 --- a/trunk/include/linux/mmzone.h +++ b/trunk/include/linux/mmzone.h @@ -956,6 +956,9 @@ static inline unsigned long early_pfn_to_nid(unsigned long pfn) #define pfn_to_section_nr(pfn) ((pfn) >> PFN_SECTION_SHIFT) #define section_nr_to_pfn(sec) ((sec) << PFN_SECTION_SHIFT) +#define SECTION_ALIGN_UP(pfn) (((pfn) + PAGES_PER_SECTION - 1) & PAGE_SECTION_MASK) +#define SECTION_ALIGN_DOWN(pfn) ((pfn) & PAGE_SECTION_MASK) + struct page; struct page_cgroup; struct mem_section {