| 
									
										
										
										
											2010-10-07 14:08:55 +01:00
										 |  |  | #ifndef _M68K_IRQFLAGS_H
 | 
					
						
							|  |  |  | #define _M68K_IRQFLAGS_H
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | #include <linux/types.h>
 | 
					
						
							| 
									
										
											  
											
												m68k, m68knommu: Do not include linux/hardirq.h in asm/irqflags.h
Recent changes to header files made kernel compilation for m68k/m68knommu
fail with :
  CC      arch/m68knommu/kernel/asm-offsets.s
In file included from /archives/linux/git/arch/m68k/include/asm/system.h:2,
                 from include/linux/wait.h:25,
                 from include/linux/mmzone.h:9,
                 from include/linux/gfp.h:4,
                 from include/linux/irq.h:20,
                 from include/asm-generic/hardirq.h:12,
                 from /archives/linux/git/arch/m68k/include/asm/hardirq_no.h:17,
                 from /archives/linux/git/arch/m68k/include/asm/hardirq.h:2,
                 from include/linux/hardirq.h:10,
                 from /archives/linux/git/arch/m68k/include/asm/irqflags.h:5,
                 from include/linux/irqflags.h:15,
                 from include/linux/spinlock.h:53,
                 from include/linux/seqlock.h:29,
                 from include/linux/time.h:8,
                 from include/linux/timex.h:56,
                 from include/linux/sched.h:56,
                 from arch/m68knommu/kernel/asm-offsets.c:12:
/archives/linux/git/arch/m68k/include/asm/system_no.h: In function ‘__xchg’:
/archives/linux/git/arch/m68k/include/asm/system_no.h:79: error: implicit
+declaration of function ‘local_irq_save’
/archives/linux/git/arch/m68k/include/asm/system_no.h:101: error: implicit
+declaration of function ‘local_irq_restore’
Fix that
Signed-off-by: Philippe De Muyter <phdm@macqel.be>
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
											
										 
											2010-10-28 14:42:58 +02:00
										 |  |  | #ifdef CONFIG_MMU
 | 
					
						
							| 
									
										
										
										
											2013-07-29 21:06:21 +02:00
										 |  |  | #include <linux/preempt_mask.h>
 | 
					
						
							| 
									
										
											  
											
												m68k, m68knommu: Do not include linux/hardirq.h in asm/irqflags.h
Recent changes to header files made kernel compilation for m68k/m68knommu
fail with :
  CC      arch/m68knommu/kernel/asm-offsets.s
In file included from /archives/linux/git/arch/m68k/include/asm/system.h:2,
                 from include/linux/wait.h:25,
                 from include/linux/mmzone.h:9,
                 from include/linux/gfp.h:4,
                 from include/linux/irq.h:20,
                 from include/asm-generic/hardirq.h:12,
                 from /archives/linux/git/arch/m68k/include/asm/hardirq_no.h:17,
                 from /archives/linux/git/arch/m68k/include/asm/hardirq.h:2,
                 from include/linux/hardirq.h:10,
                 from /archives/linux/git/arch/m68k/include/asm/irqflags.h:5,
                 from include/linux/irqflags.h:15,
                 from include/linux/spinlock.h:53,
                 from include/linux/seqlock.h:29,
                 from include/linux/time.h:8,
                 from include/linux/timex.h:56,
                 from include/linux/sched.h:56,
                 from arch/m68knommu/kernel/asm-offsets.c:12:
