diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-02-27 16:26:37 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-02-27 16:26:37 +1100 |
| commit | 06a2b671d8472e2f9bb9575f9f707f628de8ce99 (patch) | |
| tree | de96857adeca102baef85040bb9f9654e38c36af /kernel/fork.c | |
| parent | c9dd07b813be8a5bf854672244493dc99c08c120 (diff) | |
| parent | 43b2b93fbb7b56b1bc9b45e8afa602eecca1ef90 (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'kernel/fork.c')
| -rw-r--r-- | kernel/fork.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index a17621c6cd42..ef29ed7765c0 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -71,6 +71,7 @@ #include <linux/signalfd.h> #include <linux/uprobes.h> #include <linux/aio.h> +#include <linux/compiler.h> #include <asm/pgtable.h> #include <asm/pgalloc.h> @@ -283,7 +284,7 @@ void __init fork_init(unsigned long mempages) init_task.signal->rlim[RLIMIT_NPROC]; } -int __attribute__((weak)) arch_dup_task_struct(struct task_struct *dst, +int __weak arch_dup_task_struct(struct task_struct *dst, struct task_struct *src) { *dst = *src; |