diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-02-02 03:05:22 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-02-02 03:05:22 -0500 |
| commit | fb7899b1f0b748ef966071f5dc23c59ebd57d08f (patch) | |
| tree | 2f13f9d8607871a60334608524e8b4e9447f5309 /arch/s390/include/asm/irqflags.h | |
| parent | 212b3c8b8ab94d983c2e0ee1821f17dd5b4e0859 (diff) | |
| parent | abe94c756c08d50566c09a65b9c7fe72f83071c5 (diff) | |
Merge commit 'v2.6.33-rc6' into secretlab/next-spi
Diffstat (limited to 'arch/s390/include/asm/irqflags.h')
| -rw-r--r-- | arch/s390/include/asm/irqflags.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/arch/s390/include/asm/irqflags.h b/arch/s390/include/asm/irqflags.h index 3f26131120b7..c2fb432f576a 100644 --- a/arch/s390/include/asm/irqflags.h +++ b/arch/s390/include/asm/irqflags.h | |||
| @@ -1,14 +1,12 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * include/asm-s390/irqflags.h | 2 | * Copyright IBM Corp. 2006,2010 |
| 3 | * | 3 | * Author(s): Martin Schwidefsky <schwidefsky@de.ibm.com> |
| 4 | * Copyright (C) IBM Corp. 2006 | ||
| 5 | * Author(s): Heiko Carstens <heiko.carstens@de.ibm.com> | ||
| 6 | */ | 4 | */ |
| 7 | 5 | ||
| 8 | #ifndef __ASM_IRQFLAGS_H | 6 | #ifndef __ASM_IRQFLAGS_H |
| 9 | #define __ASM_IRQFLAGS_H | 7 | #define __ASM_IRQFLAGS_H |
| 10 | 8 | ||
| 11 | #ifdef __KERNEL__ | 9 | #include <linux/types.h> |
| 12 | 10 | ||
| 13 | #if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 2) | 11 | #if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 2) |
| 14 | 12 | ||
| @@ -102,5 +100,4 @@ static inline int raw_irqs_disabled_flags(unsigned long flags) | |||
| 102 | /* For spinlocks etc */ | 100 | /* For spinlocks etc */ |
| 103 | #define raw_local_irq_save(x) ((x) = raw_local_irq_disable()) | 101 | #define raw_local_irq_save(x) ((x) = raw_local_irq_disable()) |
| 104 | 102 | ||
| 105 | #endif /* __KERNEL__ */ | ||
| 106 | #endif /* __ASM_IRQFLAGS_H */ | 103 | #endif /* __ASM_IRQFLAGS_H */ |