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

Commit a34978cb authored by Al Viro's avatar Al Viro Committed by Richard Weinberger
Browse files

um: kill system-um.h 



most of it belonged in irqflags.h, actually

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent b8c655d7

arch/um/include/asm/irqflags.h

+37 −1
Original line number Diff line number Diff line 
#ifndef __UM_IRQFLAGS_H

#define __UM_IRQFLAGS_H



/* Empty for now */

extern int get_signals(void);

extern int set_signals(int enable);

extern void block_signals(void);

extern void unblock_signals(void);



static inline unsigned long arch_local_save_flags(void)

{

	return get_signals();

}



static inline void arch_local_irq_restore(unsigned long flags)

{

	set_signals(flags);

}



static inline void arch_local_irq_enable(void)

{

	unblock_signals();

}



static inline void arch_local_irq_disable(void)

{

	block_signals();

}



static inline unsigned long arch_local_irq_save(void)

{

	unsigned long flags;

	flags = arch_local_save_flags();

	arch_local_irq_disable();

	return flags;

}



static inline bool arch_irqs_disabled(void)

{

	return arch_local_save_flags() == 0;

}



#endif

arch/um/include/asm/system-um.h

deleted100644 → 0
+0 −45
Original line number Diff line number Diff line 
#ifndef __UM_SYSTEM_GENERIC_H

#define __UM_SYSTEM_GENERIC_H



extern int get_signals(void);

extern int set_signals(int enable);

extern void block_signals(void);

extern void unblock_signals(void);



static inline unsigned long arch_local_save_flags(void)

{

	return get_signals();

}



static inline void arch_local_irq_restore(unsigned long flags)

{

	set_signals(flags);

}



static inline void arch_local_irq_enable(void)

{

	unblock_signals();

}



static inline void arch_local_irq_disable(void)

{

	block_signals();

}



static inline unsigned long arch_local_irq_save(void)

{

	unsigned long flags;

	flags = arch_local_save_flags();

	arch_local_irq_disable();

	return flags;

}



static inline bool arch_irqs_disabled(void)

{

	return arch_local_save_flags() == 0;

}



extern void *_switch_to(void *prev, void *next, void *last);

#define switch_to(prev, next, last) prev = _switch_to(prev, next, last)



#endif

arch/x86/um/asm/system.h

+3 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ 
#include <asm/cpufeature.h>

#include <asm/cmpxchg.h>

#include <asm/nops.h>

#include <asm/system-um.h>



#include <linux/kernel.h>

#include <linux/irqflags.h>
@@ -130,4 +129,7 @@ static inline void rdtsc_barrier(void) 
	alternative(ASM_NOP3, "lfence", X86_FEATURE_LFENCE_RDTSC);

}



extern void *_switch_to(void *prev, void *next, void *last);

#define switch_to(prev, next, last) prev = _switch_to(prev, next, last)



#endif