diff --git a/[refs] b/[refs] index c4bbec8fb522..7dedd3e4b0cd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c411cb56586915350e4cdb6f228e9da2adba3285 +refs/heads/master: e96c9b4779e651a7469bea677be3a08f70be399e diff --git a/trunk/arch/ia64/mm/init.c b/trunk/arch/ia64/mm/init.c index 4892be53e227..547785e3cba2 100644 --- a/trunk/arch/ia64/mm/init.c +++ b/trunk/arch/ia64/mm/init.c @@ -57,7 +57,7 @@ struct page *zero_page_memmap_ptr; /* map entry for zero page */ EXPORT_SYMBOL(zero_page_memmap_ptr); #define MIN_PGT_PAGES 25UL -#define MAX_PGT_FREES_PER_PASS 16 +#define MAX_PGT_FREES_PER_PASS 16L #define PGT_FRACTION_OF_NODE_MEM 16 static inline long