From ade709385c3e2409265222d3ee950cc849bab79c Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Tue, 10 Aug 2010 15:35:10 -0700 Subject: [PATCH] --- yaml --- r: 208363 b: refs/heads/master c: 8cbd84f2dd4e52a8771b191030c374ba3e56d291 h: refs/heads/master i: 208361: 925a4123fd3acb442a88fa6ffb77c0c8a31d392e 208359: b4e7bf557f889c0751bdaf6eb9fa3a5b8923d094 v: v3 --- [refs] | 2 +- trunk/arch/x86/ia32/ia32entry.S | 2 +- trunk/arch/x86/kernel/syscall_table_32.S | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 67783b9b0da4..ec1174dc4ac7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 20d7b2415c55aece840048e1e01348daa8f646b0 +refs/heads/master: 8cbd84f2dd4e52a8771b191030c374ba3e56d291 diff --git a/trunk/arch/x86/ia32/ia32entry.S b/trunk/arch/x86/ia32/ia32entry.S index 91dc4bb13032..b86feabed69b 100644 --- a/trunk/arch/x86/ia32/ia32entry.S +++ b/trunk/arch/x86/ia32/ia32entry.S @@ -844,5 +844,5 @@ ia32_sys_call_table: .quad compat_sys_recvmmsg .quad sys_fanotify_init .quad sys32_fanotify_mark - .quad sys_prlimit64 + .quad sys_prlimit64 /* 340 */ ia32_syscall_end: diff --git a/trunk/arch/x86/kernel/syscall_table_32.S b/trunk/arch/x86/kernel/syscall_table_32.S index 4802accb9d8d..b35786dc9b8f 100644 --- a/trunk/arch/x86/kernel/syscall_table_32.S +++ b/trunk/arch/x86/kernel/syscall_table_32.S @@ -339,4 +339,4 @@ ENTRY(sys_call_table) .long sys_recvmmsg .long sys_fanotify_init .long sys_fanotify_mark - .long sys_prlimit64 + .long sys_prlimit64 /* 340 */