/archives/linux/git/arch/m68k/include/asm/system_no.h: In function ‘__xchg’:
/archives/linux/git/arch/m68k/include/asm/system_no.h:79: error: implicit
+declaration of function ‘local_irq_save’
/archives/linux/git/arch/m68k/include/asm/system_no.h:101: error: implicit
+declaration of function ‘local_irq_restore’
Fix that
Signed-off-by: Philippe De Muyter <phdm@macqel.be>
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
											
										 
											2010-10-28 14:42:58 +02:00
										 |  |  | #endif
 | 
					
						
							| 
									
										
										
										
											2010-10-07 14:08:55 +01:00
										 |  |  | #include <linux/preempt.h>
 | 
					
						
							|  |  |  | #include <asm/thread_info.h>
 | 
					
						
							|  |  |  | #include <asm/entry.h>
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static inline unsigned long arch_local_save_flags(void) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  | 	unsigned long flags; | 
					
						
							|  |  |  | 	asm volatile ("movew %%sr,%0" : "=d" (flags) : : "memory"); | 
					
						
							|  |  |  | 	return flags; | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static inline void arch_local_irq_disable(void) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  | #ifdef CONFIG_COLDFIRE
 | 
					
						
							|  |  |  | 	asm volatile ( | 
					
						
							|  |  |  | 		"move	%/sr,%%d0	\n\t" | 
					
						
							|  |  |  | 		"ori.l	#0x0700,%%d0	\n\t" | 
					
						
							|  |  |  | 		"move	%%d0,%/sr	\n" | 
					
						
							|  |  |  | 		: /* no outputs */ | 
					
						
							|  |  |  | 		: | 
					
						
							|  |  |  | 		: "cc", "%d0", "memory"); | 
					
						
							|  |  |  | #else
 | 
					
						
							|  |  |  | 	asm volatile ("oriw  #0x0700,%%sr" : : : "memory"); | 
					
						
							|  |  |  | #endif
 | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static inline void arch_local_irq_enable(void) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  | #if defined(CONFIG_COLDFIRE)
 | 
					
						
							|  |  |  | 	asm volatile ( | 
					
						
							|  |  |  | 		"move	%/sr,%%d0	\n\t" | 
					
						
							|  |  |  | 		"andi.l	#0xf8ff,%%d0	\n\t" | 
					
						
							|  |  |  | 		"move	%%d0,%/sr	\n" | 
					
						
							|  |  |  | 		: /* no outputs */ | 
					
						
							|  |  |  | 		: | 
					
						
							|  |  |  | 		: "cc", "%d0", "memory"); | 
					
						
							|  |  |  | #else
 | 
					
						
							|  |  |  | # if defined(CONFIG_MMU)
 | 
					
						
							|  |  |  | 	if (MACH_IS_Q40 || !hardirq_count()) | 
					
						
							|  |  |  | # endif
 | 
					
						
							|  |  |  | 		asm volatile ( | 
					
						
							|  |  |  | 			"andiw %0,%%sr" | 
					
						
							|  |  |  | 			: | 
					
						
							|  |  |  | 			: "i" (ALLOWINT) | 
					
						
							|  |  |  | 			: "memory"); | 
					
						
							|  |  |  | #endif
 | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static inline unsigned long arch_local_irq_save(void) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  | 	unsigned long flags = arch_local_save_flags(); | 
					
						
							|  |  |  | 	arch_local_irq_disable(); | 
					
						
							|  |  |  | 	return flags; | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static inline void arch_local_irq_restore(unsigned long flags) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  | 	asm volatile ("movew %0,%%sr" : : "d" (flags) : "memory"); | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static inline bool arch_irqs_disabled_flags(unsigned long flags) | 
					
						
							|  |  |  | { | 
					
						
							| 
									
										
										
										
											2013-08-09 21:26:12 +00:00
										 |  |  | 	if (MACH_IS_ATARI) { | 
					
						
							|  |  |  | 		/* Ignore HSYNC = ipl 2 on Atari */ | 
					
						
							|  |  |  | 		return (flags & ~(ALLOWINT | 0x200)) != 0; | 
					
						
							|  |  |  | 	} | 
					
						
							| 
									
										
										
										
											2010-10-07 14:08:55 +01:00
										 |  |  | 	return (flags & ~ALLOWINT) != 0; | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static inline bool arch_irqs_disabled(void) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  | 	return arch_irqs_disabled_flags(arch_local_save_flags()); | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | #endif /* _M68K_IRQFLAGS_H */
 |