diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2009-01-05 17:18:52 +0000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-05 17:41:45 -0800 |
| commit | 7483cb7bbc02b9471dda28e54f41287d5374e3ac (patch) | |
| tree | 551b26b32b7e83c935b0a88907d75c7416146541 /arch/um | |
| parent | 22409f9c80d0a742ff98d1cfe1bf60fce1927be1 (diff) | |
| download | linux-stable-7483cb7bbc02b9471dda28e54f41287d5374e3ac.tar.gz linux-stable-7483cb7bbc02b9471dda28e54f41287d5374e3ac.tar.bz2 linux-stable-7483cb7bbc02b9471dda28e54f41287d5374e3ac.zip | |
uml got broken by commit 30742d5c2277c325fb0e9d2d817d55a19995fe8f
... if you revert a commit, revert the fixups elsewhere that had been
triggered by it. Such as 8c56250f48347750c82ab18d98d647dcf99ca674
(lockdep, UML: fix compilation when CONFIG_TRACE_IRQFLAGS_SUPPORT is not set).
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/um')
| -rw-r--r-- | arch/um/include/asm/system.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/um/include/asm/system.h b/arch/um/include/asm/system.h index ae5f94d6317d..753346e2cdfd 100644 --- a/arch/um/include/asm/system.h +++ b/arch/um/include/asm/system.h @@ -11,21 +11,21 @@ extern int get_signals(void); extern void block_signals(void); extern void unblock_signals(void); -#define raw_local_save_flags(flags) do { typecheck(unsigned long, flags); \ +#define local_save_flags(flags) do { typecheck(unsigned long, flags); \ (flags) = get_signals(); } while(0) -#define raw_local_irq_restore(flags) do { typecheck(unsigned long, flags); \ +#define local_irq_restore(flags) do { typecheck(unsigned long, flags); \ set_signals(flags); } while(0) -#define raw_local_irq_save(flags) do { raw_local_save_flags(flags); \ - raw_local_irq_disable(); } while(0) +#define local_irq_save(flags) do { local_save_flags(flags); \ + local_irq_disable(); } while(0) -#define raw_local_irq_enable() unblock_signals() -#define raw_local_irq_disable() block_signals() +#define local_irq_enable() unblock_signals() +#define local_irq_disable() block_signals() #define irqs_disabled() \ ({ \ unsigned long flags; \ - raw_local_save_flags(flags); \ + local_save_flags(flags); \ (flags == 0); \ }) |