diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-03-01 17:19:05 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-03-01 17:19:05 -0500 |
| commit | d702d12167a2c05a346f49aac7a311d597762495 (patch) | |
| tree | baae42c299cce34d6df24b5d01f8b1d0b481bd9a /arch/m68k/kernel/entry.S | |
| parent | 9418c65f9bd861d0f7e39aab9cfb3aa6f2275d11 (diff) | |
| parent | ac0f6f927db539e03e1f3f61bcd4ed57d5cde7a9 (diff) | |
Merge with mainline to remove plat-omap/Kconfig conflict
Conflicts:
arch/arm/plat-omap/Kconfig
Diffstat (limited to 'arch/m68k/kernel/entry.S')
| -rw-r--r-- | arch/m68k/kernel/entry.S | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/m68k/kernel/entry.S b/arch/m68k/kernel/entry.S index 77fc7c16bf48..e136b8cbe9b9 100644 --- a/arch/m68k/kernel/entry.S +++ b/arch/m68k/kernel/entry.S | |||
| @@ -761,4 +761,8 @@ sys_call_table: | |||
| 761 | .long sys_pwritev /* 330 */ | 761 | .long sys_pwritev /* 330 */ |
| 762 | .long sys_rt_tgsigqueueinfo | 762 | .long sys_rt_tgsigqueueinfo |
| 763 | .long sys_perf_event_open | 763 | .long sys_perf_event_open |
| 764 | .long sys_get_thread_area | ||
| 765 | .long sys_set_thread_area | ||
| 766 | .long sys_atomic_cmpxchg_32 /* 335 */ | ||
| 767 | .long sys_atomic_barrier | ||
| 764 | 768 | ||