Commit fe1cd987 authored by Al Viro's avatar Al Viro Committed by H. Peter Anvin
Browse files

x86, um: get rid of uml highmem.h 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent ff64b4c1

arch/um/include/asm/archparam-i386.h

+5 −5
Original line number Diff line number Diff line
@@ -6,11 +6,11 @@ 
#ifndef __UM_ARCHPARAM_I386_H

#define __UM_ARCHPARAM_I386_H



/********* Nothing for asm-um/hardirq.h **********/



/********* Nothing for asm-um/hw_irq.h **********/



/********* Nothing for asm-um/string.h **********/

#ifdef CONFIG_X86_PAE

#define LAST_PKMAP 512

#else

#define LAST_PKMAP 1024

#endif



#endif

arch/um/include/asm/fixmap.h

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
#include <asm/kmap_types.h>

#include <asm/archparam.h>

#include <asm/page.h>

#include <linux/threads.h>



/*

 * Here we define all the compile-time 'special' virtual

arch/um/include/asm/highmem.h

deleted100644 → 0
+0 −12
Original line number Diff line number Diff line 
#ifndef __UM_HIGHMEM_H

#define __UM_HIGHMEM_H



#include "asm/page.h"

#include "asm/fixmap.h"

#include "asm/arch/highmem.h"



#undef PKMAP_BASE



#define PKMAP_BASE ((FIXADDR_START - LAST_PKMAP * PAGE_SIZE) & PMD_MASK)



#endif

arch/um/include/asm/pgtable.h

+8 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ extern unsigned long end_iomem; 


#define VMALLOC_OFFSET	(__va_space)

#define VMALLOC_START ((end_iomem + VMALLOC_OFFSET) & ~(VMALLOC_OFFSET-1))

#define PKMAP_BASE ((FIXADDR_START - LAST_PKMAP * PAGE_SIZE) & PMD_MASK)

#ifdef CONFIG_HIGHMEM

# define VMALLOC_END	(PKMAP_BASE-2*PAGE_SIZE)

#else
@@ -355,4 +356,11 @@ extern pte_t *virt_to_pte(struct mm_struct *mm, unsigned long addr); 


#include <asm-generic/pgtable.h>



/* Clear a kernel PTE and flush it from the TLB */

#define kpte_clear_flush(ptep, vaddr)		\

do {						\

	pte_clear(&init_mm, (vaddr), (ptep));	\

	__flush_tlb_one((vaddr));		\

} while (0)



#endif