Keep the current interface but ignore the KM_type and use a stack based approach. The advantage is that we get rid of crappy code like: #define __KM_PTE \ (in_nmi() ? KM_NMI_PTE : \ in_irq() ? KM_IRQ_PTE : \ KM_PTE0) and in general can stop worrying about what context we're in and what kmap slots might be appropriate for that. The downside is that FRV kmap_atomic() gets more expensive. For now we use a CPP trick suggested by Andrew: #define kmap_atomic(page, args...) __kmap_atomic(page) to avoid having to touch all kmap_atomic() users in a single patch. [ not compiled on: - mn10300: the arch doesn't actually build with highmem to begin with ] [akpm@linux-foundation.org: coding-style fixes] [akpm@linux-foundation.org: fix up drivers/gpu/drm/i915/intel_overlay.c] Acked-by: Rik van Riel <riel@redhat.com> Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Acked-by: Chris Metcalf <cmetcalf@tilera.com> Cc: David Howells <dhowells@redhat.com> Cc: Hugh Dickins <hughd@google.com> Cc: Ingo Molnar <mingo@elte.hu> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: Steven Rostedt <rostedt@goodmis.org> Cc: Russell King <rmk@arm.linux.org.uk> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: David Miller <davem@davemloft.net> Cc: Paul Mackerras <paulus@samba.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Dave Airlie <airlied@linux.ie> Cc: Li Zefan <lizf@cn.fujitsu.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
		
			
				
	
	
		
			77 lines
		
	
	
	
		
			2 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			77 lines
		
	
	
	
		
			2 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * highmem.h: virtual kernel memory mappings for high memory
 | 
						|
 *
 | 
						|
 * Used in CONFIG_HIGHMEM systems for memory pages which
 | 
						|
 * are not addressable by direct kernel virtual addresses.
 | 
						|
 *
 | 
						|
 * Copyright (C) 1999 Gerhard Wichert, Siemens AG
 | 
						|
 *		      Gerhard.Wichert@pdb.siemens.de
 | 
						|
 *
 | 
						|
 *
 | 
						|
 * Redesigned the x86 32-bit VM architecture to deal with
 | 
						|
 * up to 16 Terabyte physical memory. With current x86 CPUs
 | 
						|
 * we now support up to 64 Gigabytes physical RAM.
 | 
						|
 *
 | 
						|
 * Copyright (C) 1999 Ingo Molnar <mingo@redhat.com>
 | 
						|
 */
 | 
						|
 | 
						|
#ifndef _ASM_X86_HIGHMEM_H
 | 
						|
#define _ASM_X86_HIGHMEM_H
 | 
						|
 | 
						|
#ifdef __KERNEL__
 | 
						|
 | 
						|
#include <linux/interrupt.h>
 | 
						|
#include <linux/threads.h>
 | 
						|
#include <asm/kmap_types.h>
 | 
						|
#include <asm/tlbflush.h>
 | 
						|
#include <asm/paravirt.h>
 | 
						|
#include <asm/fixmap.h>
 | 
						|
 | 
						|
/* declarations for highmem.c */
 | 
						|
extern unsigned long highstart_pfn, highend_pfn;
 | 
						|
 | 
						|
/*
 | 
						|
 * Right now we initialize only a single pte table. It can be extended
 | 
						|
 * easily, subsequent pte tables have to be allocated in one physical
 | 
						|
 * chunk of RAM.
 | 
						|
 */
 | 
						|
/*
 | 
						|
 * Ordering is:
 | 
						|
 *
 | 
						|
 * FIXADDR_TOP
 | 
						|
 * 			fixed_addresses
 | 
						|
 * FIXADDR_START
 | 
						|
 * 			temp fixed addresses
 | 
						|
 * FIXADDR_BOOT_START
 | 
						|
 * 			Persistent kmap area
 | 
						|
 * PKMAP_BASE
 | 
						|
 * VMALLOC_END
 | 
						|
 * 			Vmalloc area
 | 
						|
 * VMALLOC_START
 | 
						|
 * high_memory
 | 
						|
 */
 | 
						|
#define LAST_PKMAP_MASK (LAST_PKMAP-1)
 | 
						|
#define PKMAP_NR(virt)  ((virt-PKMAP_BASE) >> PAGE_SHIFT)
 | 
						|
#define PKMAP_ADDR(nr)  (PKMAP_BASE + ((nr) << PAGE_SHIFT))
 | 
						|
 | 
						|
extern void *kmap_high(struct page *page);
 | 
						|
extern void kunmap_high(struct page *page);
 | 
						|
 | 
						|
void *kmap(struct page *page);
 | 
						|
void kunmap(struct page *page);
 | 
						|
 | 
						|
void *kmap_atomic_prot(struct page *page, pgprot_t prot);
 | 
						|
void *__kmap_atomic(struct page *page);
 | 
						|
void __kunmap_atomic(void *kvaddr);
 | 
						|
void *kmap_atomic_pfn(unsigned long pfn);
 | 
						|
void *kmap_atomic_prot_pfn(unsigned long pfn, pgprot_t prot);
 | 
						|
struct page *kmap_atomic_to_page(void *ptr);
 | 
						|
 | 
						|
#define flush_cache_kmaps()	do { } while (0)
 | 
						|
 | 
						|
extern void add_highpages_with_active_regions(int nid, unsigned long start_pfn,
 | 
						|
					unsigned long end_pfn);
 | 
						|
 | 
						|
#endif /* __KERNEL__ */
 | 
						|
 | 
						|
#endif /* _ASM_X86_HIGHMEM_H */
 |