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

Commit c55377ee authored by Paul Mackerras's avatar Paul Mackerras
Browse files

powerpc: Move a bunch of ppc64 headers to include/asm-powerpc 



... and also delete some that are no longer used because we already
had an include/asm-powerpc version of the header.

Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 821077b2

include/asm-ppc64/btext.h→include/asm-powerpc/btext.h

+0 −0

File moved.

View file

include/asm-ppc64/delay.h→include/asm-powerpc/delay.h

+13 −6
Original line number Diff line number Diff line 
#ifndef _PPC64_DELAY_H

#define _PPC64_DELAY_H

#ifndef _ASM_POWERPC_DELAY_H

#define _ASM_POWERPC_DELAY_H



/*

 * Copyright 1996, Paul Mackerras.
@@ -15,9 +15,16 @@ 


extern unsigned long tb_ticks_per_usec;



#ifdef CONFIG_PPC64

/* define these here to prevent circular dependencies */

/* these instructions control the thread priority on multi-threaded cpus */

#define __HMT_low()	asm volatile("or 1,1,1")

#define __HMT_medium()	asm volatile("or 2,2,2")

#else

#define __HMT_low()

#define __HMT_medium()

#endif



#define __barrier()	asm volatile("" ::: "memory")



static inline unsigned long __get_tb(void)
@@ -45,4 +52,4 @@ static inline void udelay(unsigned long usecs) 
	__delay(loops);

}



#endif /* _PPC64_DELAY_H */
 
#endif /* _ASM_POWERPC_DELAY_H */

include/asm-ppc64/eeh.h→include/asm-powerpc/eeh.h

+0 −0

File moved.

View file

include/asm-ppc64/floppy.h→include/asm-powerpc/floppy.h

+12 −13
Original line number Diff line number Diff line
@@ -7,8 +7,8 @@ 
 *

 * Copyright (C) 1995

 */

#ifndef __ASM_PPC64_FLOPPY_H

#define __ASM_PPC64_FLOPPY_H

#ifndef __ASM_POWERPC_FLOPPY_H

#define __ASM_POWERPC_FLOPPY_H



#include <linux/config.h>

#include <asm/machdep.h>
@@ -35,10 +35,10 @@ 


#include <linux/pci.h>



#define fd_dma_setup(addr,size,mode,io) ppc64_fd_dma_setup(addr,size,mode,io)

#define fd_dma_setup(addr,size,mode,io) powerpc_fd_dma_setup(addr,size,mode,io)



static __inline__ int 

ppc64_fd_dma_setup(char *addr, unsigned long size, int mode, int io)

static __inline__ int powerpc_fd_dma_setup(char *addr, unsigned long size,

					   int mode, int io)

{

	static unsigned long prev_size;

	static dma_addr_t bus_addr = 0;
@@ -55,9 +55,8 @@ ppc64_fd_dma_setup(char *addr, unsigned long size, int mode, int io) 
		bus_addr = 0;

	}



	if (!bus_addr)	/* need to map it */ {

	if (!bus_addr)	/* need to map it */

		bus_addr = pci_map_single(NULL, addr, size, dir);

	}



	/* remember this one as prev */

	prev_addr = addr;
@@ -103,4 +102,4 @@ static int FDC2 = -1; 


#define EXTRA_FLOPPY_PARAMS



#endif /* __ASM_PPC64_FLOPPY_H */
 
#endif /* __ASM_POWERPC_FLOPPY_H */