diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:16:47 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:16:47 -0400 |
| commit | 3b9f6cb8a1ec791be79c6c7595fea922f12d1e64 (patch) | |
| tree | 2393a448add846e6c2ed12f68106c3018b72c6a9 /kernel/signal.c | |
| parent | c38778c3a9aeadcd1ee319cfc8ea5a9cbf8cdafa (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into upstream
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 = |