diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /arch/microblaze/kernel/sys_microblaze.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'arch/microblaze/kernel/sys_microblaze.c')
| -rw-r--r-- | arch/microblaze/kernel/sys_microblaze.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/microblaze/kernel/sys_microblaze.c b/arch/microblaze/kernel/sys_microblaze.c index 2250fe9d269b..e5b154f24f85 100644 --- a/arch/microblaze/kernel/sys_microblaze.c +++ b/arch/microblaze/kernel/sys_microblaze.c | |||
| @@ -40,7 +40,8 @@ asmlinkage long microblaze_vfork(struct pt_regs *regs) | |||
| 40 | regs, 0, NULL, NULL); | 40 | regs, 0, NULL, NULL); |
| 41 | } | 41 | } |
| 42 | 42 | ||
| 43 | asmlinkage long microblaze_clone(int flags, unsigned long stack, struct pt_regs *regs) | 43 | asmlinkage long microblaze_clone(int flags, unsigned long stack, |
| 44 | struct pt_regs *regs) | ||
| 44 | { | 45 | { |
| 45 | if (!stack) | 46 | if (!stack) |
| 46 | stack = regs->r1; | 47 | stack = regs->r1; |