Merge branch 'misc' into devel

[mirror_ubuntu-focal-kernel.git] / arch / arm / include / asm / processor.h

diff --git a/arch/arm/include/asm/processor.h b/arch/arm/include/asm/processor.h
index 67357baaeeebd93417932c70ca0d370d17818f51..b2d9df5667af937476baf5e64ded8520ea3fd5d4 100644 (file)
--- a/arch/arm/include/asm/processor.h
+++ b/arch/arm/include/asm/processor.h
@@ -29,19 +29,7 @@
 #define STACK_TOP_MAX  TASK_SIZE
 #endif
 
-union debug_insn {
-       u32     arm;
-       u16     thumb;
-};
-
-struct debug_entry {
-       u32                     address;
-       union debug_insn        insn;
-};
-
 struct debug_info {
-       int                     nsaved;
-       struct debug_entry      bp[2];
 #ifdef CONFIG_HAVE_HW_BREAKPOINT
        struct perf_event       *hbp[ARM_MAX_HBP_SLOTS];
 #endif
@@ -95,7 +83,7 @@ extern void release_thread(struct task_struct *);
 
 unsigned long get_wchan(struct task_struct *p);
 
-#if __LINUX_ARM_ARCH__ == 6
+#if __LINUX_ARM_ARCH__ == 6 || defined(CONFIG_ARM_ERRATA_754327)
 #define cpu_relax()                    smp_mb()
 #else
 #define cpu_relax()                    barrier()