Commit ab1f9dac authored by Paul Mackerras's avatar Paul Mackerras
Browse files

powerpc: Merge arch/ppc64/mm to arch/powerpc/mm 



This moves the remaining files in arch/ppc64/mm to arch/powerpc/mm,
and arranges that we use them when compiling with ARCH=ppc64.

Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 70d64cea

arch/powerpc/mm/Makefile

+7 −1
Original line number Diff line number Diff line
@@ -5,8 +5,14 @@ 
obj-y				:= fault.o mem.o lmb.o

obj-$(CONFIG_PPC32)		+= init_32.o pgtable_32.o mmu_context_32.o \

				   tlb_32.o

obj-$(CONFIG_PPC64)		+= init_64.o pgtable_64.o mmu_context_64.o

hash-$(CONFIG_PPC_MULTIPLATFORM) := hash_native_64.o

obj-$(CONFIG_PPC64)		+= init_64.o pgtable_64.o mmu_context_64.o \

				   hash_utils_64.o hash_low_64.o tlb_64.o \

				   slb_low.o slb.o stab.o mmap.o imalloc.o \

				   $(hash-y)

obj-$(CONFIG_PPC_STD_MMU_32)	+= ppc_mmu_32.o hash_low_32.o

obj-$(CONFIG_40x)		+= 4xx_mmu.o

obj-$(CONFIG_44x)		+= 44x_mmu.o

obj-$(CONFIG_FSL_BOOKE)		+= fsl_booke_mmu.o

obj-$(CONFIG_NEED_MULTIPLE_NODES) += numa.o

obj-$(CONFIG_HUGETLB_PAGE)	+= hugetlbpage.o

arch/ppc64/mm/hash_low.S→arch/powerpc/mm/hash_low_64.S

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
 * described in the kernel's COPYING file.

 */



#include <asm/processor.h>

#include <asm/reg.h>

#include <asm/pgtable.h>

#include <asm/mmu.h>

#include <asm/page.h>

arch/ppc64/mm/hash_utils.c→arch/powerpc/mm/hash_utils_64.c

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ extern unsigned long dart_tablebase; 
hpte_t *htab_address;

unsigned long htab_hash_mask;



extern unsigned long _SDR1;

unsigned long _SDR1;



#define KB (1024)

#define MB (1024*KB)