diff --git a/[refs] b/[refs] index 326a3c320fa4..e236c0ae3aa1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1b430beee5e388605dfb092b214ef0320f752cf6 +refs/heads/master: f19e77a3dc884510dba740caa6dee126b7d40156 diff --git a/trunk/include/linux/pageblock-flags.h b/trunk/include/linux/pageblock-flags.h index e8c06122be36..19ef95d293ae 100644 --- a/trunk/include/linux/pageblock-flags.h +++ b/trunk/include/linux/pageblock-flags.h @@ -67,7 +67,8 @@ void set_pageblock_flags_group(struct page *page, unsigned long flags, #define get_pageblock_flags(page) \ get_pageblock_flags_group(page, 0, NR_PAGEBLOCK_BITS-1) -#define set_pageblock_flags(page) \ - set_pageblock_flags_group(page, 0, NR_PAGEBLOCK_BITS-1) +#define set_pageblock_flags(page, flags) \ + set_pageblock_flags_group(page, flags, \ + 0, NR_PAGEBLOCK_BITS-1) #endif /* PAGEBLOCK_FLAGS_H */