Commit 1b6d06d8 authored by Sam Ravnborg's avatar Sam Ravnborg Committed by David S. Miller
Browse files

sparc32: drop fixmap.h 



sparc32 does not support fixmaps - so do not pretend so by
having the fixmap.h file.
Move relevant parts to vaddrs.h.

I looked at simplifying this even more but failed to understand
the reasoning behind the extra guard page involved and due to
missing testing possibilities only the trivial conversion was done.

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c00db321

arch/sparc/include/asm/fixmap.h

deleted100644 → 0
+0 −26
Original line number Diff line number Diff line 
/* Highmem related constants */



#ifndef _ASM_FIXMAP_H

#define _ASM_FIXMAP_H



#include <asm/kmap_types.h>



enum fixed_addresses {

	FIX_HOLE,

#ifdef CONFIG_HIGHMEM

	FIX_KMAP_BEGIN,

	FIX_KMAP_END = (KM_TYPE_NR * NR_CPUS),

#endif

	__end_of_fixed_addresses

};



/* Leave one empty page between IO pages at 0xfd000000 and

 * the top of the fixmap.

 */

#define FIXADDR_TOP	(0xfcfff000UL)

#define FIXADDR_SIZE	((FIX_KMAP_END + 1) << PAGE_SHIFT)

#define FIXADDR_START	(FIXADDR_TOP - FIXADDR_SIZE)



#define __fix_to_virt(x)	(FIXADDR_TOP - ((x) << PAGE_SHIFT))



#endif

arch/sparc/include/asm/highmem.h

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#ifdef __KERNEL__



#include <linux/interrupt.h>

#include <asm/fixmap.h>

#include <asm/vaddrs.h>

#include <asm/kmap_types.h>

#include <asm/pgtable.h>

arch/sparc/include/asm/vaddrs.h

+22 −0
Original line number Diff line number Diff line
@@ -30,6 +30,28 @@ 
 */

#define SRMMU_NOCACHE_ALCRATIO	64	/* 256 pages per 64MB of system RAM */



#ifndef __ASSEMBLY__

#include <asm/kmap_types.h>



enum fixed_addresses {

	FIX_HOLE,

#ifdef CONFIG_HIGHMEM

	FIX_KMAP_BEGIN,

	FIX_KMAP_END = (KM_TYPE_NR * NR_CPUS),

#endif

	__end_of_fixed_addresses

};

#endif



/* Leave one empty page between IO pages at 0xfd000000 and

 * the top of the fixmap.

 */

#define FIXADDR_TOP		(0xfcfff000UL)

#define FIXADDR_SIZE		((FIX_KMAP_END + 1) << PAGE_SHIFT)

#define FIXADDR_START		(FIXADDR_TOP - FIXADDR_SIZE)



#define __fix_to_virt(x)        (FIXADDR_TOP - ((x) << PAGE_SHIFT))



#define SUN4M_IOBASE_VADDR	0xfd000000 /* Base for mapping pages */

#define IOBASE_VADDR		0xfe000000

#define IOBASE_END		0xfe600000

arch/sparc/mm/highmem.c

+4 −3
Original line number Diff line number Diff line
@@ -22,13 +22,14 @@ 
 * shared by CPUs, and so precious, and establishing them requires IPI.

 * Atomic kmaps are lightweight and we may have NCPUS more of them.

 */

#include <linux/mm.h>

#include <linux/highmem.h>

#include <linux/export.h>

#include <asm/pgalloc.h>

#include <linux/mm.h>



#include <asm/cacheflush.h>

#include <asm/tlbflush.h>

#include <asm/fixmap.h>

#include <asm/pgalloc.h>

#include <asm/vaddrs.h>



void *kmap_atomic(struct page *page)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE