diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-27 23:21:18 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-27 23:26:01 -0400 |
| commit | 82268da1b130f763d22d04f7d016bbf6fc8815c2 (patch) | |
| tree | 9803f361556d10708313e980428e63a18162e667 /arch/parisc | |
| parent | 6e15cf04860074ad032e88c306bea656bbdd0f22 (diff) | |
| parent | 5d80f8e5a9dc9c9a94d4aeaa567e219a808b8a4a (diff) | |
Merge branch 'linus' into percpu-cpumask-x86-for-linus-2
Conflicts:
arch/sparc/kernel/time_64.c
drivers/gpu/drm/drm_proc.c
Manual merge to resolve build warning due to phys_addr_t type change
on x86:
drivers/gpu/drm/drm_info.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/parisc')
| -rw-r--r-- | arch/parisc/kernel/syscall_table.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/parisc/kernel/syscall_table.S b/arch/parisc/kernel/syscall_table.S index 303d2b647e41..03b9a01bc16c 100644 --- a/arch/parisc/kernel/syscall_table.S +++ b/arch/parisc/kernel/syscall_table.S | |||
| @@ -130,7 +130,7 @@ | |||
| 130 | ENTRY_OURS(newuname) | 130 | ENTRY_OURS(newuname) |
| 131 | ENTRY_SAME(umask) /* 60 */ | 131 | ENTRY_SAME(umask) /* 60 */ |
| 132 | ENTRY_SAME(chroot) | 132 | ENTRY_SAME(chroot) |
| 133 | ENTRY_SAME(ustat) | 133 | ENTRY_COMP(ustat) |
| 134 | ENTRY_SAME(dup2) | 134 | ENTRY_SAME(dup2) |
| 135 | ENTRY_SAME(getppid) | 135 | ENTRY_SAME(getppid) |
| 136 | ENTRY_SAME(getpgrp) /* 65 */ | 136 | ENTRY_SAME(getpgrp) /* 65 */ |