diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-28 08:29:59 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-28 08:29:59 -0400 |
| commit | 185a257f2f73bcd89050ad02da5bedbc28fc43fa (patch) | |
| tree | 5e32586114534ed3f2165614cba3d578f5d87307 /kernel/signal.c | |
| parent | 3f1a9aaeffd8d1cbc5ab9776c45cbd66af1c9699 (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into gfs2
Diffstat (limited to 'kernel/signal.c')
| -rw-r--r-- | kernel/signal.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/kernel/signal.c b/kernel/signal.c index bfdb5686fa3e..05853a7337e3 100644 --- a/kernel/signal.c +++ b/kernel/signal.c | |||
| @@ -2577,6 +2577,11 @@ asmlinkage long sys_rt_sigsuspend(sigset_t __user *unewset, size_t sigsetsize) | |||
| 2577 | } | 2577 | } |
| 2578 | #endif /* __ARCH_WANT_SYS_RT_SIGSUSPEND */ | 2578 | #endif /* __ARCH_WANT_SYS_RT_SIGSUSPEND */ |
| 2579 | 2579 | ||
| 2580 | __attribute__((weak)) const char *arch_vma_name(struct vm_area_struct *vma) | ||
| 2581 | { | ||
| 2582 | return NULL; | ||
| 2583 | } | ||
| 2584 | |||
| 2580 | void __init signals_init(void) | 2585 | void __init signals_init(void) |
| 2581 | { | 2586 | { |
| 2582 | sigqueue_cachep = | 2587 | sigqueue_cachep = |