2016-10-23 13:56:55

by Alexander Kuleshov

[permalink] [raw]
Subject: [PATCH v3] x86/entry64: remove unused audit related macros

These macros were added in:

86a1c34 ("x86_64 syscall audit fast-path")

commit. They were used in two-phase sycalls entry tracing,
but this functionality was moved to the
arch/x86/entry/common.c:syscall_trace_enter() in:

1f484aa ("x86/entry: Move C entry and exit code to arch/x86/entry/common.c")

commit.

syscall_trace_enter() now uses same defines from <linux/audit.h>,
so these defines are no longer used anywhere in entry_64.S outside
of it and we may remove them.

Signed-off-by: Alexander Kuleshov <[email protected]>
Reviewed-by: Borislav Petkov <[email protected]>
---
ChangeLog:

v1 -> v2:

- Added more details in the commit message.

v2 -> v2:

- Make commit message more readable

arch/x86/entry/entry_64.S | 6 ------
1 file changed, 6 deletions(-)

diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S
index ef766a3..4362f1c 100644
--- a/arch/x86/entry/entry_64.S
+++ b/arch/x86/entry/entry_64.S
@@ -38,12 +38,6 @@
#include <asm/export.h>
#include <linux/err.h>

-/* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
-#include <linux/elf-em.h>
-#define AUDIT_ARCH_X86_64 (EM_X86_64|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE)
-#define __AUDIT_ARCH_64BIT 0x80000000
-#define __AUDIT_ARCH_LE 0x40000000
-
.code64
.section .entry.text, "ax"

--
2.8.0.rc3.1353.gea9bdc0


Subject: [tip:x86/asm] x86/entry64: Remove unused audit related macros

Commit-ID: 5e25d5bdf6d407224ad185a3fb8b870ad7d6c627
Gitweb: http://git.kernel.org/tip/5e25d5bdf6d407224ad185a3fb8b870ad7d6c627
Author: Alexander Kuleshov <[email protected]>
AuthorDate: Sun, 23 Oct 2016 19:56:46 +0600
Committer: Ingo Molnar <[email protected]>
CommitDate: Tue, 25 Oct 2016 11:43:31 +0200

x86/entry64: Remove unused audit related macros

These macros were added in the following commit:

86a1c34a929f ("x86_64 syscall audit fast-path")

They were used in two-phase sycalls entry tracing, but this functionality
was then moved to the arch/x86/entry/common.c:syscall_trace_enter() function,
in the following commit:

1f484aa69046 ("x86/entry: Move C entry and exit code to arch/x86/entry/common.c")

syscall_trace_enter() now uses the defines from <linux/audit.h>,
so these defines entry_64.S are no longer used anywhere.

Signed-off-by: Alexander Kuleshov <[email protected]>
Reviewed-by: Borislav Petkov <[email protected]>
Cc: Andy Lutomirski <[email protected]>
Cc: Borislav Petkov <[email protected]>
Cc: Brian Gerst <[email protected]>
Cc: Denys Vlasenko <[email protected]>
Cc: H. Peter Anvin <[email protected]>
Cc: Josh Poimboeuf <[email protected]>
Cc: Linus Torvalds <[email protected]>
Cc: Paolo Bonzini <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Ingo Molnar <[email protected]>
---
arch/x86/entry/entry_64.S | 6 ------
1 file changed, 6 deletions(-)

diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S
index 65fad8a..5b21970 100644
--- a/arch/x86/entry/entry_64.S
+++ b/arch/x86/entry/entry_64.S
@@ -38,12 +38,6 @@
#include <asm/export.h>
#include <linux/err.h>

-/* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
-#include <linux/elf-em.h>
-#define AUDIT_ARCH_X86_64 (EM_X86_64|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE)
-#define __AUDIT_ARCH_64BIT 0x80000000
-#define __AUDIT_ARCH_LE 0x40000000
-
.code64
.section .entry.text, "ax"