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

Commit 679bea5e authored by David S. Miller's avatar David S. Miller
Browse files

sparc: Kill mmu_{un,}lockarea(). 



These were used on sun4c during floppy data transfers since on that
chip we had to lock the cpu mappings into the TLB because we cannot
take a TLB miss during the assembler floppy interrupt handler that
does the data transfer.

That is no longer necessary since we've removed sun4c support, thus
this stuff can disappear completely.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f613914e

arch/sparc/include/asm/dma.h

+0 −6
Original line number Original line Diff line number Diff line
@@ -92,12 +92,6 @@ extern int isa_dma_bridge_buggy; 
#ifdef CONFIG_SPARC32

#ifdef CONFIG_SPARC32





/* Routines for data transfer buffers. */

/* Routines for data transfer buffers. */

BTFIXUPDEF_CALL(char *, mmu_lockarea, char *, unsigned long)

BTFIXUPDEF_CALL(void,   mmu_unlockarea, char *, unsigned long)



#define mmu_lockarea(vaddr,len) BTFIXUP_CALL(mmu_lockarea)(vaddr,len)

#define mmu_unlockarea(vaddr,len) BTFIXUP_CALL(mmu_unlockarea)(vaddr,len)



struct page;

struct page;

struct device;

struct device;

struct scatterlist;

struct scatterlist;

arch/sparc/include/asm/floppy_32.h

+1 −5
Original line number Original line Diff line number Diff line
@@ -229,11 +229,8 @@ static inline void virtual_dma_init(void) 
static inline void sun_fd_disable_dma(void)

static inline void sun_fd_disable_dma(void)

{

{

	doing_pdma = 0;

	doing_pdma = 0;

	if (pdma_base) {

		mmu_unlockarea(pdma_base, pdma_areasize);

	pdma_base = NULL;

	pdma_base = NULL;

}

}

}





static inline void sun_fd_set_dma_mode(int mode)

static inline void sun_fd_set_dma_mode(int mode)

{

{
@@ -262,7 +259,6 @@ static inline void sun_fd_set_dma_count(int length) 




static inline void sun_fd_enable_dma(void)

static inline void sun_fd_enable_dma(void)

{

{

	pdma_vaddr = mmu_lockarea(pdma_vaddr, pdma_size);

	pdma_base = pdma_vaddr;

	pdma_base = pdma_vaddr;

	pdma_areasize = pdma_size;

	pdma_areasize = pdma_size;

}

}

arch/sparc/include/asm/floppy_64.h

+2 −5
Original line number Original line Diff line number Diff line
@@ -161,11 +161,8 @@ unsigned long pdma_areasize; 
static void sun_fd_disable_dma(void)

static void sun_fd_disable_dma(void)

{

{

	doing_pdma = 0;

	doing_pdma = 0;

	if (pdma_base) {

		mmu_unlockarea(pdma_base, pdma_areasize);

	pdma_base = NULL;

	pdma_base = NULL;

}

}

}





static void sun_fd_set_dma_mode(int mode)

static void sun_fd_set_dma_mode(int mode)

{

{
@@ -194,7 +191,7 @@ static void sun_fd_set_dma_count(int length) 




static void sun_fd_enable_dma(void)

static void sun_fd_enable_dma(void)

{

{

	pdma_vaddr = mmu_lockarea(pdma_vaddr, pdma_size);

	pdma_vaddr = pdma_vaddr;

	pdma_base = pdma_vaddr;

	pdma_base = pdma_vaddr;

	pdma_areasize = pdma_size;

	pdma_areasize = pdma_size;

}

}

arch/sparc/include/asm/pgtable_64.h

+0 −4
Original line number Original line Diff line number Diff line
@@ -717,10 +717,6 @@ extern unsigned long find_ecache_flush_span(unsigned long size); 
struct seq_file;

struct seq_file;

extern void mmu_info(struct seq_file *);

extern void mmu_info(struct seq_file *);





/* These do nothing with the way I have things setup. */

#define mmu_lockarea(vaddr, len)		(vaddr)

#define mmu_unlockarea(vaddr, len)		do { } while(0)



struct vm_area_struct;

struct vm_area_struct;

extern void update_mmu_cache(struct vm_area_struct *, unsigned long, pte_t *);

extern void update_mmu_cache(struct vm_area_struct *, unsigned long, pte_t *);

arch/sparc/kernel/sparc_ksyms_32.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -32,8 +32,6 @@ EXPORT_SYMBOL(empty_zero_page); 
#ifdef CONFIG_SMP

#ifdef CONFIG_SMP

EXPORT_SYMBOL(BTFIXUP_CALL(__hard_smp_processor_id));

EXPORT_SYMBOL(BTFIXUP_CALL(__hard_smp_processor_id));

#endif

#endif

EXPORT_SYMBOL(BTFIXUP_CALL(mmu_unlockarea));

EXPORT_SYMBOL(BTFIXUP_CALL(mmu_lockarea));

EXPORT_SYMBOL(BTFIXUP_CALL(mmu_get_scsi_sgl));

EXPORT_SYMBOL(BTFIXUP_CALL(mmu_get_scsi_sgl));

EXPORT_SYMBOL(BTFIXUP_CALL(mmu_get_scsi_one));

EXPORT_SYMBOL(BTFIXUP_CALL(mmu_get_scsi_one));

EXPORT_SYMBOL(BTFIXUP_CALL(mmu_release_scsi_sgl));

EXPORT_SYMBOL(BTFIXUP_CALL(mmu_release_scsi_sgl));