dbec921370
Commit df9ee292 ("Fix IRQ flag handling naming") changed the IRQ flag
handling naming scheme and broke UML:
In file included from arch/um/include/asm/fixmap.h:5,
from arch/um/include/shared/um_uaccess.h:10,
from arch/um/include/asm/uaccess.h:41,
from arch/um/include/asm/thread_info.h:13,
from include/linux/thread_info.h:56,
from include/linux/preempt.h:9,
from include/linux/spinlock.h:50,
from include/linux/seqlock.h:29,
from include/linux/time.h:8,
from include/linux/stat.h:60,
from include/linux/module.h:10,
from init/main.c:13:
arch/um/include/asm/system.h:11:1: warning: "local_save_flags" redefined
This patch brings the new scheme to UML and makes it work again.
Signed-off-by: Richard Weinberger <richard@nod.at>
Acked-by: David Howells <dhowells@redhat.com>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
47 lines
925 B
C
47 lines
925 B
C
#ifndef __UM_SYSTEM_GENERIC_H
|
|
#define __UM_SYSTEM_GENERIC_H
|
|
|
|
#include "sysdep/system.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
|