leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

um: kill system-um.h

Browse Source 
most of it belonged in irqflags.h, actually

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
This commit is contained in:
Al Viro 2011-08-18 20:14:00 +01:00 committed by Richard Weinberger
parent b8c655d727
commit a34978cbd9
3 changed files with 40 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
arch/um/include/asm/irqflags.h
View File

@ -1,6 +1,42 @@
#ifndef __UM_IRQFLAGS_H #ifndef __UM_IRQFLAGS_H
#define __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 #endif

45
arch/um/include/asm/system-um.h
View File

@ -1,45 +0,0 @@
#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

4
arch/x86/um/asm/system.h
View File

@ -6,7 +6,6 @@
#include <asm/cpufeature.h> #include <asm/cpufeature.h>
#include <asm/cmpxchg.h> #include <asm/cmpxchg.h>
#include <asm/nops.h> #include <asm/nops.h>
#include <asm/system-um.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/irqflags.h> #include <linux/irqflags.h>
@ -130,4 +129,7 @@ static inline void rdtsc_barrier(void)
alternative(ASM_NOP3, "lfence", X86_FEATURE_LFENCE_RDTSC); 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 #endif