diff --git a/[refs] b/[refs] index e10187061218..479897d55989 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cb5dd7c104c64d7ba8ff4dd3eec3d9b92c378937 +refs/heads/master: c801ed3860fe2f84281d4cae4c3e6ca87e81e890 diff --git a/trunk/include/linux/pageblock-flags.h b/trunk/include/linux/pageblock-flags.h index e875905f7b12..e8c06122be36 100644 --- a/trunk/include/linux/pageblock-flags.h +++ b/trunk/include/linux/pageblock-flags.h @@ -25,13 +25,11 @@ #include -/* Macro to aid the definition of ranges of bits */ -#define PB_range(name, required_bits) \ - name, name ## _end = (name + required_bits) - 1 - /* Bit indices that affect a whole block of pages */ enum pageblock_bits { - PB_range(PB_migrate, 3), /* 3 bits required for migrate types */ + PB_migrate, + PB_migrate_end = PB_migrate + 3 - 1, + /* 3 bits required for migrate types */ NR_PAGEBLOCK_BITS };