diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-12 22:25:41 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-12 22:25:41 -0400 |
| commit | 18a022de47bc11ee20d7d0f4dd72d42d2cfdc51c (patch) | |
| tree | 84e178e4e475400f8e9a5c74f1e2cb35ee17fca4 /include/linux | |
| parent | 02a650e2820e19fde8f6a49752027217fdd33d78 (diff) | |
| parent | d23b5799b608112bb799c9b0e1e11ee1da692d76 (diff) | |
Merge tag 'for-3.7' of git://openrisc.net/jonas/linux
Pull OpenRISC updates from Jonas Bonn:
"Fixups for some corner cases, build issues, and some obvious bugs in
IRQ handling. No major changes."
* tag 'for-3.7' of git://openrisc.net/jonas/linux:
openrisc: mask interrupts in irq_mask_ack function
openrisc: fix typos in comments and warnings
openrisc: PIC should act on domain-local irqs
openrisc: Make cpu_relax() invoke barrier()
audit: define AUDIT_ARCH_OPENRISC
openrisc: delay: fix handling of counter overflow
openrisc: delay: fix loops calculation for __const_udelay
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/audit.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/audit.h b/include/linux/audit.h index e5884f950b4b..b889fa64b0e0 100644 --- a/include/linux/audit.h +++ b/include/linux/audit.h | |||
| @@ -337,6 +337,7 @@ enum { | |||
| 337 | #define AUDIT_ARCH_MIPSEL (EM_MIPS|__AUDIT_ARCH_LE) | 337 | #define AUDIT_ARCH_MIPSEL (EM_MIPS|__AUDIT_ARCH_LE) |
| 338 | #define AUDIT_ARCH_MIPS64 (EM_MIPS|__AUDIT_ARCH_64BIT) | 338 | #define AUDIT_ARCH_MIPS64 (EM_MIPS|__AUDIT_ARCH_64BIT) |
| 339 | #define AUDIT_ARCH_MIPSEL64 (EM_MIPS|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE) | 339 | #define AUDIT_ARCH_MIPSEL64 (EM_MIPS|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE) |
| 340 | #define AUDIT_ARCH_OPENRISC (EM_OPENRISC) | ||
| 340 | #define AUDIT_ARCH_PARISC (EM_PARISC) | 341 | #define AUDIT_ARCH_PARISC (EM_PARISC) |
| 341 | #define AUDIT_ARCH_PARISC64 (EM_PARISC|__AUDIT_ARCH_64BIT) | 342 | #define AUDIT_ARCH_PARISC64 (EM_PARISC|__AUDIT_ARCH_64BIT) |
| 342 | #define AUDIT_ARCH_PPC (EM_PPC) | 343 | #define AUDIT_ARCH_PPC (EM_PPC) |