diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-11 23:53:21 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-11 23:53:21 +0400 |
| commit | 2a383c63ff933a496f19d6559ab54ac14871b7f3 (patch) | |
| tree | b0f4a4fbc4d882c7fea7c6b8f69924284abff76d /kernel | |
| parent | 8bd994815987dda0947bd9afd887b1410713d4f7 (diff) | |
| parent | 2bd62a40f63bd628c43a2f3637b252d0967659b0 (diff) | |
| download | linux-2a383c63ff933a496f19d6559ab54ac14871b7f3.tar.xz | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] Quicklist support for IA64
[IA64] fix Kprobes reentrancy
[IA64] SN: validate smp_affinity mask on intr redirect
[IA64] drivers/char/snsc_event.c:206: warning: unused variable `p'
[IA64] mca.c:121: warning: 'cpe_poll_timer' defined but not used
[IA64] Fix - Section mismatch: reference to .init.data:mvec_name
[IA64] more warning cleanups
[IA64] Wire up epoll_pwait and utimensat
[IA64] Fix warnings resulting from type-checking in dev_dbg()
[IA64] typo s/kenrel/kernel/
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/irq/proc.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/kernel/irq/proc.c b/kernel/irq/proc.c index ddde0ef9ccdc..b4f1674fca79 100644 --- a/kernel/irq/proc.c +++ b/kernel/irq/proc.c @@ -27,6 +27,10 @@ static int irq_affinity_read_proc(char *page, char **start, off_t off, return len; } +#ifndef is_affinity_mask_valid +#define is_affinity_mask_valid(val) 1 +#endif + int no_irq_affinity; static int irq_affinity_write_proc(struct file *file, const char __user *buffer, unsigned long count, void *data) @@ -42,6 +46,9 @@ static int irq_affinity_write_proc(struct file *file, const char __user *buffer, if (err) return err; + if (!is_affinity_mask_valid(new_value)) + return -EINVAL; + /* * Do not allow disabling IRQs completely - it's a too easy * way to make the system unusable accidentally :-) At least |