Commit 4068d93c authored by Kyle McMartin's avatar Kyle McMartin Committed by Matthew Wilcox
Browse files

[PARISC] Untangle <asm/processor.h> header include mess 



asm/processor.h on parisc wants spinlocks for cpuinfo, but
linux/spinlock_types.h needs lockdep, and lockdep wants prefetch.

This leads to a horrible circular dependancy, because <asm/processor.h>
is including something which depends on things which are not defined
until the end of the file.

Kludge around this by moving prefetch related code into <asm/prefetch.h>
and including it before <linux/spinlock_types.h>, however this is just
a temporary solution until this mess can be cleaned up.

Signed-off-by: default avatarKyle McMartin <kyle@parisc-linux.org>
parent 78b656b8

include/asm-parisc/prefetch.h

0 → 100644
+36 −0
Original line number Diff line number Diff line 
/*

 * include/asm-parisc/prefetch.h

 *

 * PA 2.0 defines data prefetch instructions on page 6-11 of the Kane book.

 * In addition, many implementations do hardware prefetching of both

 * instructions and data.

 *

 * PA7300LC (page 14-4 of the ERS) also implements prefetching by a load

 * to gr0 but not in a way that Linux can use.  If the load would cause an

 * interruption (eg due to prefetching 0), it is suppressed on PA2.0

 * processors, but not on 7300LC.

 *

 */



#ifndef __ASM_PARISC_PREFETCH_H

#define __ASM_PARISC_PREFETCH_H



#ifndef __ASSEMBLY__

#ifdef CONFIG_PREFETCH



#define ARCH_HAS_PREFETCH

extern inline void prefetch(const void *addr)

{

	__asm__("ldw 0(%0), %%r0" : : "r" (addr));

}



#define ARCH_HAS_PREFETCHW

extern inline void prefetchw(const void *addr)

{

	__asm__("ldd 0(%0), %%r0" : : "r" (addr));

}



#endif /* CONFIG_PREFETCH */

#endif /* __ASSEMBLY__ */



#endif /* __ASM_PARISC_PROCESSOR_H */

include/asm-parisc/processor.h

+2 −26
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ 
#define __ASM_PARISC_PROCESSOR_H



#ifndef __ASSEMBLY__

#include <asm/prefetch.h>	/* lockdep.h needs <linux/prefetch.h> */



#include <linux/threads.h>

#include <linux/spinlock_types.h>
@@ -328,32 +330,6 @@ extern unsigned long get_wchan(struct task_struct *p); 
#define KSTK_EIP(tsk)	((tsk)->thread.regs.iaoq[0])

#define KSTK_ESP(tsk)	((tsk)->thread.regs.gr[30])





/*

 * PA 2.0 defines data prefetch instructions on page 6-11 of the Kane book.

 * In addition, many implementations do hardware prefetching of both

 * instructions and data.

 *

 * PA7300LC (page 14-4 of the ERS) also implements prefetching by a load

 * to gr0 but not in a way that Linux can use.  If the load would cause an

 * interruption (eg due to prefetching 0), it is suppressed on PA2.0

 * processors, but not on 7300LC.

 */

#ifdef  CONFIG_PREFETCH

#define ARCH_HAS_PREFETCH

#define ARCH_HAS_PREFETCHW



extern inline void prefetch(const void *addr)

{

	__asm__("ldw 0(%0), %%r0" : : "r" (addr));

}



extern inline void prefetchw(const void *addr)

{

	__asm__("ldd 0(%0), %%r0" : : "r" (addr));

}

#endif



#define cpu_relax()	barrier()



#endif /* __ASSEMBLY__ */