lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

um: fix IRQ flag handling naming

Browse Source 
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>
This commit is contained in:
Richard Weinberger
2010-10-26 14:21:21 -07:00
committed by Linus Torvalds
parent 8474b591fa
commit dbec921370
1 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
arch/um/include/asm/system.h
View File

@@ -8,23 +8,38 @@ extern int set_signals(int enable);
extern void block_signals(void); extern void block_signals(void);
extern void unblock_signals(void); extern void unblock_signals(void);
#define local_save_flags(flags) do { typecheck(unsigned long, flags); \ static inline unsigned long arch_local_save_flags(void)
(flags) = get_signals(); } while(0) {
#define local_irq_restore(flags) do { typecheck(unsigned long, flags); \ return get_signals();
set_signals(flags); } while(0) }
#define local_irq_save(flags) do { local_save_flags(flags); \ static inline void arch_local_irq_restore(unsigned long flags)
local_irq_disable(); } while(0) {
set_signals(flags);
}
#define local_irq_enable() unblock_signals() static inline void arch_local_irq_enable(void)
#define local_irq_disable() block_signals() {
unblock_signals();
}
#define irqs_disabled() \ static inline void arch_local_irq_disable(void)
({ \ {
unsigned long flags; \ block_signals();
local_save_flags(flags); \ }
(flags == 0); \
}) 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); extern void *_switch_to(void *prev, void *next, void *last);
#define switch_to(prev, next, last) prev = _switch_to(prev, next, last) #define switch_to(prev, next, last) prev = _switch_to(prev, next, last)