Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aae4d142 authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: consolidate nommu stubs in arch/sh/mm/nommu.c. 



These were previous littered around tlb-nommu.c and pg-nommu.c, though at
this point there are more stubs than are strictly TLB or page op related,
so just consolidate them in a single nommu.c.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent dde5e3ff

arch/sh/mm/Makefile_32

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ endif 


obj-y			+= $(cacheops-y)



mmu-y			:= tlb-nommu.o pg-nommu.o

mmu-y			:= nommu.o

mmu-$(CONFIG_MMU)	:= fault_32.o kmap.o tlbflush_32.o ioremap_32.o



obj-y			+= $(mmu-y)

arch/sh/mm/Makefile_64

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


obj-y			:= init.o consistent.o mmap.o



mmu-y			:= tlb-nommu.o pg-nommu.o extable_32.o

mmu-y			:= nommu.o extable_32.o

mmu-$(CONFIG_MMU)	:= fault_64.o ioremap_64.o tlbflush_64.o tlb-sh5.o \

			   extable_64.o

arch/sh/mm/tlb-nommu.c→arch/sh/mm/nommu.c

+24 −3
Original line number Diff line number Diff line 
/*

 * arch/sh/mm/tlb-nommu.c

 * arch/sh/mm/nommu.c

 *

 * TLB Operations for MMUless SH.

 * Various helper routines and stubs for MMUless SH.

 *

 * Copyright (C) 2002 Paul Mundt

 * Copyright (C) 2002 - 2009 Paul Mundt

 *

 * Released under the terms of the GNU GPL v2.0.

 */

#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/string.h>

#include <linux/mm.h>

#include <asm/pgtable.h>

#include <asm/tlbflush.h>

#include <asm/page.h>

#include <asm/uaccess.h>



/*

 * Nothing too terribly exciting here ..

 */

void copy_page(void *to, void *from)

{

	memcpy(to, from, PAGE_SIZE);

}



__kernel_size_t __copy_user(void *to, const void *from, __kernel_size_t n)

{

	memcpy(to, from, n);

	return 0;

}



__kernel_size_t __clear_user(void *to, __kernel_size_t n)

{

	memset(to, 0, n);

	return 0;

}



void local_flush_tlb_all(void)

{

	BUG();

arch/sh/mm/pg-nommu.c

deleted100644 → 0
+0 −33
Original line number Diff line number Diff line 
/*

 * arch/sh/mm/pg-nommu.c

 *

 * copy_page()/__copy_user()/__clear_user() implementations for MMUless SH.

 *

 * Copyright (C) 2003  Paul Mundt

 *

 * This file is subject to the terms and conditions of the GNU General Public

 * License.  See the file "COPYING" in the main directory of this archive

 * for more details.

 */

#include <linux/init.h>

#include <linux/kernel.h>

#include <linux/string.h>

#include <asm/page.h>

#include <asm/uaccess.h>



void copy_page(void *to, void *from)

{

	memcpy(to, from, PAGE_SIZE);

}



__kernel_size_t __copy_user(void *to, const void *from, __kernel_size_t n)

{

	memcpy(to, from, n);

	return 0;

}



__kernel_size_t __clear_user(void *to, __kernel_size_t n)

{

	memset(to, 0, n);

	return 0;

}