Commit 82185222 authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Michael Ellerman

powerpc/mm/slice: Move slice_mask struct definition to slice.c

This structure definition need not be in a header since this is used only by
slice.c file. So move it to slice.c. This also allow us to use SLICE_NUM_HIGH
instead of 64.

I also switch the low_slices type to u64 from u16. This doesn't have an impact
on size of struct due to padding added with u16 type. This helps in using
bitmap printing function for printing slice mask.
Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 1b2fa5a0
...@@ -99,17 +99,6 @@ extern u64 ppc64_pft_size; ...@@ -99,17 +99,6 @@ extern u64 ppc64_pft_size;
#define GET_HIGH_SLICE_INDEX(addr) ((addr) >> SLICE_HIGH_SHIFT) #define GET_HIGH_SLICE_INDEX(addr) ((addr) >> SLICE_HIGH_SHIFT)
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
/*
* One bit per slice. We have lower slices which cover 256MB segments
* upto 4G range. That gets us 16 low slices. For the rest we track slices
* in 1TB size.
* 64 below is actually SLICE_NUM_HIGH to fixup complie errros
*/
struct slice_mask {
u16 low_slices;
DECLARE_BITMAP(high_slices, 64);
};
struct mm_struct; struct mm_struct;
extern unsigned long slice_get_unmapped_area(unsigned long addr, extern unsigned long slice_get_unmapped_area(unsigned long addr,
......
...@@ -37,7 +37,15 @@ ...@@ -37,7 +37,15 @@
#include <asm/hugetlb.h> #include <asm/hugetlb.h>
static DEFINE_SPINLOCK(slice_convert_lock); static DEFINE_SPINLOCK(slice_convert_lock);
/*
* One bit per slice. We have lower slices which cover 256MB segments
* upto 4G range. That gets us 16 low slices. For the rest we track slices
* in 1TB size.
*/
struct slice_mask {
u64 low_slices;
DECLARE_BITMAP(high_slices, SLICE_NUM_HIGH);
};
#ifdef DEBUG #ifdef DEBUG
int _slice_debug = 1; int _slice_debug = 1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment