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

Commit 9f97da78 authored by David Howells's avatar David Howells
Browse files

Disintegrate asm/system.h for ARM 



Disintegrate asm/system.h for ARM.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
cc: Russell King <linux@arm.linux.org.uk>
cc: linux-arm-kernel@lists.infradead.org
parent 15d07dc9

arch/arm/common/via82c505.c

+0 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ 
#include <linux/ioport.h>

#include <linux/io.h>



#include <asm/system.h>



#include <asm/mach/pci.h>

arch/arm/include/asm/atomic.h

+3 −1
Original line number Diff line number Diff line
@@ -13,7 +13,9 @@ 


#include <linux/compiler.h>

#include <linux/types.h>

#include <asm/system.h>

#include <linux/irqflags.h>

#include <asm/barrier.h>

#include <asm/cmpxchg.h>



#define ATOMIC_INIT(i)	{ (i) }

arch/arm/include/asm/barrier.h

0 → 100644
+69 −0
Original line number Diff line number Diff line 
#ifndef __ASM_BARRIER_H

#define __ASM_BARRIER_H



#ifndef __ASSEMBLY__



#define nop() __asm__ __volatile__("mov\tr0,r0\t@ nop\n\t");



#if __LINUX_ARM_ARCH__ >= 7 ||		\

	(__LINUX_ARM_ARCH__ == 6 && defined(CONFIG_CPU_32v6K))

#define sev()	__asm__ __volatile__ ("sev" : : : "memory")

#define wfe()	__asm__ __volatile__ ("wfe" : : : "memory")

#define wfi()	__asm__ __volatile__ ("wfi" : : : "memory")

#endif



#if __LINUX_ARM_ARCH__ >= 7

#define isb() __asm__ __volatile__ ("isb" : : : "memory")

#define dsb() __asm__ __volatile__ ("dsb" : : : "memory")

#define dmb() __asm__ __volatile__ ("dmb" : : : "memory")

#elif defined(CONFIG_CPU_XSC3) || __LINUX_ARM_ARCH__ == 6

#define isb() __asm__ __volatile__ ("mcr p15, 0, %0, c7, c5, 4" \

				    : : "r" (0) : "memory")

#define dsb() __asm__ __volatile__ ("mcr p15, 0, %0, c7, c10, 4" \

				    : : "r" (0) : "memory")

#define dmb() __asm__ __volatile__ ("mcr p15, 0, %0, c7, c10, 5" \

				    : : "r" (0) : "memory")

#elif defined(CONFIG_CPU_FA526)

#define isb() __asm__ __volatile__ ("mcr p15, 0, %0, c7, c5, 4" \

				    : : "r" (0) : "memory")

#define dsb() __asm__ __volatile__ ("mcr p15, 0, %0, c7, c10, 4" \

				    : : "r" (0) : "memory")

#define dmb() __asm__ __volatile__ ("" : : : "memory")

#else

#define isb() __asm__ __volatile__ ("" : : : "memory")

#define dsb() __asm__ __volatile__ ("mcr p15, 0, %0, c7, c10, 4" \

				    : : "r" (0) : "memory")

#define dmb() __asm__ __volatile__ ("" : : : "memory")

#endif



#ifdef CONFIG_ARCH_HAS_BARRIERS

#include <mach/barriers.h>

#elif defined(CONFIG_ARM_DMA_MEM_BUFFERABLE) || defined(CONFIG_SMP)

#include <asm/outercache.h>

#define mb()		do { dsb(); outer_sync(); } while (0)

#define rmb()		dsb()

#define wmb()		mb()

#else

#include <asm/memory.h>

#define mb()	do { if (arch_is_coherent()) dmb(); else barrier(); } while (0)

#define rmb()	do { if (arch_is_coherent()) dmb(); else barrier(); } while (0)

#define wmb()	do { if (arch_is_coherent()) dmb(); else barrier(); } while (0)

#endif



#ifndef CONFIG_SMP

#define smp_mb()	barrier()

#define smp_rmb()	barrier()

#define smp_wmb()	barrier()

#else

#define smp_mb()	dmb()

#define smp_rmb()	dmb()

#define smp_wmb()	dmb()

#endif



#define read_barrier_depends()		do { } while(0)

#define smp_read_barrier_depends()	do { } while(0)



#define set_mb(var, value)	do { var = value; smp_mb(); } while (0)



#endif /* !__ASSEMBLY__ */

#endif /* __ASM_BARRIER_H */

arch/arm/include/asm/bitops.h

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
#endif



#include <linux/compiler.h>

#include <asm/system.h>

#include <linux/irqflags.h>



#define smp_mb__before_clear_bit()	smp_mb()

#define smp_mb__after_clear_bit()	smp_mb()

arch/arm/include/asm/bug.h

+30 −0
Original line number Diff line number Diff line 
#ifndef _ASMARM_BUG_H

#define _ASMARM_BUG_H



#include <linux/linkage.h>



#ifdef CONFIG_BUG
@@ -57,4 +58,33 @@ do { \ 


#include <asm-generic/bug.h>



struct pt_regs;

void die(const char *msg, struct pt_regs *regs, int err);



struct siginfo;

void arm_notify_die(const char *str, struct pt_regs *regs, struct siginfo *info,

		unsigned long err, unsigned long trap);



#ifdef CONFIG_ARM_LPAE

#define FAULT_CODE_ALIGNMENT	33

#define FAULT_CODE_DEBUG	34

#else

#define FAULT_CODE_ALIGNMENT	1

#define FAULT_CODE_DEBUG	2

#endif



void hook_fault_code(int nr, int (*fn)(unsigned long, unsigned int,

				       struct pt_regs *),

		     int sig, int code, const char *name);



void hook_ifault_code(int nr, int (*fn)(unsigned long, unsigned int,

				       struct pt_regs *),

		     int sig, int code, const char *name);



extern asmlinkage void c_backtrace(unsigned long fp, int pmode);



struct mm_struct;

extern void show_pte(struct mm_struct *mm, unsigned long addr);

extern void __show_regs(struct pt_regs *);



#endif