diff options
| author | Linus Torvalds | 2010-10-21 23:37:27 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2010-10-21 23:37:27 +0200 |
| commit | e36f561a2c88394ef2708f1ab300fe8a79e9f651 (patch) | |
| tree | 385f378c4240955e4356d49686a8ef606a82a7c1 /arch/sh/include | |
| parent | Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6 (diff) | |
| parent | Fix IRQ flag handling naming (diff) | |
| download | kernel-qcow2-linux-e36f561a2c88394ef2708f1ab300fe8a79e9f651.tar.gz kernel-qcow2-linux-e36f561a2c88394ef2708f1ab300fe8a79e9f651.tar.xz kernel-qcow2-linux-e36f561a2c88394ef2708f1ab300fe8a79e9f651.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-irqflags
* git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-irqflags:
Fix IRQ flag handling naming
MIPS: Add missing #inclusions of <linux/irq.h>
smc91x: Add missing #inclusion of <linux/irq.h>
Drop a couple of unnecessary asm/system.h inclusions
SH: Add missing consts to sys_execve() declaration
Blackfin: Rename IRQ flags handling functions
Blackfin: Add missing dep to asm/irqflags.h
Blackfin: Rename DES PC2() symbol to avoid collision
Blackfin: Split the BF532 BFIN_*_FIO_FLAG() functions to their own header
Blackfin: Split PLL code from mach-specific cdef headers
Diffstat (limited to 'arch/sh/include')
| -rw-r--r-- | arch/sh/include/asm/irqflags.h | 4 | ||||
| -rw-r--r-- | arch/sh/include/asm/syscalls_32.h | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/arch/sh/include/asm/irqflags.h b/arch/sh/include/asm/irqflags.h index a741153b41c2..43b7608606c3 100644 --- a/arch/sh/include/asm/irqflags.h +++ b/arch/sh/include/asm/irqflags.h @@ -1,8 +1,8 @@ #ifndef __ASM_SH_IRQFLAGS_H #define __ASM_SH_IRQFLAGS_H -#define RAW_IRQ_DISABLED 0xf0 -#define RAW_IRQ_ENABLED 0x00 +#define ARCH_IRQ_DISABLED 0xf0 +#define ARCH_IRQ_ENABLED 0x00 #include <asm-generic/irqflags.h> diff --git a/arch/sh/include/asm/syscalls_32.h b/arch/sh/include/asm/syscalls_32.h index be201fdc97aa..ae717e3c26d6 100644 --- a/arch/sh/include/asm/syscalls_32.h +++ b/arch/sh/include/asm/syscalls_32.h @@ -19,9 +19,10 @@ asmlinkage int sys_clone(unsigned long clone_flags, unsigned long newsp, asmlinkage int sys_vfork(unsigned long r4, unsigned long r5, unsigned long r6, unsigned long r7, struct pt_regs __regs); -asmlinkage int sys_execve(const char __user *ufilename, char __user * __user *uargv, - char __user * __user *uenvp, unsigned long r7, - struct pt_regs __regs); +asmlinkage int sys_execve(const char __user *ufilename, + const char __user *const __user *uargv, + const char __user *const __user *uenvp, + unsigned long r7, struct pt_regs __regs); asmlinkage int sys_sigsuspend(old_sigset_t mask, unsigned long r5, unsigned long r6, unsigned long r7, struct pt_regs __regs); |