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

Commit 6ee127b7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc 

Pull sparc updates from David Miller:
 "Nothing much this merge window for sparc.

  1) Fix FPU state management in sparc32, from Tkhai Kirill.

  2) More sparc32 mm layer code cleanups, largely more side effects of
     the sun4c support removal in the 3.5 From Sam Ravnborg.

  3) Remove unused code in sparc64, from Bjorn Helgaas and Kirill Tkhai.

  4) Some declaration and comment tidies in PROM support code, from
     Geert Uytterhoeven."

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc: (24 commits)
  sparc32, copy_thread: Clear TIF_USEDFPU flag of created task instead of current
  sparc32: delete dead code in show_mem()
  sparc32: move kmap_init() to highmem.c
  sparc32: move probe_memory() to srmmu.c
  sparc32: drop unused BAD_PAGE stuff
  sparc32: centralize all mmu context handling in srmmu.c
  sparc32: drop quicklist
  sparc32: drop sparc model check in paging_init
  sparc32: drop sparc_unmapped_base
  sparc32,leon: drop leon_init()
  sparc32: drop fixmap.h
  sparc32: fixmap.h cleanup
  sparc32: drop unused kmap_atomic_to_page
  sparc32: drop swapper_pg_dir
  sparc32: beautify srmmu_inherit_prom_mappings()
  sparc32: use void * in nocache get/free
  sparc32: fix coding-style in srmmu.c
  sparc32: sort includes in srmmu.c
  sparc32: define a few srmmu functions __init
  sparc64: remove unused function straddles_64bit_va_hole()
  ...
parents 1e30c1b3 427f23cb

arch/sparc/include/asm/fixmap.h

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

 * fixmap.h: compile-time virtual memory allocation

 *

 * 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.

 *

 * Copyright (C) 1998 Ingo Molnar

 *

 * Support of BIGMEM added by Gerhard Wichert, Siemens AG, July 1999

 */



#ifndef _ASM_FIXMAP_H

#define _ASM_FIXMAP_H



#include <linux/kernel.h>

#include <asm/page.h>

#ifdef CONFIG_HIGHMEM

#include <linux/threads.h>

#include <asm/kmap_types.h>

#endif



/*

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

 * addresses. The point is to have a constant address at

 * compile time, but to set the physical address only

 * in the boot process. We allocate these special  addresses

 * from the top of unused virtual memory (0xfd000000 - 1 page) backwards.

 * Also this lets us do fail-safe vmalloc(), we

 * can guarantee that these special addresses and

 * vmalloc()-ed addresses never overlap.

 *

 * these 'compile-time allocated' memory buffers are

 * fixed-size 4k pages. (or larger if used with an increment

 * highger than 1) use fixmap_set(idx,phys) to associate

 * physical memory with fixmap indices.

 *

 * TLB entries of such buffers will not be flushed across

 * task switches.

 */



/*

 * on UP currently we will have no trace of the fixmap mechanism,

 * no page table allocations, etc. This might change in the

 * future, say framebuffers for the console driver(s) could be

 * fix-mapped?

 */

enum fixed_addresses {

	FIX_HOLE,

#ifdef CONFIG_HIGHMEM

	FIX_KMAP_BEGIN,

	FIX_KMAP_END = FIX_KMAP_BEGIN+(KM_TYPE_NR*NR_CPUS)-1,

#endif

	__end_of_fixed_addresses

};



extern void __set_fixmap (enum fixed_addresses idx,

					unsigned long phys, pgprot_t flags);



#define set_fixmap(idx, phys) \

		__set_fixmap(idx, phys, PAGE_KERNEL)

/*

 * Some hardware wants to get fixmapped without caching.

 */

#define set_fixmap_nocache(idx, phys) \

		__set_fixmap(idx, phys, PAGE_KERNEL_NOCACHE)

/*

 * used by vmalloc.c.

 *

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

 * the start of the fixmap.

 */

#define FIXADDR_TOP	(0xfcfff000UL)

#define FIXADDR_SIZE	((__end_of_fixed_addresses) << PAGE_SHIFT)

#define FIXADDR_START	(FIXADDR_TOP - FIXADDR_SIZE)



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

#define __virt_to_fix(x)	((FIXADDR_TOP - ((x)&PAGE_MASK)) >> PAGE_SHIFT)



extern void __this_fixmap_does_not_exist(void);



/*

 * 'index to address' translation. If anyone tries to use the idx

 * directly without tranlation, we catch the bug with a NULL-deference

 * kernel oops. Illegal ranges of incoming indices are caught too.

 */

static inline unsigned long fix_to_virt(const unsigned int idx)

{

	/*

	 * this branch gets completely eliminated after inlining,

	 * except when someone tries to use fixaddr indices in an

	 * illegal way. (such as mixing up address types or using

	 * out-of-range indices).

	 *

	 * If it doesn't get removed, the linker will complain

	 * loudly with a reasonably clear error message..

	 */

	if (idx >= __end_of_fixed_addresses)

		__this_fixmap_does_not_exist();



        return __fix_to_virt(idx);

}



static inline unsigned long virt_to_fix(const unsigned long vaddr)

{

	BUG_ON(vaddr >= FIXADDR_TOP || vaddr < FIXADDR_START);

	return __virt_to_fix(vaddr);

}



#endif

arch/sparc/include/asm/highmem.h

+0 −3
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>
@@ -29,7 +28,6 @@ 
/* declarations for highmem.c */

extern unsigned long highstart_pfn, highend_pfn;



extern pte_t *kmap_pte;

extern pgprot_t kmap_prot;

extern pte_t *pkmap_page_table;
@@ -72,7 +70,6 @@ static inline void kunmap(struct page *page) 


extern void *kmap_atomic(struct page *page);

extern void __kunmap_atomic(void *kvaddr);

extern struct page *kmap_atomic_to_page(void *vaddr);



#define flush_cache_kmaps()	flush_cache_all()

arch/sparc/include/asm/leon.h

+0 −1
Original line number Diff line number Diff line
@@ -82,7 +82,6 @@ static inline unsigned long leon_load_reg(unsigned long paddr) 
#define LEON_BYPASS_LOAD_PA(x)      leon_load_reg((unsigned long)(x))

#define LEON_BYPASS_STORE_PA(x, v)  leon_store_reg((unsigned long)(x), (unsigned long)(v))



extern void leon_init(void);

extern void leon_switch_mm(void);

extern void leon_init_IRQ(void);

arch/sparc/include/asm/mmu_context_32.h

+3 −5
Original line number Diff line number Diff line
@@ -9,14 +9,12 @@ static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk) 
{

}



/*

 * Initialize a new mmu context.  This is invoked when a new

/* Initialize a new mmu context.  This is invoked when a new

 * address space instance (unique or shared) is instantiated.

 */

#define init_new_context(tsk, mm) (((mm)->context = NO_CONTEXT), 0)

int init_new_context(struct task_struct *tsk, struct mm_struct *mm);



/*

 * Destroy a dead context.  This occurs when mmput drops the

/* Destroy a dead context.  This occurs when mmput drops the

 * mm_users count to zero, the mmaps have been released, and

 * all the page tables have been flushed.  Our job is to destroy

 * any remaining processor-specific state.

arch/sparc/include/asm/page_32.h

+1 −2
Original line number Diff line number Diff line
@@ -107,8 +107,7 @@ typedef unsigned long iopgprot_t; 


typedef struct page *pgtable_t;



extern unsigned long sparc_unmapped_base;

#define TASK_UNMAPPED_BASE	sparc_unmapped_base

#define TASK_UNMAPPED_BASE	0x50000000



#else /* !(__ASSEMBLY__) */