[tip:x86/asm] x86/asm/uaccess: Remove FIX_ALIGNMENT define from copy_user_nocache_64.S:

From: tip-bot for Borislav Petkov
Date: Thu May 14 2015 - 02:50:36 EST


Commit-ID: 26e7d9dee8a5b6c844178c8e2d91be540ce311c0
Gitweb: http://git.kernel.org/tip/26e7d9dee8a5b6c844178c8e2d91be540ce311c0
Author: Borislav Petkov <bp@xxxxxxx>
AuthorDate: Wed, 13 May 2015 19:42:22 +0200
Committer: Ingo Molnar <mingo@xxxxxxxxxx>
CommitDate: Thu, 14 May 2015 07:25:34 +0200

x86/asm/uaccess: Remove FIX_ALIGNMENT define from copy_user_nocache_64.S:

No code changed:

# arch/x86/lib/copy_user_nocache_64.o:

text data bss dec hex filename
390 0 0 390 186 copy_user_nocache_64.o.before
390 0 0 390 186 copy_user_nocache_64.o.after

md5:
7fa0577b28700af89d3a67a8b590426e copy_user_nocache_64.o.before.asm
7fa0577b28700af89d3a67a8b590426e copy_user_nocache_64.o.after.asm

Signed-off-by: Borislav Petkov <bp@xxxxxxx>
Cc: Andy Lutomirski <luto@xxxxxxxxxxxxxx>
Cc: Borislav Petkov <bp@xxxxxxxxx>
Cc: Brian Gerst <brgerst@xxxxxxxxx>
Cc: Denys Vlasenko <dvlasenk@xxxxxxxxxx>
Cc: H. Peter Anvin <hpa@xxxxxxxxx>
Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Link: http://lkml.kernel.org/r/1431538944-27724-2-git-send-email-bp@xxxxxxxxx
Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
---
arch/x86/lib/copy_user_nocache_64.S | 5 -----
1 file changed, 5 deletions(-)

diff --git a/arch/x86/lib/copy_user_nocache_64.S b/arch/x86/lib/copy_user_nocache_64.S
index 6a4f43c..42eeb12 100644
--- a/arch/x86/lib/copy_user_nocache_64.S
+++ b/arch/x86/lib/copy_user_nocache_64.S
@@ -8,9 +8,6 @@

#include <linux/linkage.h>
#include <asm/dwarf2.h>
-
-#define FIX_ALIGNMENT 1
-
#include <asm/current.h>
#include <asm/asm-offsets.h>
#include <asm/thread_info.h>
@@ -18,7 +15,6 @@
#include <asm/smap.h>

.macro ALIGN_DESTINATION
-#ifdef FIX_ALIGNMENT
/* check for bad alignment of destination */
movl %edi,%ecx
andl $7,%ecx
@@ -40,7 +36,6 @@

_ASM_EXTABLE(100b,103b)
_ASM_EXTABLE(101b,103b)
-#endif
.endm

/*
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/