diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-01-15 04:22:35 +0100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-01-15 04:22:35 +0100 |
| commit | fac515db45207718168cb55ca4d0a390e43b61af (patch) | |
| tree | 7dd2fe9b94f769a2009ff6c7402c52ef3dd3b640 /arch/powerpc/mm/mem.c | |
| parent | powerpc: Fix transactional FP/VMX/VSX unavailable handlers (diff) | |
| parent | powerpc/fsl_pci: add versionless pci compatible (diff) | |
| download | linux-fac515db45207718168cb55ca4d0a390e43b61af.tar.xz linux-fac515db45207718168cb55ca4d0a390e43b61af.zip | |
Merge remote-tracking branch 'scott/next' into next
Freescale updates from Scott:
<<
Highlights include 32-bit booke relocatable support, e6500 hardware
tablewalk support, various e500 SPE fixes, some new/revived boards, and
e6500 deeper idle and altivec powerdown modes.
>>
Diffstat (limited to 'arch/powerpc/mm/mem.c')
| -rw-r--r-- | arch/powerpc/mm/mem.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c index 9c25feba7c40..b1c5734bc2ce 100644 --- a/arch/powerpc/mm/mem.c +++ b/arch/powerpc/mm/mem.c @@ -307,6 +307,12 @@ static void __init register_page_bootmem_info(void) void __init mem_init(void) { + /* + * book3s is limited to 16 page sizes due to encoding this in + * a 4-bit field for slices. + */ + BUILD_BUG_ON(MMU_PAGE_COUNT > 16); + #ifdef CONFIG_SWIOTLB swiotlb_init(0); #endif |