diff --git a/[refs] b/[refs] index 54b309c39296..7a0c3b8eeda8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6ddf19584021f3c5774823278d42ee3f3124b650 +refs/heads/master: e012a7b6000a955f1d706cab288e938207c74ba7 diff --git a/trunk/arch/i386/kernel/vsyscall-int80_32.S b/trunk/arch/i386/kernel/vsyscall-int80_32.S index 530d0525e5e2..103cab6aa7c0 100644 --- a/trunk/arch/i386/kernel/vsyscall-int80_32.S +++ b/trunk/arch/i386/kernel/vsyscall-int80_32.S @@ -50,4 +50,4 @@ __kernel_vsyscall: /* * Get the common code for the sigreturn entry points. */ -#include "vsyscall-sigreturn.S" +#include "vsyscall-sigreturn_32.S" diff --git a/trunk/arch/i386/kernel/vsyscall-sigreturn.S b/trunk/arch/i386/kernel/vsyscall-sigreturn_32.S similarity index 100% rename from trunk/arch/i386/kernel/vsyscall-sigreturn.S rename to trunk/arch/i386/kernel/vsyscall-sigreturn_32.S diff --git a/trunk/arch/i386/kernel/vsyscall-sysenter_32.S b/trunk/arch/i386/kernel/vsyscall-sysenter_32.S index 1a36d26e15eb..ed879bf42995 100644 --- a/trunk/arch/i386/kernel/vsyscall-sysenter_32.S +++ b/trunk/arch/i386/kernel/vsyscall-sysenter_32.S @@ -119,4 +119,4 @@ SYSENTER_RETURN: /* * Get the common code for the sigreturn entry points. */ -#include "vsyscall-sigreturn.S" +#include "vsyscall-sigreturn_32.S"