|
@@ -388,21 +388,17 @@ static unsigned long slice_find_area(struct mm_struct *mm, unsigned long len,
|
|
|
|
|
|
static inline void slice_or_mask(struct slice_mask *dst, struct slice_mask *src)
|
|
|
{
|
|
|
- DECLARE_BITMAP(result, SLICE_NUM_HIGH);
|
|
|
-
|
|
|
dst->low_slices |= src->low_slices;
|
|
|
- bitmap_or(result, dst->high_slices, src->high_slices, SLICE_NUM_HIGH);
|
|
|
- bitmap_copy(dst->high_slices, result, SLICE_NUM_HIGH);
|
|
|
+ bitmap_or(dst->high_slices, dst->high_slices, src->high_slices,
|
|
|
+ SLICE_NUM_HIGH);
|
|
|
}
|
|
|
|
|
|
static inline void slice_andnot_mask(struct slice_mask *dst, struct slice_mask *src)
|
|
|
{
|
|
|
- DECLARE_BITMAP(result, SLICE_NUM_HIGH);
|
|
|
-
|
|
|
dst->low_slices &= ~src->low_slices;
|
|
|
|
|
|
- bitmap_andnot(result, dst->high_slices, src->high_slices, SLICE_NUM_HIGH);
|
|
|
- bitmap_copy(dst->high_slices, result, SLICE_NUM_HIGH);
|
|
|
+ bitmap_andnot(dst->high_slices, dst->high_slices, src->high_slices,
|
|
|
+ SLICE_NUM_HIGH);
|
|
|
}
|
|
|
|
|
|
#ifdef CONFIG_PPC_64K_PAGES
|