Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753070AbbH2PUo (ORCPT ); Sat, 29 Aug 2015 11:20:44 -0400 Received: from mail-yk0-f180.google.com ([209.85.160.180]:33829 "EHLO mail-yk0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752632AbbH2PUj (ORCPT ); Sat, 29 Aug 2015 11:20:39 -0400 From: Brian Gerst To: x86@kernel.org, linux-kernel@vger.kernel.org Cc: Ingo Molnar , "H. Peter Anvin" , Denys Vlasenko , Andy Lutomirski , Linus Torvalds Subject: [PATCH 2/7] x86/vdso32: Remove VDSO32_vsyscall_eh_frame_size Date: Sat, 29 Aug 2015 11:20:21 -0400 Message-Id: <1440861626-27008-3-git-send-email-brgerst@gmail.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1440861626-27008-1-git-send-email-brgerst@gmail.com> References: <1440861626-27008-1-git-send-email-brgerst@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2179 Lines: 64 This symbol and the padding are unnecessary since we no longer rely on the symbols being exactly the same in each variant of the vdso32. Signed-off-by: Brian Gerst --- arch/x86/entry/vdso/vdso32/int80.S | 8 -------- arch/x86/entry/vdso/vdso32/syscall.S | 8 -------- arch/x86/entry/vdso/vdso32/sysenter.S | 6 ------ 3 files changed, 22 deletions(-) diff --git a/arch/x86/entry/vdso/vdso32/int80.S b/arch/x86/entry/vdso/vdso32/int80.S index e40af1c..667b25e 100644 --- a/arch/x86/entry/vdso/vdso32/int80.S +++ b/arch/x86/entry/vdso/vdso32/int80.S @@ -43,11 +43,3 @@ __kernel_vsyscall: .align 4 .LENDFDEDLSI: .previous - - /* - * Pad out the segment to match the size of the sysenter.S version. - */ -VDSO32_vsyscall_eh_frame_size = 0x40 - .section .data,"aw",@progbits - .space VDSO32_vsyscall_eh_frame_size-(.LENDFDEDLSI-.LSTARTFRAMEDLSI), 0 - .previous diff --git a/arch/x86/entry/vdso/vdso32/syscall.S b/arch/x86/entry/vdso/vdso32/syscall.S index 75545ec..73f1428 100644 --- a/arch/x86/entry/vdso/vdso32/syscall.S +++ b/arch/x86/entry/vdso/vdso32/syscall.S @@ -60,11 +60,3 @@ __kernel_vsyscall: .align 4 .LENDFDE1: .previous - - /* - * Pad out the segment to match the size of the sysenter.S version. - */ -VDSO32_vsyscall_eh_frame_size = 0x40 - .section .data,"aw",@progbits - .space VDSO32_vsyscall_eh_frame_size-(.LENDFDE1-.LSTARTFRAME), 0 - .previous diff --git a/arch/x86/entry/vdso/vdso32/sysenter.S b/arch/x86/entry/vdso/vdso32/sysenter.S index e99c7699..e8e3080 100644 --- a/arch/x86/entry/vdso/vdso32/sysenter.S +++ b/arch/x86/entry/vdso/vdso32/sysenter.S @@ -105,9 +105,3 @@ VDSO32_SYSENTER_RETURN: /* Symbol used by sysenter.c via vdso32-syms.h */ .align 4 .LENDFDEDLSI: .previous - - /* - * Emit a symbol with the size of this .eh_frame data, - * to verify it matches the other versions. - */ -VDSO32_vsyscall_eh_frame_size = (.LENDFDEDLSI-.LSTARTFRAMEDLSI) -- 2.4.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/