[tip:x86/cleanups] x86/bitops: Use __builtin_constant_p() directly instead of IS_IMMEDIATE()

2019-07-23 Thread tip-bot for Masahiro Yamada 
Commit-ID:  bdd50d7421b2f8fd99f953e1f747e0cb3f3bed64
Gitweb: https://git.kernel.org/tip/bdd50d7421b2f8fd99f953e1f747e0cb3f3bed64
Author: Masahiro Yamada 
AuthorDate: Tue, 23 Jul 2019 16:44:15 +0900
Committer:  Thomas Gleixner 
CommitDate: Tue, 23 Jul 2019 13:44:18 +0200

x86/bitops: Use __builtin_constant_p() directly instead of IS_IMMEDIATE()

__builtin_constant_p(nr) is used everywhere now. It does not make much
sense to define IS_IMMEDIATE() as its alias.

Signed-off-by: Masahiro Yamada 
Signed-off-by: Thomas Gleixner 
Link: 
https://lkml.kernel.org/r/20190723074415.26811-1-yamada.masah...@socionext.com

---
 arch/x86/include/asm/bitops.h | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/arch/x86/include/asm/bitops.h b/arch/x86/include/asm/bitops.h
index ba15d53c1ca7..7d1f6a49bfae 100644
--- a/arch/x86/include/asm/bitops.h
+++ b/arch/x86/include/asm/bitops.h
@@ -45,14 +45,13 @@
  * We do the locked ops that don't return the old value as
  * a mask operation on a byte.
  */
-#define IS_IMMEDIATE(nr)   (__builtin_constant_p(nr))
 #define CONST_MASK_ADDR(nr, addr)  WBYTE_ADDR((void *)(addr) + ((nr)>>3))
 #define CONST_MASK(nr) (1 << ((nr) & 7))
 
 static __always_inline void
 arch_set_bit(long nr, volatile unsigned long *addr)
 {
-   if (IS_IMMEDIATE(nr)) {
+   if (__builtin_constant_p(nr)) {
asm volatile(LOCK_PREFIX "orb %1,%0"
: CONST_MASK_ADDR(nr, addr)
: "iq" ((u8)CONST_MASK(nr))
@@ -72,7 +71,7 @@ arch___set_bit(long nr, volatile unsigned long *addr)
 static __always_inline void
 arch_clear_bit(long nr, volatile unsigned long *addr)
 {
-   if (IS_IMMEDIATE(nr)) {
+   if (__builtin_constant_p(nr)) {
asm volatile(LOCK_PREFIX "andb %1,%0"
: CONST_MASK_ADDR(nr, addr)
: "iq" ((u8)~CONST_MASK(nr)));
@@ -123,7 +122,7 @@ arch___change_bit(long nr, volatile unsigned long *addr)
 static __always_inline void
 arch_change_bit(long nr, volatile unsigned long *addr)
 {
-   if (IS_IMMEDIATE(nr)) {
+   if (__builtin_constant_p(nr)) {
asm volatile(LOCK_PREFIX "xorb %1,%0"
: CONST_MASK_ADDR(nr, addr)
: "iq" ((u8)CONST_MASK(nr)));

[tip:x86/build] x86/build: Remove unneeded uapi asm-generic wrappers

2019-07-23 Thread tip-bot for Masahiro Yamada 
Commit-ID:  701010532164eaacd415ec5683717da03f4b822d
Gitweb: https://git.kernel.org/tip/701010532164eaacd415ec5683717da03f4b822d
Author: Masahiro Yamada 
AuthorDate: Tue, 23 Jul 2019 20:26:45 +0900
Committer:  Thomas Gleixner 
CommitDate: Tue, 23 Jul 2019 13:42:14 +0200

x86/build: Remove unneeded uapi asm-generic wrappers

These are listed in include/uapi/asm-generic/Kbuild, so Kbuild will
automatically generate them.

Signed-off-by: Masahiro Yamada 
Signed-off-by: Thomas Gleixner 
Link: 
https://lkml.kernel.org/r/20190723112646.14046-1-yamada.masah...@socionext.com

---
 arch/x86/include/uapi/asm/errno.h| 1 -
 arch/x86/include/uapi/asm/fcntl.h| 1 -
 arch/x86/include/uapi/asm/ioctl.h| 1 -
 arch/x86/include/uapi/asm/ioctls.h   | 1 -
 arch/x86/include/uapi/asm/ipcbuf.h   | 1 -
 arch/x86/include/uapi/asm/param.h| 1 -
 arch/x86/include/uapi/asm/resource.h | 1 -
 arch/x86/include/uapi/asm/termbits.h | 1 -
 arch/x86/include/uapi/asm/termios.h  | 1 -
 arch/x86/include/uapi/asm/types.h| 7 ---
 10 files changed, 16 deletions(-)

diff --git a/arch/x86/include/uapi/asm/errno.h 
b/arch/x86/include/uapi/asm/errno.h
deleted file mode 100644
index 4c82b503d92f..
--- a/arch/x86/include/uapi/asm/errno.h
+++ /dev/null
@@ -1 +0,0 @@
-#include 
diff --git a/arch/x86/include/uapi/asm/fcntl.h 
b/arch/x86/include/uapi/asm/fcntl.h
deleted file mode 100644
index 46ab12db5739..
--- a/arch/x86/include/uapi/asm/fcntl.h
+++ /dev/null
@@ -1 +0,0 @@
-#include 
diff --git a/arch/x86/include/uapi/asm/ioctl.h 
b/arch/x86/include/uapi/asm/ioctl.h
deleted file mode 100644
index b279fe06dfe5..
--- a/arch/x86/include/uapi/asm/ioctl.h
+++ /dev/null
@@ -1 +0,0 @@
-#include 
diff --git a/arch/x86/include/uapi/asm/ioctls.h 
b/arch/x86/include/uapi/asm/ioctls.h
deleted file mode 100644
index ec34c760665e..
--- a/arch/x86/include/uapi/asm/ioctls.h
+++ /dev/null
@@ -1 +0,0 @@
-#include 
diff --git a/arch/x86/include/uapi/asm/ipcbuf.h 
b/arch/x86/include/uapi/asm/ipcbuf.h
deleted file mode 100644
index 84c7e51cb6d0..
--- a/arch/x86/include/uapi/asm/ipcbuf.h
+++ /dev/null
@@ -1 +0,0 @@
-#include 
diff --git a/arch/x86/include/uapi/asm/param.h 
b/arch/x86/include/uapi/asm/param.h
deleted file mode 100644
index 965d45427975..
--- a/arch/x86/include/uapi/asm/param.h
+++ /dev/null
@@ -1 +0,0 @@
-#include 
diff --git a/arch/x86/include/uapi/asm/resource.h 
b/arch/x86/include/uapi/asm/resource.h
deleted file mode 100644
index 04bc4db8921b..
--- a/arch/x86/include/uapi/asm/resource.h
+++ /dev/null
@@ -1 +0,0 @@
-#include 
diff --git a/arch/x86/include/uapi/asm/termbits.h 
b/arch/x86/include/uapi/asm/termbits.h
deleted file mode 100644
index 3935b106de79..
--- a/arch/x86/include/uapi/asm/termbits.h
+++ /dev/null
@@ -1 +0,0 @@
-#include 
diff --git a/arch/x86/include/uapi/asm/termios.h 
b/arch/x86/include/uapi/asm/termios.h
deleted file mode 100644
index 280d78a9d966..
--- a/arch/x86/include/uapi/asm/termios.h
+++ /dev/null
@@ -1 +0,0 @@
-#include 
diff --git a/arch/x86/include/uapi/asm/types.h 
b/arch/x86/include/uapi/asm/types.h
deleted file mode 100644
index df55e1ddb0c9..
--- a/arch/x86/include/uapi/asm/types.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef _ASM_X86_TYPES_H
-#define _ASM_X86_TYPES_H
-
-#include 
-
-#endif /* _ASM_X86_TYPES_H */

[tip:x86/build] x86/build: Remove redundant 'clean-files += capflags.c'

2019-06-25 Thread tip-bot for Masahiro Yamada 
Commit-ID:  87b61864d7ab2aec5c212ff18950d4972f0dfb4e
Gitweb: https://git.kernel.org/tip/87b61864d7ab2aec5c212ff18950d4972f0dfb4e
Author: Masahiro Yamada 
AuthorDate: Tue, 25 Jun 2019 16:33:11 +0900
Committer:  Thomas Gleixner 
CommitDate: Tue, 25 Jun 2019 09:52:06 +0200

x86/build: Remove redundant 'clean-files += capflags.c'

All the files added to 'targets' are cleaned. Adding the same file to both
'targets' and 'clean-files' is redundant.

Signed-off-by: Masahiro Yamada 
Signed-off-by: Thomas Gleixner 
Cc: "H. Peter Anvin" 
Cc: Borislav Petkov 
Link: 
https://lkml.kernel.org/r/20190625073311.18303-1-yamada.masah...@socionext.com

---
 arch/x86/kernel/cpu/Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
index 5102bf7c8192..50abae9a72e5 100644
--- a/arch/x86/kernel/cpu/Makefile
+++ b/arch/x86/kernel/cpu/Makefile
@@ -54,8 +54,7 @@ quiet_cmd_mkcapflags = MKCAP   $@
 
 cpufeature = $(src)/../../include/asm/cpufeatures.h
 
-targets += capflags.c
 $(obj)/capflags.c: $(cpufeature) $(src)/mkcapflags.sh FORCE
$(call if_changed,mkcapflags)
 endif
-clean-files += capflags.c
+targets += capflags.c

[tip:x86/build] x86/build: Add 'set -e' to mkcapflags.sh to delete broken capflags.c

2019-06-25 Thread tip-bot for Masahiro Yamada 
Commit-ID:  bc53d3d777f81385c1bb08b07bd1c06450ecc2c1
Gitweb: https://git.kernel.org/tip/bc53d3d777f81385c1bb08b07bd1c06450ecc2c1
Author: Masahiro Yamada 
AuthorDate: Tue, 25 Jun 2019 16:26:22 +0900
Committer:  Thomas Gleixner 
CommitDate: Tue, 25 Jun 2019 09:52:05 +0200

x86/build: Add 'set -e' to mkcapflags.sh to delete broken capflags.c

Without 'set -e', shell scripts continue running even after any
error occurs. The missed 'set -e' is a typical bug in shell scripting.

For example, when a disk space shortage occurs while this script is
running, it actually ends up with generating a truncated capflags.c.

Yet, mkcapflags.sh continues running and exits with 0. So, the build
system assumes it has succeeded.

It will not be re-generated in the next invocation of Make since its
timestamp is newer than that of any of the source files.

Add 'set -e' so that any error in this script is caught and propagated
to the build system.

Since 9c2af1c7377a ("kbuild: add .DELETE_ON_ERROR special target"),
make automatically deletes the target on any failure. So, the broken
capflags.c will be deleted automatically.

Signed-off-by: Masahiro Yamada 
Signed-off-by: Thomas Gleixner 
Cc: "H. Peter Anvin" 
Cc: Borislav Petkov 
Link: 
https://lkml.kernel.org/r/20190625072622.17679-1-yamada.masah...@socionext.com

---
 arch/x86/kernel/cpu/mkcapflags.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/x86/kernel/cpu/mkcapflags.sh 
b/arch/x86/kernel/cpu/mkcapflags.sh
index d0dfb892c72f..aed45b8895d5 100644
--- a/arch/x86/kernel/cpu/mkcapflags.sh
+++ b/arch/x86/kernel/cpu/mkcapflags.sh
@@ -4,6 +4,8 @@
 # Generate the x86_cap/bug_flags[] arrays from include/asm/cpufeatures.h
 #
 
+set -e
+
 IN=$1
 OUT=$2

[tip:x86/cleanups] x86/io_delay: Define IO_DELAY macros in C instead of Kconfig

2019-05-24 Thread tip-bot for Masahiro Yamada 
Commit-ID:  c2d64c7ec4de6385150aa79570c438b4ba49c243
Gitweb: https://git.kernel.org/tip/c2d64c7ec4de6385150aa79570c438b4ba49c243
Author: Masahiro Yamada 
AuthorDate: Tue, 21 May 2019 16:22:11 +0900
Committer:  Ingo Molnar 
CommitDate: Fri, 24 May 2019 08:46:06 +0200

x86/io_delay: Define IO_DELAY macros in C instead of Kconfig

CONFIG_IO_DELAY_TYPE_* are not kernel configuration at all. They just
define constant values, 0, 1, 2, and 3. Define them by #define in C.

CONFIG_DEFAULT_IO_DELAY_TYPE can also be defined in C by using #ifdef
and #define directives.

Signed-off-by: Masahiro Yamada 
Cc: Borislav Petkov 
Cc: Linus Torvalds 
Cc: Peter Zijlstra 
Cc: Thomas Gleixner 
Link: 
http://lkml.kernel.org/r/20190521072211.21014-2-yamada.masah...@socionext.com
Signed-off-by: Ingo Molnar 
---
 arch/x86/Kconfig.debug | 44 
 arch/x86/kernel/io_delay.c | 37 ++---
 2 files changed, 26 insertions(+), 55 deletions(-)

diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
index f730680dc818..6791a3c97589 100644
--- a/arch/x86/Kconfig.debug
+++ b/arch/x86/Kconfig.debug
@@ -179,26 +179,6 @@ config X86_DECODER_SELFTEST
 decoder code.
 If unsure, say "N".
 
-#
-# IO delay types:
-#
-
-config IO_DELAY_TYPE_0X80
-   int
-   default "0"
-
-config IO_DELAY_TYPE_0XED
-   int
-   default "1"
-
-config IO_DELAY_TYPE_UDELAY
-   int
-   default "2"
-
-config IO_DELAY_TYPE_NONE
-   int
-   default "3"
-
 choice
prompt "IO delay type"
default IO_DELAY_0X80
@@ -229,30 +209,6 @@ config IO_DELAY_NONE
 
 endchoice
 
-if IO_DELAY_0X80
-config DEFAULT_IO_DELAY_TYPE
-   int
-   default IO_DELAY_TYPE_0X80
-endif
-
-if IO_DELAY_0XED
-config DEFAULT_IO_DELAY_TYPE
-   int
-   default IO_DELAY_TYPE_0XED
-endif
-
-if IO_DELAY_UDELAY
-config DEFAULT_IO_DELAY_TYPE
-   int
-   default IO_DELAY_TYPE_UDELAY
-endif
-
-if IO_DELAY_NONE
-config DEFAULT_IO_DELAY_TYPE
-   int
-   default IO_DELAY_TYPE_NONE
-endif
-
 config DEBUG_BOOT_PARAMS
bool "Debug boot parameters"
depends on DEBUG_KERNEL
diff --git a/arch/x86/kernel/io_delay.c b/arch/x86/kernel/io_delay.c
index 3dc874d5d43b..fdb6506ceaaa 100644
--- a/arch/x86/kernel/io_delay.c
+++ b/arch/x86/kernel/io_delay.c
@@ -13,7 +13,22 @@
 #include 
 #include 
 
-int io_delay_type __read_mostly = CONFIG_DEFAULT_IO_DELAY_TYPE;
+#define IO_DELAY_TYPE_0X80 0
+#define IO_DELAY_TYPE_0XED 1
+#define IO_DELAY_TYPE_UDELAY   2
+#define IO_DELAY_TYPE_NONE 3
+
+#if defined(CONFIG_IO_DELAY_0X80)
+#define DEFAULT_IO_DELAY_TYPE  IO_DELAY_TYPE_0X80
+#elif defined(CONFIG_IO_DELAY_0XED)
+#define DEFAULT_IO_DELAY_TYPE  IO_DELAY_TYPE_0XED
+#elif defined(CONFIG_IO_DELAY_UDELAY)
+#define DEFAULT_IO_DELAY_TYPE  IO_DELAY_TYPE_UDELAY
+#elif defined(CONFIG_IO_DELAY_NONE)
+#define DEFAULT_IO_DELAY_TYPE  IO_DELAY_TYPE_NONE
+#endif
+
+int io_delay_type __read_mostly = DEFAULT_IO_DELAY_TYPE;
 
 static int __initdata io_delay_override;
 
@@ -24,13 +39,13 @@ void native_io_delay(void)
 {
switch (io_delay_type) {
default:
-   case CONFIG_IO_DELAY_TYPE_0X80:
+   case IO_DELAY_TYPE_0X80:
asm volatile ("outb %al, $0x80");
break;
-   case CONFIG_IO_DELAY_TYPE_0XED:
+   case IO_DELAY_TYPE_0XED:
asm volatile ("outb %al, $0xed");
break;
-   case CONFIG_IO_DELAY_TYPE_UDELAY:
+   case IO_DELAY_TYPE_UDELAY:
/*
 * 2 usecs is an upper-bound for the outb delay but
 * note that udelay doesn't have the bus-level
@@ -40,7 +55,7 @@ void native_io_delay(void)
 */
udelay(2);
break;
-   case CONFIG_IO_DELAY_TYPE_NONE:
+   case IO_DELAY_TYPE_NONE:
break;
}
 }
@@ -48,9 +63,9 @@ EXPORT_SYMBOL(native_io_delay);
 
 static int __init dmi_io_delay_0xed_port(const struct dmi_system_id *id)
 {
-   if (io_delay_type == CONFIG_IO_DELAY_TYPE_0X80) {
+   if (io_delay_type == IO_DELAY_TYPE_0X80) {
pr_notice("%s: using 0xed I/O delay port\n", id->ident);
-   io_delay_type = CONFIG_IO_DELAY_TYPE_0XED;
+   io_delay_type = IO_DELAY_TYPE_0XED;
}
 
return 0;
@@ -116,13 +131,13 @@ static int __init io_delay_param(char *s)
return -EINVAL;
 
if (!strcmp(s, "0x80"))
-   io_delay_type = CONFIG_IO_DELAY_TYPE_0X80;
+   io_delay_type = IO_DELAY_TYPE_0X80;
else if (!strcmp(s, "0xed"))
-   io_delay_type = CONFIG_IO_DELAY_TYPE_0XED;
+   io_delay_type = IO_DELAY_TYPE_0XED;
else if (!strcmp(s, "udelay"))
-   io_delay_type = CONFIG_IO_DELAY_TYPE_UDELAY;
+   io_delay_type = IO_DELAY_TYPE_UDELAY;
else if (!strcmp(s, "none"))
-   io_delay_type =

[tip:x86/cleanups] x86/io_delay: Break instead of fallthrough in switch statement

2019-05-24 Thread tip-bot for Masahiro Yamada 
Commit-ID:  e62a4239c3dfd182a7e676cfe9efb1f4cec5ca25
Gitweb: https://git.kernel.org/tip/e62a4239c3dfd182a7e676cfe9efb1f4cec5ca25
Author: Masahiro Yamada 
AuthorDate: Tue, 21 May 2019 16:22:10 +0900
Committer:  Ingo Molnar 
CommitDate: Fri, 24 May 2019 08:46:06 +0200

x86/io_delay: Break instead of fallthrough in switch statement

The current code is fine since 'case CONFIG_IO_DELAY_TYPE_NONE'
does nothing, but scripts/checkpatch.pl complains about this:

  warning: Possible switch case/default not preceded by break or fallthrough 
comment

I like break statement better than a fallthrough comment here.
It avoids the warning and clarify the code.

No behavior change is intended.

Signed-off-by: Masahiro Yamada 
Cc: Borislav Petkov 
Cc: Linus Torvalds 
Cc: Peter Zijlstra 
Cc: Thomas Gleixner 
Link: 
http://lkml.kernel.org/r/20190521072211.21014-1-yamada.masah...@socionext.com
Signed-off-by: Ingo Molnar 
---
 arch/x86/kernel/io_delay.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/x86/kernel/io_delay.c b/arch/x86/kernel/io_delay.c
index 805b7a341aca..3dc874d5d43b 100644
--- a/arch/x86/kernel/io_delay.c
+++ b/arch/x86/kernel/io_delay.c
@@ -39,6 +39,7 @@ void native_io_delay(void)
 * are shorter until calibrated):
 */
udelay(2);
+   break;
case CONFIG_IO_DELAY_TYPE_NONE:
break;
}

[tip:x86/urgent] x86/kconfig: Disable CONFIG_GENERIC_HWEIGHT and remove __HAVE_ARCH_SW_HWEIGHT

2019-05-13 Thread tip-bot for Masahiro Yamada 
Commit-ID:  409ca45526a428620d8efb362ccfd4b1e6b80642
Gitweb: https://git.kernel.org/tip/409ca45526a428620d8efb362ccfd4b1e6b80642
Author: Masahiro Yamada 
AuthorDate: Sun, 12 May 2019 21:52:01 +0900
Committer:  Ingo Molnar 
CommitDate: Mon, 13 May 2019 11:07:33 +0200

x86/kconfig: Disable CONFIG_GENERIC_HWEIGHT and remove __HAVE_ARCH_SW_HWEIGHT

Remove an unnecessary arch complication:

arch/x86/include/asm/arch_hweight.h uses __sw_hweight{32,64} as
alternatives, and they are implemented in arch/x86/lib/hweight.S

x86 does not rely on the generic C implementation lib/hweight.c
at all, so CONFIG_GENERIC_HWEIGHT should be disabled.

__HAVE_ARCH_SW_HWEIGHT is not necessary either.

No change in functionality intended.

Signed-off-by: Masahiro Yamada 
Cc: Borislav Petkov 
Cc: Linus Torvalds 
Cc: Peter Zijlstra 
Cc: Thomas Gleixner 
Cc: Uros Bizjak 
Link: 
http://lkml.kernel.org/r/1557665521-17570-1-git-send-email-yamada.masah...@socionext.com
Signed-off-by: Ingo Molnar 
---
 arch/x86/Kconfig| 3 ---
 arch/x86/include/asm/arch_hweight.h | 2 --
 lib/hweight.c   | 4 
 3 files changed, 9 deletions(-)

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 0a3cc347143f..de071d7e67b6 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -261,9 +261,6 @@ config GENERIC_BUG
 config GENERIC_BUG_RELATIVE_POINTERS
bool
 
-config GENERIC_HWEIGHT
-   def_bool y
-
 config ARCH_MAY_HAVE_PC_FDC
def_bool y
depends on ISA_DMA_API
diff --git a/arch/x86/include/asm/arch_hweight.h 
b/arch/x86/include/asm/arch_hweight.h
index fc0693569f7a..ba88edd0d58b 100644
--- a/arch/x86/include/asm/arch_hweight.h
+++ b/arch/x86/include/asm/arch_hweight.h
@@ -12,8 +12,6 @@
 #define REG_OUT "a"
 #endif
 
-#define __HAVE_ARCH_SW_HWEIGHT
-
 static __always_inline unsigned int __arch_hweight32(unsigned int w)
 {
unsigned int res;
diff --git a/lib/hweight.c b/lib/hweight.c
index 7660d88fd496..c94586b62551 100644
--- a/lib/hweight.c
+++ b/lib/hweight.c
@@ -10,7 +10,6 @@
  * The Hamming Weight of a number is the total number of bits set in it.
  */
 
-#ifndef __HAVE_ARCH_SW_HWEIGHT
 unsigned int __sw_hweight32(unsigned int w)
 {
 #ifdef CONFIG_ARCH_HAS_FAST_MULTIPLIER
@@ -27,7 +26,6 @@ unsigned int __sw_hweight32(unsigned int w)
 #endif
 }
 EXPORT_SYMBOL(__sw_hweight32);
-#endif
 
 unsigned int __sw_hweight16(unsigned int w)
 {
@@ -46,7 +44,6 @@ unsigned int __sw_hweight8(unsigned int w)
 }
 EXPORT_SYMBOL(__sw_hweight8);
 
-#ifndef __HAVE_ARCH_SW_HWEIGHT
 unsigned long __sw_hweight64(__u64 w)
 {
 #if BITS_PER_LONG == 32
@@ -69,4 +66,3 @@ unsigned long __sw_hweight64(__u64 w)
 #endif
 }
 EXPORT_SYMBOL(__sw_hweight64);
-#endif

[tip:x86/asm] x86/build/vdso: Add FORCE to the build rule of %.so

2019-04-18 Thread tip-bot for Masahiro Yamada 
Commit-ID:  3c454f47e67bf5a65dc892cd50221a7de695870f
Gitweb: https://git.kernel.org/tip/3c454f47e67bf5a65dc892cd50221a7de695870f
Author: Masahiro Yamada 
AuthorDate: Wed, 3 Apr 2019 17:30:12 +0900
Committer:  Ingo Molnar 
CommitDate: Thu, 18 Apr 2019 10:05:34 +0200

x86/build/vdso: Add FORCE to the build rule of %.so

$(call if_changed,...) must have FORCE as a prerequisite.

Signed-off-by: Masahiro Yamada 
Cc: Andy Lutomirski 
Cc: Borislav Petkov 
Cc: Linus Torvalds 
Cc: Peter Zijlstra 
Cc: Thomas Gleixner 
Link: 
http://lkml.kernel.org/r/1554280212-10578-1-git-send-email-yamada.masah...@socionext.com
Signed-off-by: Ingo Molnar 
---
 arch/x86/entry/vdso/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile
index 5bfe2243a08f..42fe42e82baf 100644
--- a/arch/x86/entry/vdso/Makefile
+++ b/arch/x86/entry/vdso/Makefile
@@ -116,7 +116,7 @@ $(obj)/%-x32.o: $(obj)/%.o FORCE
 targets += vdsox32.lds $(vobjx32s-y)
 
 $(obj)/%.so: OBJCOPYFLAGS := -S
-$(obj)/%.so: $(obj)/%.so.dbg
+$(obj)/%.so: $(obj)/%.so.dbg FORCE
$(call if_changed,objcopy)
 
 $(obj)/vdsox32.so.dbg: $(obj)/vdsox32.lds $(vobjx32s) FORCE

[tip:efi/core] efi/libstub: Refactor the cmd_stubcopy Makefile command

2019-03-29 Thread tip-bot for Masahiro Yamada 
Commit-ID:  e8d368ad20f514dce86a64931fe4a6f06a0a6703
Gitweb: https://git.kernel.org/tip/e8d368ad20f514dce86a64931fe4a6f06a0a6703
Author: Masahiro Yamada 
AuthorDate: Thu, 28 Mar 2019 20:34:25 +0100
Committer:  Ingo Molnar 
CommitDate: Fri, 29 Mar 2019 07:34:59 +0100

efi/libstub: Refactor the cmd_stubcopy Makefile command

It took me a while to understand what is going on in the nested
if-blocks.

Simplify it by removing unneeded code.

  - if_changed automatically adds 'set -e', so any failure in the
series of commands makes it immediately fail as a whole.
So, the outer if block is entirely redundant.

  - Since commit 9c2af1c7377a ("kbuild: add .DELETE_ON_ERROR special target"),
GNU Make automatically deletes the target on any failure
in its recipe. The explicit 'rm -f $@' is redundant.

  - Surrounding commands with ( ) will spawn a subshell to execute them
in it, but it is rarely useful to do so.

Signed-off-by: Masahiro Yamada 
Signed-off-by: Ard Biesheuvel 
Cc: Linus Torvalds 
Cc: Matt Fleming 
Cc: Peter Zijlstra 
Cc: Thomas Gleixner 
Cc: linux-...@vger.kernel.org
Link: http://lkml.kernel.org/r/20190328193429.21373-2-ard.biesheu...@linaro.org
Signed-off-by: Ingo Molnar 
---
 drivers/firmware/efi/libstub/Makefile | 13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/drivers/firmware/efi/libstub/Makefile 
b/drivers/firmware/efi/libstub/Makefile
index b0103e16fc1b..ae9081988c88 100644
--- a/drivers/firmware/efi/libstub/Makefile
+++ b/drivers/firmware/efi/libstub/Makefile
@@ -86,12 +86,13 @@ $(obj)/%.stub.o: $(obj)/%.o FORCE
 # this time, use objcopy and leave all sections in place.
 #
 quiet_cmd_stubcopy = STUBCPY $@
-  cmd_stubcopy = if $(STRIP) --strip-debug $(STUBCOPY_RM-y) -o $@ $<; \
-then if $(OBJDUMP) -r $@ | grep $(STUBCOPY_RELOC-y); \
-then (echo >&2 "$@: absolute symbol references not allowed 
in the EFI stub"; \
-  rm -f $@; /bin/false); \
-else $(OBJCOPY) $(STUBCOPY_FLAGS-y) $< $@; fi\
-else /bin/false; fi
+  cmd_stubcopy =   \
+   $(STRIP) --strip-debug $(STUBCOPY_RM-y) -o $@ $<;   \
+   if $(OBJDUMP) -r $@ | grep $(STUBCOPY_RELOC-y); then\
+   echo "$@: absolute symbol references not allowed in the EFI 
stub" >&2; \
+   /bin/false; \
+   fi; \
+   $(OBJCOPY) $(STUBCOPY_FLAGS-y) $< $@
 
 #
 # ARM discards the .data section because it disallows r/w data in the

[tip:x86/build] x86, powerpc: Remove -funit-at-a-time compiler option entirely

2018-12-09 Thread tip-bot for Masahiro Yamada 
Commit-ID:  63fea0af43af5beb3779fd2cae078d5d77b4bb11
Gitweb: https://git.kernel.org/tip/63fea0af43af5beb3779fd2cae078d5d77b4bb11
Author: Masahiro Yamada 
AuthorDate: Mon, 12 Nov 2018 11:35:20 +0900
Committer:  Borislav Petkov 
CommitDate: Sun, 9 Dec 2018 11:55:32 +0100

x86, powerpc: Remove -funit-at-a-time compiler option entirely

GCC 4.6 manual says:

  -funit-at-a-time
This option is left for compatibility reasons. -funit-at-a-time has
no effect, while -fno-unit-at-a-time implies -fno-toplevel-reorder
and -fno-section-anchors. Enabled by default.

Remove it.

Signed-off-by: Masahiro Yamada 
Signed-off-by: Borislav Petkov 
Acked-by: Ingo Molnar 
Acked-by: Michael Ellerman 
Cc: "H. Peter Anvin" 
Cc: Benjamin Herrenschmidt 
Cc: Paul Mackerras 
Cc: Richard Weinberger 
Cc: Thomas Gleixner 
Cc: linuxppc-...@lists.ozlabs.org
Cc: x86-ml 
Link: 
https://lkml.kernel.org/r/1541990120-9643-3-git-send-email-yamada.masah...@socionext.com
---
 arch/powerpc/Makefile | 4 
 arch/x86/Makefile | 4 
 arch/x86/Makefile.um  | 5 -
 3 files changed, 13 deletions(-)

diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
index 8a2ce14d68d0..854199c9ab7e 100644
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
@@ -228,10 +228,6 @@ KBUILD_CFLAGS += $(call cc-option,-mno-vsx)
 KBUILD_CFLAGS += $(call cc-option,-mno-spe)
 KBUILD_CFLAGS += $(call cc-option,-mspe=no)
 
-# Enable unit-at-a-time mode when possible. It shrinks the
-# kernel considerably.
-KBUILD_CFLAGS += $(call cc-option,-funit-at-a-time)
-
 # FIXME: the module load should be taught about the additional relocs
 # generated by this.
 # revert to pre-gcc-4.4 behaviour of .eh_frame
diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index f5d7f4134524..58d82e9dc36d 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -130,10 +130,6 @@ else
 
 KBUILD_CFLAGS += -mno-red-zone
 KBUILD_CFLAGS += -mcmodel=kernel
-
-# -funit-at-a-time shrinks the kernel .text considerably
-# unfortunately it makes reading oopses harder.
-KBUILD_CFLAGS += $(call cc-option,-funit-at-a-time)
 endif
 
 ifdef CONFIG_X86_X32
diff --git a/arch/x86/Makefile.um b/arch/x86/Makefile.um
index 577976b7d1f8..1db7913795f5 100644
--- a/arch/x86/Makefile.um
+++ b/arch/x86/Makefile.um
@@ -26,9 +26,6 @@ cflags-y += $(call cc-option,-mpreferred-stack-boundary=2)
 # an unresolved reference.
 cflags-y += -ffreestanding
 
-# gcc 4.3.0 needs -funit-at-a-time for extern inline functions.
-KBUILD_CFLAGS += $(call cc-option,-funit-at-a-time)
-
 KBUILD_CFLAGS += $(cflags-y)
 
 else
@@ -50,6 +47,4 @@ ELF_FORMAT := elf64-x86-64
 LINK-$(CONFIG_LD_SCRIPT_DYN) += -Wl,-rpath,/lib64
 LINK-y += -m64
 
-# Do unit-at-a-time unconditionally on x86_64, following the host
-KBUILD_CFLAGS += $(call cc-option,-funit-at-a-time)
 endif

[tip:x86/build] x86/um: Remove -fno-unit-at-a-time workaround for pre-4.0 GCC

2018-12-09 Thread tip-bot for Masahiro Yamada 
Commit-ID:  829889ac4a7d26858860c297e64051bd27ce8fbe
Gitweb: https://git.kernel.org/tip/829889ac4a7d26858860c297e64051bd27ce8fbe
Author: Masahiro Yamada 
AuthorDate: Mon, 12 Nov 2018 11:35:19 +0900
Committer:  Borislav Petkov 
CommitDate: Sun, 9 Dec 2018 11:51:11 +0100

x86/um: Remove -fno-unit-at-a-time workaround for pre-4.0 GCC

Commit

  cafa0010cd51 ("Raise the minimum required gcc version to 4.6")

bumped the minimum GCC version to 4.6 for all architectures.

'$(call cc-option,-fno-unit-at-a-time)' is now dead code since
'$(cc-version) -lt 0400' is always false. Remove it.

Signed-off-by: Masahiro Yamada 
Signed-off-by: Borislav Petkov 
Acked-by: Richard Weinberger 
Cc: "H. Peter Anvin" 
Cc: Ingo Molnar 
Cc: Michael Ellerman 
Cc: Thomas Gleixner 
Cc: linuxppc-...@lists.ozlabs.org
Cc: x86-ml 
Link: 
https://lkml.kernel.org/r/1541990120-9643-2-git-send-email-yamada.masah...@socionext.com
---
 arch/x86/Makefile.um | 8 ++--
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/arch/x86/Makefile.um b/arch/x86/Makefile.um
index 91085a08de6c..577976b7d1f8 100644
--- a/arch/x86/Makefile.um
+++ b/arch/x86/Makefile.um
@@ -26,12 +26,8 @@ cflags-y += $(call cc-option,-mpreferred-stack-boundary=2)
 # an unresolved reference.
 cflags-y += -ffreestanding
 
-# Disable unit-at-a-time mode on pre-gcc-4.0 compilers, it makes gcc use
-# a lot more stack due to the lack of sharing of stacklots.  Also, gcc
-# 4.3.0 needs -funit-at-a-time for extern inline functions.
-KBUILD_CFLAGS += $(shell if [ $(cc-version) -lt 0400 ] ; then \
-   echo $(call cc-option,-fno-unit-at-a-time); \
-   else echo $(call cc-option,-funit-at-a-time); fi ;)
+# gcc 4.3.0 needs -funit-at-a-time for extern inline functions.
+KBUILD_CFLAGS += $(call cc-option,-funit-at-a-time)
 
 KBUILD_CFLAGS += $(cflags-y)

[tip:x86/urgent] x86/build: Fix compiler support check for CONFIG_RETPOLINE

2018-12-04 Thread tip-bot for Masahiro Yamada 
Commit-ID:  25896d073d8a0403b07e6dec56f58e6c33678207
Gitweb: https://git.kernel.org/tip/25896d073d8a0403b07e6dec56f58e6c33678207
Author: Masahiro Yamada 
AuthorDate: Wed, 5 Dec 2018 15:27:19 +0900
Committer:  Ingo Molnar 
CommitDate: Wed, 5 Dec 2018 08:44:02 +0100

x86/build: Fix compiler support check for CONFIG_RETPOLINE

It is troublesome to add a diagnostic like this to the Makefile
parse stage because the top-level Makefile could be parsed with
a stale include/config/auto.conf.

Once you are hit by the error about non-retpoline compiler, the
compilation still breaks even after disabling CONFIG_RETPOLINE.

The easiest fix is to move this check to the "archprepare" like
this commit did:

  829fe4aa9ac1 ("x86: Allow generating user-space headers without a compiler")

Reported-by: Meelis Roos 
Tested-by: Meelis Roos 
Signed-off-by: Masahiro Yamada 
Acked-by: Zhenzhong Duan 
Cc: Borislav Petkov 
Cc: Linus Torvalds 
Cc: Peter Zijlstra 
Cc: Thomas Gleixner 
Cc: Zhenzhong Duan 
Fixes: 4cd24de3a098 ("x86/retpoline: Make CONFIG_RETPOLINE depend on compiler 
support")
Link: 
http://lkml.kernel.org/r/1543991239-18476-1-git-send-email-yamada.masah...@socionext.com
Link: https://lkml.org/lkml/2018/12/4/206
Signed-off-by: Ingo Molnar 
---
 arch/x86/Makefile | 10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index f5d7f4134524..75ef499a66e2 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -220,9 +220,6 @@ KBUILD_CFLAGS += -fno-asynchronous-unwind-tables
 
 # Avoid indirect branches in kernel to deal with Spectre
 ifdef CONFIG_RETPOLINE
-ifeq ($(RETPOLINE_CFLAGS),)
-  $(error You are building kernel with non-retpoline compiler, please update 
your compiler.)
-endif
   KBUILD_CFLAGS += $(RETPOLINE_CFLAGS)
 endif
 
@@ -307,6 +304,13 @@ ifndef CC_HAVE_ASM_GOTO
@echo Compiler lacks asm-goto support.
@exit 1
 endif
+ifdef CONFIG_RETPOLINE
+ifeq ($(RETPOLINE_CFLAGS),)
+   @echo "You are building kernel with non-retpoline compiler." >&2
+   @echo "Please update your compiler." >&2
+   @false
+endif
+endif
 
 archclean:
$(Q)rm -rf $(objtree)/arch/i386

[tip:x86/urgent] x86/build: Fix compiler support check for CONFIG_RETPOLINE

2018-12-04 Thread tip-bot for Masahiro Yamada 
Commit-ID:  25896d073d8a0403b07e6dec56f58e6c33678207
Gitweb: https://git.kernel.org/tip/25896d073d8a0403b07e6dec56f58e6c33678207
Author: Masahiro Yamada 
AuthorDate: Wed, 5 Dec 2018 15:27:19 +0900
Committer:  Ingo Molnar 
CommitDate: Wed, 5 Dec 2018 08:44:02 +0100

x86/build: Fix compiler support check for CONFIG_RETPOLINE

It is troublesome to add a diagnostic like this to the Makefile
parse stage because the top-level Makefile could be parsed with
a stale include/config/auto.conf.

Once you are hit by the error about non-retpoline compiler, the
compilation still breaks even after disabling CONFIG_RETPOLINE.

The easiest fix is to move this check to the "archprepare" like
this commit did:

  829fe4aa9ac1 ("x86: Allow generating user-space headers without a compiler")

Reported-by: Meelis Roos 
Tested-by: Meelis Roos 
Signed-off-by: Masahiro Yamada 
Acked-by: Zhenzhong Duan 
Cc: Borislav Petkov 
Cc: Linus Torvalds 
Cc: Peter Zijlstra 
Cc: Thomas Gleixner 
Cc: Zhenzhong Duan 
Fixes: 4cd24de3a098 ("x86/retpoline: Make CONFIG_RETPOLINE depend on compiler 
support")
Link: 
http://lkml.kernel.org/r/1543991239-18476-1-git-send-email-yamada.masah...@socionext.com
Link: https://lkml.org/lkml/2018/12/4/206
Signed-off-by: Ingo Molnar 
---
 arch/x86/Makefile | 10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index f5d7f4134524..75ef499a66e2 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -220,9 +220,6 @@ KBUILD_CFLAGS += -fno-asynchronous-unwind-tables
 
 # Avoid indirect branches in kernel to deal with Spectre
 ifdef CONFIG_RETPOLINE
-ifeq ($(RETPOLINE_CFLAGS),)
-  $(error You are building kernel with non-retpoline compiler, please update 
your compiler.)
-endif
   KBUILD_CFLAGS += $(RETPOLINE_CFLAGS)
 endif
 
@@ -307,6 +304,13 @@ ifndef CC_HAVE_ASM_GOTO
@echo Compiler lacks asm-goto support.
@exit 1
 endif
+ifdef CONFIG_RETPOLINE
+ifeq ($(RETPOLINE_CFLAGS),)
+   @echo "You are building kernel with non-retpoline compiler." >&2
+   @echo "Please update your compiler." >&2
+   @false
+endif
+endif
 
 archclean:
$(Q)rm -rf $(objtree)/arch/i386

[tip:x86/urgent] x86/build: Fix compiler support check for CONFIG_RETPOLINE

2018-12-04 Thread tip-bot for Masahiro Yamada 
Commit-ID:  10b87bc9f630a38a7f0c1e7cf13ff23fea1692ec
Gitweb: https://git.kernel.org/tip/10b87bc9f630a38a7f0c1e7cf13ff23fea1692ec
Author: Masahiro Yamada 
AuthorDate: Wed, 5 Dec 2018 15:27:19 +0900
Committer:  Ingo Molnar 
CommitDate: Wed, 5 Dec 2018 08:42:09 +0100

x86/build: Fix compiler support check for CONFIG_RETPOLINE

It is troublesome to add a diagnostic like this to the Makefile
parse stage because the top-level Makefile could be parsed with
a stale include/config/auto.conf.

Once you are hit by the error about non-retpoline compiler, the
compilation still breaks even after disabling CONFIG_RETPOLINE.

The easiest fix is to move this check to the "archprepare" like
this commit did:

  829fe4aa9ac1 ("x86: Allow generating user-space headers without a compiler")

Reported-by: Meelis Roos 
Signed-off-by: Masahiro Yamada 
Acked-by: Zhenzhong Duan 
Cc: Borislav Petkov 
Cc: Linus Torvalds 
Cc: Peter Zijlstra 
Cc: Thomas Gleixner 
Cc: Zhenzhong Duan 
Fixes: 4cd24de3a098 ("x86/retpoline: Make CONFIG_RETPOLINE depend on compiler 
support")
Link: 
http://lkml.kernel.org/r/1543991239-18476-1-git-send-email-yamada.masah...@socionext.com
Link: https://lkml.org/lkml/2018/12/4/206
Signed-off-by: Ingo Molnar 
---
 arch/x86/Makefile | 10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index f5d7f4134524..75ef499a66e2 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -220,9 +220,6 @@ KBUILD_CFLAGS += -fno-asynchronous-unwind-tables
 
 # Avoid indirect branches in kernel to deal with Spectre
 ifdef CONFIG_RETPOLINE
-ifeq ($(RETPOLINE_CFLAGS),)
-  $(error You are building kernel with non-retpoline compiler, please update 
your compiler.)
-endif
   KBUILD_CFLAGS += $(RETPOLINE_CFLAGS)
 endif
 
@@ -307,6 +304,13 @@ ifndef CC_HAVE_ASM_GOTO
@echo Compiler lacks asm-goto support.
@exit 1
 endif
+ifdef CONFIG_RETPOLINE
+ifeq ($(RETPOLINE_CFLAGS),)
+   @echo "You are building kernel with non-retpoline compiler." >&2
+   @echo "Please update your compiler." >&2
+   @false
+endif
+endif
 
 archclean:
$(Q)rm -rf $(objtree)/arch/i386

[tip:x86/urgent] x86/build: Fix compiler support check for CONFIG_RETPOLINE

2018-12-04 Thread tip-bot for Masahiro Yamada 
Commit-ID:  10b87bc9f630a38a7f0c1e7cf13ff23fea1692ec
Gitweb: https://git.kernel.org/tip/10b87bc9f630a38a7f0c1e7cf13ff23fea1692ec
Author: Masahiro Yamada 
AuthorDate: Wed, 5 Dec 2018 15:27:19 +0900
Committer:  Ingo Molnar 
CommitDate: Wed, 5 Dec 2018 08:42:09 +0100

x86/build: Fix compiler support check for CONFIG_RETPOLINE

It is troublesome to add a diagnostic like this to the Makefile
parse stage because the top-level Makefile could be parsed with
a stale include/config/auto.conf.

Once you are hit by the error about non-retpoline compiler, the
compilation still breaks even after disabling CONFIG_RETPOLINE.

The easiest fix is to move this check to the "archprepare" like
this commit did:

  829fe4aa9ac1 ("x86: Allow generating user-space headers without a compiler")

Reported-by: Meelis Roos 
Signed-off-by: Masahiro Yamada 
Acked-by: Zhenzhong Duan 
Cc: Borislav Petkov 
Cc: Linus Torvalds 
Cc: Peter Zijlstra 
Cc: Thomas Gleixner 
Cc: Zhenzhong Duan 
Fixes: 4cd24de3a098 ("x86/retpoline: Make CONFIG_RETPOLINE depend on compiler 
support")
Link: 
http://lkml.kernel.org/r/1543991239-18476-1-git-send-email-yamada.masah...@socionext.com
Link: https://lkml.org/lkml/2018/12/4/206
Signed-off-by: Ingo Molnar 
---
 arch/x86/Makefile | 10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index f5d7f4134524..75ef499a66e2 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -220,9 +220,6 @@ KBUILD_CFLAGS += -fno-asynchronous-unwind-tables
 
 # Avoid indirect branches in kernel to deal with Spectre
 ifdef CONFIG_RETPOLINE
-ifeq ($(RETPOLINE_CFLAGS),)
-  $(error You are building kernel with non-retpoline compiler, please update 
your compiler.)
-endif
   KBUILD_CFLAGS += $(RETPOLINE_CFLAGS)
 endif
 
@@ -307,6 +304,13 @@ ifndef CC_HAVE_ASM_GOTO
@echo Compiler lacks asm-goto support.
@exit 1
 endif
+ifdef CONFIG_RETPOLINE
+ifeq ($(RETPOLINE_CFLAGS),)
+   @echo "You are building kernel with non-retpoline compiler." >&2
+   @echo "Please update your compiler." >&2
+   @false
+endif
+endif
 
 archclean:
$(Q)rm -rf $(objtree)/arch/i386

[tip:x86/build] x86/build: Remove unused CONFIG_AS_CRC32

2018-10-01 Thread tip-bot for Masahiro Yamada 
Commit-ID:  ac0d6567955cf70dd43d56b677361c9d4c3d7710
Gitweb: https://git.kernel.org/tip/ac0d6567955cf70dd43d56b677361c9d4c3d7710
Author: Masahiro Yamada 
AuthorDate: Mon, 1 Oct 2018 19:24:03 +0900
Committer:  Borislav Petkov 
CommitDate: Mon, 1 Oct 2018 14:58:09 +0200

x86/build: Remove unused CONFIG_AS_CRC32

CONFIG_AS_CRC32 is not used anywhere. Its last user was removed by

  0cb6c969ed9d ("net, lib: kill arch_fast_hash library bits")

Signed-off-by: Masahiro Yamada 
Signed-off-by: Borislav Petkov 
Cc: Ingo Molnar 
Cc: Thomas Gleixner 
Cc: "H. Peter Anvin" 
Link: 
https://lkml.kernel.org/r/1538389443-28514-1-git-send-email-yamada.masah...@socionext.com
---
 arch/x86/Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index 8f6e7eb8ae9f..0e496ed476d4 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -193,7 +193,6 @@ cfi-sections := $(call as-instr,.cfi_sections 
.debug_frame,-DCONFIG_AS_CFI_SECTI
 # does binutils support specific instructions?
 asinstr := $(call as-instr,fxsaveq (%rax),-DCONFIG_AS_FXSAVEQ=1)
 asinstr += $(call as-instr,pshufb %xmm0$(comma)%xmm0,-DCONFIG_AS_SSSE3=1)
-asinstr += $(call as-instr,crc32l %eax$(comma)%eax,-DCONFIG_AS_CRC32=1)
 avx_instr := $(call as-instr,vxorps 
%ymm0$(comma)%ymm1$(comma)%ymm2,-DCONFIG_AS_AVX=1)
 avx2_instr :=$(call as-instr,vpbroadcastb 
%xmm0$(comma)%ymm1,-DCONFIG_AS_AVX2=1)
 avx512_instr :=$(call as-instr,vpmovm2b %k1$(comma)%zmm5,-DCONFIG_AS_AVX512=1)

[tip:x86/build] x86/build: Remove unused CONFIG_AS_CRC32

2018-10-01 Thread tip-bot for Masahiro Yamada 
Commit-ID:  ac0d6567955cf70dd43d56b677361c9d4c3d7710
Gitweb: https://git.kernel.org/tip/ac0d6567955cf70dd43d56b677361c9d4c3d7710
Author: Masahiro Yamada 
AuthorDate: Mon, 1 Oct 2018 19:24:03 +0900
Committer:  Borislav Petkov 
CommitDate: Mon, 1 Oct 2018 14:58:09 +0200

x86/build: Remove unused CONFIG_AS_CRC32

CONFIG_AS_CRC32 is not used anywhere. Its last user was removed by

  0cb6c969ed9d ("net, lib: kill arch_fast_hash library bits")

Signed-off-by: Masahiro Yamada 
Signed-off-by: Borislav Petkov 
Cc: Ingo Molnar 
Cc: Thomas Gleixner 
Cc: "H. Peter Anvin" 
Link: 
https://lkml.kernel.org/r/1538389443-28514-1-git-send-email-yamada.masah...@socionext.com
---
 arch/x86/Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index 8f6e7eb8ae9f..0e496ed476d4 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -193,7 +193,6 @@ cfi-sections := $(call as-instr,.cfi_sections 
.debug_frame,-DCONFIG_AS_CFI_SECTI
 # does binutils support specific instructions?
 asinstr := $(call as-instr,fxsaveq (%rax),-DCONFIG_AS_FXSAVEQ=1)
 asinstr += $(call as-instr,pshufb %xmm0$(comma)%xmm0,-DCONFIG_AS_SSSE3=1)
-asinstr += $(call as-instr,crc32l %eax$(comma)%eax,-DCONFIG_AS_CRC32=1)
 avx_instr := $(call as-instr,vxorps 
%ymm0$(comma)%ymm1$(comma)%ymm2,-DCONFIG_AS_AVX=1)
 avx2_instr :=$(call as-instr,vpbroadcastb 
%xmm0$(comma)%ymm1,-DCONFIG_AS_AVX2=1)
 avx512_instr :=$(call as-instr,vpmovm2b %k1$(comma)%zmm5,-DCONFIG_AS_AVX512=1)

[tip:core/urgent] objtool: Remove workaround for unreachable warnings from old GCC

2018-08-30 Thread tip-bot for Masahiro Yamada 
Commit-ID:  113fc08357ad4e8b84caa75402430875d9ac4c1a
Gitweb: https://git.kernel.org/tip/113fc08357ad4e8b84caa75402430875d9ac4c1a
Author: Masahiro Yamada 
AuthorDate: Mon, 27 Aug 2018 12:39:43 +0900
Committer:  Thomas Gleixner 
CommitDate: Thu, 30 Aug 2018 12:56:40 +0200

objtool: Remove workaround for unreachable warnings from old GCC

Commit cafa0010cd51 ("Raise the minimum required gcc version to 4.6")
bumped the minimum GCC version to 4.6 for all architectures.

This effectively reverts commit da541b20021c ("objtool: Skip unreachable
warnings for GCC 4.4 and older"), which was a workaround for GCC 4.4 or
older.

Signed-off-by: Masahiro Yamada 
Signed-off-by: Thomas Gleixner 
Acked-by: Josh Poimboeuf 
Cc: Peter Zijlstra 
Cc: Michal Marek 
Cc: linux-kbu...@vger.kernel.org
Link: 
https://lkml.kernel.org/r/1535341183-19994-1-git-send-email-yamada.masah...@socionext.com

---
 scripts/Makefile.build | 2 --
 1 file changed, 2 deletions(-)

diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index 1c48572223d1..5a2d1c9578a0 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -246,8 +246,6 @@ objtool_args += --no-fp
 endif
 ifdef CONFIG_GCOV_KERNEL
 objtool_args += --no-unreachable
-else
-objtool_args += $(call cc-ifversion, -lt, 0405, --no-unreachable)
 endif
 ifdef CONFIG_RETPOLINE
 ifneq ($(RETPOLINE_CFLAGS),)

[tip:core/urgent] objtool: Remove workaround for unreachable warnings from old GCC

2018-08-30 Thread tip-bot for Masahiro Yamada 
Commit-ID:  113fc08357ad4e8b84caa75402430875d9ac4c1a
Gitweb: https://git.kernel.org/tip/113fc08357ad4e8b84caa75402430875d9ac4c1a
Author: Masahiro Yamada 
AuthorDate: Mon, 27 Aug 2018 12:39:43 +0900
Committer:  Thomas Gleixner 
CommitDate: Thu, 30 Aug 2018 12:56:40 +0200

objtool: Remove workaround for unreachable warnings from old GCC

Commit cafa0010cd51 ("Raise the minimum required gcc version to 4.6")
bumped the minimum GCC version to 4.6 for all architectures.

This effectively reverts commit da541b20021c ("objtool: Skip unreachable
warnings for GCC 4.4 and older"), which was a workaround for GCC 4.4 or
older.

Signed-off-by: Masahiro Yamada 
Signed-off-by: Thomas Gleixner 
Acked-by: Josh Poimboeuf 
Cc: Peter Zijlstra 
Cc: Michal Marek 
Cc: linux-kbu...@vger.kernel.org
Link: 
https://lkml.kernel.org/r/1535341183-19994-1-git-send-email-yamada.masah...@socionext.com

---
 scripts/Makefile.build | 2 --
 1 file changed, 2 deletions(-)

diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index 1c48572223d1..5a2d1c9578a0 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -246,8 +246,6 @@ objtool_args += --no-fp
 endif
 ifdef CONFIG_GCOV_KERNEL
 objtool_args += --no-unreachable
-else
-objtool_args += $(call cc-ifversion, -lt, 0405, --no-unreachable)
 endif
 ifdef CONFIG_RETPOLINE
 ifneq ($(RETPOLINE_CFLAGS),)

[tip:x86/urgent] x86/build: Remove jump label quirk for GCC older than 4.5.2

2018-08-30 Thread tip-bot for Masahiro Yamada 
Commit-ID:  36bf9da2913054c218337d8cd7cb11bddc1fafb0
Gitweb: https://git.kernel.org/tip/36bf9da2913054c218337d8cd7cb11bddc1fafb0
Author: Masahiro Yamada 
AuthorDate: Mon, 27 Aug 2018 14:45:14 +0900
Committer:  Thomas Gleixner 
CommitDate: Thu, 30 Aug 2018 11:37:08 +0200

x86/build: Remove jump label quirk for GCC older than 4.5.2

Commit cafa0010cd51 ("Raise the minimum required gcc version to 4.6")
bumped the minimum GCC version to 4.6 for all architectures.

Remove the workaround code.

It was the only user of cc-if-fullversion.  Remove the macro as well.

Signed-off-by: Masahiro Yamada 
Signed-off-by: Thomas Gleixner 
Cc: "H. Peter Anvin" 
Cc: Michal Marek 
Cc: linux-kbu...@vger.kernel.org
Link: 
https://lkml.kernel.org/r/1535348714-25457-1-git-send-email-yamada.masah...@socionext.com

---
 arch/x86/Makefile  | 12 
 scripts/Kbuild.include |  4 
 2 files changed, 16 deletions(-)

diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index 94859241bc3e..8fc8f94ef5f5 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -179,18 +179,6 @@ ifndef CC_HAVE_ASM_GOTO
   $(error Compiler lacks asm-goto support.)
 endif
 
-#
-# Jump labels need '-maccumulate-outgoing-args' for gcc < 4.5.2 to prevent a
-# GCC bug (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=46226).  There's no way
-# to test for this bug at compile-time because the test case needs to execute,
-# which is a no-go for cross compilers.  So check the GCC version instead.
-#
-ifdef CONFIG_JUMP_LABEL
-  ifneq ($(ACCUMULATE_OUTGOING_ARGS), 1)
-   ACCUMULATE_OUTGOING_ARGS = $(call cc-if-fullversion, -lt, 040502, 1)
-  endif
-endif
-
 ifeq ($(ACCUMULATE_OUTGOING_ARGS), 1)
# This compiler flag is not supported by Clang:
KBUILD_CFLAGS += $(call cc-option,-maccumulate-outgoing-args,)
diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include
index c75413d05a63..ce53639a864a 100644
--- a/scripts/Kbuild.include
+++ b/scripts/Kbuild.include
@@ -153,10 +153,6 @@ cc-fullversion = $(shell $(CONFIG_SHELL) \
 # Usage:  EXTRA_CFLAGS += $(call cc-ifversion, -lt, 0402, -O1)
 cc-ifversion = $(shell [ $(cc-version) $(1) $(2) ] && echo $(3) || echo $(4))
 
-# cc-if-fullversion
-# Usage:  EXTRA_CFLAGS += $(call cc-if-fullversion, -lt, 040502, -O1)
-cc-if-fullversion = $(shell [ $(cc-fullversion) $(1) $(2) ] && echo $(3) || 
echo $(4))
-
 # cc-ldoption
 # Usage: ldflags += $(call cc-ldoption, -Wl$(comma)--hash-style=both)
 cc-ldoption = $(call try-run,\

[tip:x86/urgent] x86/build: Remove jump label quirk for GCC older than 4.5.2

2018-08-30 Thread tip-bot for Masahiro Yamada 
Commit-ID:  36bf9da2913054c218337d8cd7cb11bddc1fafb0
Gitweb: https://git.kernel.org/tip/36bf9da2913054c218337d8cd7cb11bddc1fafb0
Author: Masahiro Yamada 
AuthorDate: Mon, 27 Aug 2018 14:45:14 +0900
Committer:  Thomas Gleixner 
CommitDate: Thu, 30 Aug 2018 11:37:08 +0200

x86/build: Remove jump label quirk for GCC older than 4.5.2

Commit cafa0010cd51 ("Raise the minimum required gcc version to 4.6")
bumped the minimum GCC version to 4.6 for all architectures.

Remove the workaround code.

It was the only user of cc-if-fullversion.  Remove the macro as well.

Signed-off-by: Masahiro Yamada 
Signed-off-by: Thomas Gleixner 
Cc: "H. Peter Anvin" 
Cc: Michal Marek 
Cc: linux-kbu...@vger.kernel.org
Link: 
https://lkml.kernel.org/r/1535348714-25457-1-git-send-email-yamada.masah...@socionext.com

---
 arch/x86/Makefile  | 12 
 scripts/Kbuild.include |  4 
 2 files changed, 16 deletions(-)

diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index 94859241bc3e..8fc8f94ef5f5 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -179,18 +179,6 @@ ifndef CC_HAVE_ASM_GOTO
   $(error Compiler lacks asm-goto support.)
 endif
 
-#
-# Jump labels need '-maccumulate-outgoing-args' for gcc < 4.5.2 to prevent a
-# GCC bug (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=46226).  There's no way
-# to test for this bug at compile-time because the test case needs to execute,
-# which is a no-go for cross compilers.  So check the GCC version instead.
-#
-ifdef CONFIG_JUMP_LABEL
-  ifneq ($(ACCUMULATE_OUTGOING_ARGS), 1)
-   ACCUMULATE_OUTGOING_ARGS = $(call cc-if-fullversion, -lt, 040502, 1)
-  endif
-endif
-
 ifeq ($(ACCUMULATE_OUTGOING_ARGS), 1)
# This compiler flag is not supported by Clang:
KBUILD_CFLAGS += $(call cc-option,-maccumulate-outgoing-args,)
diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include
index c75413d05a63..ce53639a864a 100644
--- a/scripts/Kbuild.include
+++ b/scripts/Kbuild.include
@@ -153,10 +153,6 @@ cc-fullversion = $(shell $(CONFIG_SHELL) \
 # Usage:  EXTRA_CFLAGS += $(call cc-ifversion, -lt, 0402, -O1)
 cc-ifversion = $(shell [ $(cc-version) $(1) $(2) ] && echo $(3) || echo $(4))
 
-# cc-if-fullversion
-# Usage:  EXTRA_CFLAGS += $(call cc-if-fullversion, -lt, 040502, -O1)
-cc-if-fullversion = $(shell [ $(cc-fullversion) $(1) $(2) ] && echo $(3) || 
echo $(4))
-
 # cc-ldoption
 # Usage: ldflags += $(call cc-ldoption, -Wl$(comma)--hash-style=both)
 cc-ldoption = $(call try-run,\

[tip:x86/build] x86/build: Remove old -funit-at-a-time GCC quirk

2018-07-15 Thread tip-bot for Masahiro Yamada 
Commit-ID:  bdc9c3e5ed953441a46ef3acd81c783d591c9a96
Gitweb: https://git.kernel.org/tip/bdc9c3e5ed953441a46ef3acd81c783d591c9a96
Author: Masahiro Yamada 
AuthorDate: Mon, 9 Jul 2018 21:07:21 +0900
Committer:  Ingo Molnar 
CommitDate: Mon, 16 Jul 2018 00:25:10 +0200

x86/build: Remove old -funit-at-a-time GCC quirk

The following commit:

  e501ce957a78 ("x86: Force asm-goto")

... bumped the minimum GCC version to 4.5 for building the x86 kernel.

arch/x86/Makefile no longer needs to take care of older GCC versions,
such as this pre-4.0 -funit-at-a-time quirk.

Signed-off-by: Masahiro Yamada 
Cc: Linus Torvalds 
Cc: Peter Zijlstra 
Cc: Thomas Gleixner 
Cc: "H. Peter Anvin" 
Link: 
http://lkml.kernel.org/r/1531138041-24200-1-git-send-email-yamada.masah...@socionext.com
Signed-off-by: Ingo Molnar 
---
 arch/x86/Makefile | 5 -
 1 file changed, 5 deletions(-)

diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index a08e82856563..7e3c07d6ad42 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -80,11 +80,6 @@ ifeq ($(CONFIG_X86_32),y)
 # alignment instructions.
 KBUILD_CFLAGS += $(call cc-option,$(cc_stack_align4))
 
-# Disable unit-at-a-time mode on pre-gcc-4.0 compilers, it makes gcc 
use
-# a lot more stack due to the lack of sharing of stacklots:
-KBUILD_CFLAGS += $(call cc-ifversion, -lt, 0400, \
-   $(call cc-option,-fno-unit-at-a-time))
-
 # CPU-specific tuning. Anything which can be shared with UML should go 
here.
 include arch/x86/Makefile_32.cpu
 KBUILD_CFLAGS += $(cflags-y)

[tip:x86/build] x86/build: Remove old -funit-at-a-time GCC quirk

2018-07-15 Thread tip-bot for Masahiro Yamada 
Commit-ID:  bdc9c3e5ed953441a46ef3acd81c783d591c9a96
Gitweb: https://git.kernel.org/tip/bdc9c3e5ed953441a46ef3acd81c783d591c9a96
Author: Masahiro Yamada 
AuthorDate: Mon, 9 Jul 2018 21:07:21 +0900
Committer:  Ingo Molnar 
CommitDate: Mon, 16 Jul 2018 00:25:10 +0200

x86/build: Remove old -funit-at-a-time GCC quirk

The following commit:

  e501ce957a78 ("x86: Force asm-goto")

... bumped the minimum GCC version to 4.5 for building the x86 kernel.

arch/x86/Makefile no longer needs to take care of older GCC versions,
such as this pre-4.0 -funit-at-a-time quirk.

Signed-off-by: Masahiro Yamada 
Cc: Linus Torvalds 
Cc: Peter Zijlstra 
Cc: Thomas Gleixner 
Cc: "H. Peter Anvin" 
Link: 
http://lkml.kernel.org/r/1531138041-24200-1-git-send-email-yamada.masah...@socionext.com
Signed-off-by: Ingo Molnar 
---
 arch/x86/Makefile | 5 -
 1 file changed, 5 deletions(-)

diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index a08e82856563..7e3c07d6ad42 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -80,11 +80,6 @@ ifeq ($(CONFIG_X86_32),y)
 # alignment instructions.
 KBUILD_CFLAGS += $(call cc-option,$(cc_stack_align4))
 
-# Disable unit-at-a-time mode on pre-gcc-4.0 compilers, it makes gcc 
use
-# a lot more stack due to the lack of sharing of stacklots:
-KBUILD_CFLAGS += $(call cc-ifversion, -lt, 0400, \
-   $(call cc-option,-fno-unit-at-a-time))
-
 # CPU-specific tuning. Anything which can be shared with UML should go 
here.
 include arch/x86/Makefile_32.cpu
 KBUILD_CFLAGS += $(cflags-y)

[tip:x86/asm] x86/build/vdso: Simplify 'cmd_vdso2c'

2018-07-03 Thread tip-bot for Masahiro Yamada 
Commit-ID:  c5fcdbf15523f6bbbaeb822e3be6003e60f9d3b7
Gitweb: https://git.kernel.org/tip/c5fcdbf15523f6bbbaeb822e3be6003e60f9d3b7
Author: Masahiro Yamada 
AuthorDate: Tue, 3 Jul 2018 10:50:14 +0900
Committer:  Ingo Molnar 
CommitDate: Tue, 3 Jul 2018 09:20:08 +0200

x86/build/vdso: Simplify 'cmd_vdso2c'

No reason to use 'define' directive here.  Just use the = operator.

Signed-off-by: Masahiro Yamada 
Cc: Andy Lutomirski 
Cc: Linus Torvalds 
Cc: Peter Zijlstra 
Cc: Thomas Gleixner 
Link: 
http://lkml.kernel.org/r/1530582614-5173-3-git-send-email-yamada.masah...@socionext.com
Signed-off-by: Ingo Molnar 
---
 arch/x86/entry/vdso/Makefile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile
index 261802b1cc50..b9ed1aa53a26 100644
--- a/arch/x86/entry/vdso/Makefile
+++ b/arch/x86/entry/vdso/Makefile
@@ -58,9 +58,7 @@ HOST_EXTRACFLAGS += -I$(srctree)/tools/include 
-I$(srctree)/include/uapi -I$(src
 hostprogs-y+= vdso2c
 
 quiet_cmd_vdso2c = VDSO2C  $@
-define cmd_vdso2c
-   $(obj)/vdso2c $< $(<:%.dbg=%) $@
-endef
+  cmd_vdso2c = $(obj)/vdso2c $< $(<:%.dbg=%) $@
 
 $(obj)/vdso-image-%.c: $(obj)/vdso%.so.dbg $(obj)/vdso%.so $(obj)/vdso2c FORCE
$(call if_changed,vdso2c)

[tip:x86/asm] x86/build/vdso: Remove unused vdso-syms.lds

2018-07-03 Thread tip-bot for Masahiro Yamada 
Commit-ID:  b5722a457b6e5eabd97a7f39c6c2b8e9a623ab15
Gitweb: https://git.kernel.org/tip/b5722a457b6e5eabd97a7f39c6c2b8e9a623ab15
Author: Masahiro Yamada 
AuthorDate: Tue, 3 Jul 2018 10:50:13 +0900
Committer:  Ingo Molnar 
CommitDate: Tue, 3 Jul 2018 09:20:07 +0200

x86/build/vdso: Remove unused vdso-syms.lds

This file contains symbol values, and was originally linked into
vmlinux, but I have no idea what it was actually used for.

Since the following commit:

  827880ec260b ("x86/um: thin archives build fix")

it is not even linked.  Now it is completely orphan, and no problem has
been reported.  It is a proof that this file was not needed in the
first place.

Signed-off-by: Masahiro Yamada 
Acked-by: Richard Weinberger 
Cc: Andy Lutomirski 
Cc: Jeff Dike 
Cc: Linus Torvalds 
Cc: Peter Zijlstra 
Cc: Thomas Gleixner 
Cc: linux...@lists.infradead.org
Link: 
http://lkml.kernel.org/r/1530582614-5173-2-git-send-email-yamada.masah...@socionext.com
Signed-off-by: Ingo Molnar 
---
 arch/x86/um/vdso/.gitignore |  1 -
 arch/x86/um/vdso/Makefile   | 16 
 2 files changed, 17 deletions(-)

diff --git a/arch/x86/um/vdso/.gitignore b/arch/x86/um/vdso/.gitignore
index 9cac6d072199..f8b69d84238e 100644
--- a/arch/x86/um/vdso/.gitignore
+++ b/arch/x86/um/vdso/.gitignore
@@ -1,2 +1 @@
-vdso-syms.lds
 vdso.lds
diff --git a/arch/x86/um/vdso/Makefile b/arch/x86/um/vdso/Makefile
index b2d6967262b2..822ccdba93ad 100644
--- a/arch/x86/um/vdso/Makefile
+++ b/arch/x86/um/vdso/Makefile
@@ -53,22 +53,6 @@ $(vobjs): KBUILD_CFLAGS += $(CFL)
 CFLAGS_REMOVE_vdso-note.o = -pg -fprofile-arcs -ftest-coverage
 CFLAGS_REMOVE_um_vdso.o = -pg -fprofile-arcs -ftest-coverage
 
-targets += vdso-syms.lds
-extra-$(VDSO64-y)  += vdso-syms.lds
-
-#
-# Match symbols in the DSO that look like VDSO*; produce a file of constants.
-#
-sed-vdsosym := -e 's/^00*/0/' \
-   -e 's/^\([0-9a-fA-F]*\) . \(VDSO[a-zA-Z0-9_]*\)$$/\2 = 0x\1;/p'
-quiet_cmd_vdsosym = VDSOSYM $@
-define cmd_vdsosym
-   $(NM) $< | LC_ALL=C sed -n $(sed-vdsosym) | LC_ALL=C sort > $@
-endef
-
-$(obj)/%-syms.lds: $(obj)/%.so.dbg FORCE
-   $(call if_changed,vdsosym)
-
 #
 # The DSO images are built using a special linker script.
 #

[tip:x86/asm] x86/build/vdso: Simplify 'cmd_vdso2c'

2018-07-03 Thread tip-bot for Masahiro Yamada 
Commit-ID:  c5fcdbf15523f6bbbaeb822e3be6003e60f9d3b7
Gitweb: https://git.kernel.org/tip/c5fcdbf15523f6bbbaeb822e3be6003e60f9d3b7
Author: Masahiro Yamada 
AuthorDate: Tue, 3 Jul 2018 10:50:14 +0900
Committer:  Ingo Molnar 
CommitDate: Tue, 3 Jul 2018 09:20:08 +0200

x86/build/vdso: Simplify 'cmd_vdso2c'

No reason to use 'define' directive here.  Just use the = operator.

Signed-off-by: Masahiro Yamada 
Cc: Andy Lutomirski 
Cc: Linus Torvalds 
Cc: Peter Zijlstra 
Cc: Thomas Gleixner 
Link: 
http://lkml.kernel.org/r/1530582614-5173-3-git-send-email-yamada.masah...@socionext.com
Signed-off-by: Ingo Molnar 
---
 arch/x86/entry/vdso/Makefile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile
index 261802b1cc50..b9ed1aa53a26 100644
--- a/arch/x86/entry/vdso/Makefile
+++ b/arch/x86/entry/vdso/Makefile
@@ -58,9 +58,7 @@ HOST_EXTRACFLAGS += -I$(srctree)/tools/include 
-I$(srctree)/include/uapi -I$(src
 hostprogs-y+= vdso2c
 
 quiet_cmd_vdso2c = VDSO2C  $@
-define cmd_vdso2c
-   $(obj)/vdso2c $< $(<:%.dbg=%) $@
-endef
+  cmd_vdso2c = $(obj)/vdso2c $< $(<:%.dbg=%) $@
 
 $(obj)/vdso-image-%.c: $(obj)/vdso%.so.dbg $(obj)/vdso%.so $(obj)/vdso2c FORCE
$(call if_changed,vdso2c)

[tip:x86/asm] x86/build/vdso: Remove unused vdso-syms.lds

2018-07-03 Thread tip-bot for Masahiro Yamada 
Commit-ID:  b5722a457b6e5eabd97a7f39c6c2b8e9a623ab15
Gitweb: https://git.kernel.org/tip/b5722a457b6e5eabd97a7f39c6c2b8e9a623ab15
Author: Masahiro Yamada 
AuthorDate: Tue, 3 Jul 2018 10:50:13 +0900
Committer:  Ingo Molnar 
CommitDate: Tue, 3 Jul 2018 09:20:07 +0200

x86/build/vdso: Remove unused vdso-syms.lds

This file contains symbol values, and was originally linked into
vmlinux, but I have no idea what it was actually used for.

Since the following commit:

  827880ec260b ("x86/um: thin archives build fix")

it is not even linked.  Now it is completely orphan, and no problem has
been reported.  It is a proof that this file was not needed in the
first place.

Signed-off-by: Masahiro Yamada 
Acked-by: Richard Weinberger 
Cc: Andy Lutomirski 
Cc: Jeff Dike 
Cc: Linus Torvalds 
Cc: Peter Zijlstra 
Cc: Thomas Gleixner 
Cc: linux...@lists.infradead.org
Link: 
http://lkml.kernel.org/r/1530582614-5173-2-git-send-email-yamada.masah...@socionext.com
Signed-off-by: Ingo Molnar 
---
 arch/x86/um/vdso/.gitignore |  1 -
 arch/x86/um/vdso/Makefile   | 16 
 2 files changed, 17 deletions(-)

diff --git a/arch/x86/um/vdso/.gitignore b/arch/x86/um/vdso/.gitignore
index 9cac6d072199..f8b69d84238e 100644
--- a/arch/x86/um/vdso/.gitignore
+++ b/arch/x86/um/vdso/.gitignore
@@ -1,2 +1 @@
-vdso-syms.lds
 vdso.lds
diff --git a/arch/x86/um/vdso/Makefile b/arch/x86/um/vdso/Makefile
index b2d6967262b2..822ccdba93ad 100644
--- a/arch/x86/um/vdso/Makefile
+++ b/arch/x86/um/vdso/Makefile
@@ -53,22 +53,6 @@ $(vobjs): KBUILD_CFLAGS += $(CFL)
 CFLAGS_REMOVE_vdso-note.o = -pg -fprofile-arcs -ftest-coverage
 CFLAGS_REMOVE_um_vdso.o = -pg -fprofile-arcs -ftest-coverage
 
-targets += vdso-syms.lds
-extra-$(VDSO64-y)  += vdso-syms.lds
-
-#
-# Match symbols in the DSO that look like VDSO*; produce a file of constants.
-#
-sed-vdsosym := -e 's/^00*/0/' \
-   -e 's/^\([0-9a-fA-F]*\) . \(VDSO[a-zA-Z0-9_]*\)$$/\2 = 0x\1;/p'
-quiet_cmd_vdsosym = VDSOSYM $@
-define cmd_vdsosym
-   $(NM) $< | LC_ALL=C sed -n $(sed-vdsosym) | LC_ALL=C sort > $@
-endef
-
-$(obj)/%-syms.lds: $(obj)/%.so.dbg FORCE
-   $(call if_changed,vdsosym)
-
 #
 # The DSO images are built using a special linker script.
 #

[tip:x86/build] x86/build/vdso: Put generated linker scripts to $(obj)/

2018-05-14 Thread tip-bot for Masahiro Yamada 
Commit-ID:  1742ed2088ccc4ade3abd8fe888742dd0f1343f8
Gitweb: https://git.kernel.org/tip/1742ed2088ccc4ade3abd8fe888742dd0f1343f8
Author: Masahiro Yamada 
AuthorDate: Tue, 15 May 2018 11:52:24 +0900
Committer:  Ingo Molnar 
CommitDate: Tue, 15 May 2018 07:32:42 +0200

x86/build/vdso: Put generated linker scripts to $(obj)/

Let's put generated files to $(obj)/ rather than $(src)/ although
this is just a matter of taste because both are the same.

Signed-off-by: Masahiro Yamada 
Cc: Andy Lutomirski 
Cc: Jeff Dike 
Cc: Linus Torvalds 
Cc: Peter Zijlstra 
Cc: Richard Weinberger 
Cc: Thomas Gleixner 
Cc: user-mode-linux-de...@lists.sourceforge.net
Cc: user-mode-linux-u...@lists.sourceforge.net
Link: 
http://lkml.kernel.org/r/1526352744-28229-4-git-send-email-yamada.masah...@socionext.com
Signed-off-by: Ingo Molnar 
---
 arch/x86/entry/vdso/Makefile | 4 ++--
 arch/x86/um/vdso/Makefile| 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile
index 690df4c6b40a..261802b1cc50 100644
--- a/arch/x86/entry/vdso/Makefile
+++ b/arch/x86/entry/vdso/Makefile
@@ -51,7 +51,7 @@ VDSO_LDFLAGS_vdso.lds = -m64 -Wl,-soname=linux-vdso.so.1 \
-Wl,-z,max-page-size=4096 -Wl,-z,common-page-size=4096 \
$(DISABLE_LTO)
 
-$(obj)/vdso64.so.dbg: $(src)/vdso.lds $(vobjs) FORCE
+$(obj)/vdso64.so.dbg: $(obj)/vdso.lds $(vobjs) FORCE
$(call if_changed,vdso)
 
 HOST_EXTRACFLAGS += -I$(srctree)/tools/include -I$(srctree)/include/uapi 
-I$(srctree)/arch/$(SUBARCH)/include/uapi
@@ -119,7 +119,7 @@ $(obj)/%.so: OBJCOPYFLAGS := -S
 $(obj)/%.so: $(obj)/%.so.dbg
$(call if_changed,objcopy)
 
-$(obj)/vdsox32.so.dbg: $(src)/vdsox32.lds $(vobjx32s) FORCE
+$(obj)/vdsox32.so.dbg: $(obj)/vdsox32.lds $(vobjx32s) FORCE
$(call if_changed,vdso)
 
 CPPFLAGS_vdso32.lds = $(CPPFLAGS_vdso.lds)
diff --git a/arch/x86/um/vdso/Makefile b/arch/x86/um/vdso/Makefile
index e51d95c9098c..b2d6967262b2 100644
--- a/arch/x86/um/vdso/Makefile
+++ b/arch/x86/um/vdso/Makefile
@@ -30,7 +30,7 @@ VDSO_LDFLAGS_vdso.lds = -m64 -Wl,-soname=linux-vdso.so.1 \
 
 $(obj)/vdso.o: $(src)/vdso.S $(obj)/vdso.so
 
-$(obj)/vdso.so.dbg: $(src)/vdso.lds $(vobjs) FORCE
+$(obj)/vdso.so.dbg: $(obj)/vdso.lds $(vobjs) FORCE
$(call if_changed,vdso)
 
 $(obj)/%.so: OBJCOPYFLAGS := -S

[tip:x86/build] x86/build/vdso: Remove unnecessary export in Makefile

2018-05-14 Thread tip-bot for Masahiro Yamada 
Commit-ID:  61615faf0a8968b604bd279fec5cb834ba59ed58
Gitweb: https://git.kernel.org/tip/61615faf0a8968b604bd279fec5cb834ba59ed58
Author: Masahiro Yamada 
AuthorDate: Tue, 15 May 2018 11:52:23 +0900
Committer:  Ingo Molnar 
CommitDate: Tue, 15 May 2018 07:32:42 +0200

x86/build/vdso: Remove unnecessary export in Makefile

CPPFLAGS_vdso.lds is assigned and referenced internally in each
Makefile.  No need to export it.

Signed-off-by: Masahiro Yamada 
Cc: Andy Lutomirski 
Cc: Jeff Dike 
Cc: Linus Torvalds 
Cc: Peter Zijlstra 
Cc: Richard Weinberger 
Cc: Thomas Gleixner 
Cc: user-mode-linux-de...@lists.sourceforge.net
Cc: user-mode-linux-u...@lists.sourceforge.net
Link: 
http://lkml.kernel.org/r/1526352744-28229-3-git-send-email-yamada.masah...@socionext.com
Signed-off-by: Ingo Molnar 
---
 arch/x86/entry/vdso/Makefile | 2 +-
 arch/x86/um/vdso/Makefile| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile
index 298850683ee2..690df4c6b40a 100644
--- a/arch/x86/entry/vdso/Makefile
+++ b/arch/x86/entry/vdso/Makefile
@@ -44,7 +44,7 @@ obj-y += $(vdso_img_objs)
 targets += $(vdso_img_cfiles)
 targets += $(vdso_img_sodbg) $(vdso_img-y:%=vdso%.so)
 
-export CPPFLAGS_vdso.lds += -P -C
+CPPFLAGS_vdso.lds += -P -C
 
 VDSO_LDFLAGS_vdso.lds = -m64 -Wl,-soname=linux-vdso.so.1 \
-Wl,--no-undefined \
diff --git a/arch/x86/um/vdso/Makefile b/arch/x86/um/vdso/Makefile
index 10003359e633..e51d95c9098c 100644
--- a/arch/x86/um/vdso/Makefile
+++ b/arch/x86/um/vdso/Makefile
@@ -23,7 +23,7 @@ $(obj)/vdso.o: $(obj)/vdso.so
 
 targets += vdso.so vdso.so.dbg vdso.lds $(vobjs-y)
 
-export CPPFLAGS_vdso.lds += -P -C
+CPPFLAGS_vdso.lds += -P -C
 
 VDSO_LDFLAGS_vdso.lds = -m64 -Wl,-soname=linux-vdso.so.1 \
-Wl,-z,max-page-size=4096 -Wl,-z,common-page-size=4096

[tip:x86/build] x86/build/vdso: Put generated linker scripts to $(obj)/

2018-05-14 Thread tip-bot for Masahiro Yamada 
Commit-ID:  1742ed2088ccc4ade3abd8fe888742dd0f1343f8
Gitweb: https://git.kernel.org/tip/1742ed2088ccc4ade3abd8fe888742dd0f1343f8
Author: Masahiro Yamada 
AuthorDate: Tue, 15 May 2018 11:52:24 +0900
Committer:  Ingo Molnar 
CommitDate: Tue, 15 May 2018 07:32:42 +0200

x86/build/vdso: Put generated linker scripts to $(obj)/

Let's put generated files to $(obj)/ rather than $(src)/ although
this is just a matter of taste because both are the same.

Signed-off-by: Masahiro Yamada 
Cc: Andy Lutomirski 
Cc: Jeff Dike 
Cc: Linus Torvalds 
Cc: Peter Zijlstra 
Cc: Richard Weinberger 
Cc: Thomas Gleixner 
Cc: user-mode-linux-de...@lists.sourceforge.net
Cc: user-mode-linux-u...@lists.sourceforge.net
Link: 
http://lkml.kernel.org/r/1526352744-28229-4-git-send-email-yamada.masah...@socionext.com
Signed-off-by: Ingo Molnar 
---
 arch/x86/entry/vdso/Makefile | 4 ++--
 arch/x86/um/vdso/Makefile| 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile
index 690df4c6b40a..261802b1cc50 100644
--- a/arch/x86/entry/vdso/Makefile
+++ b/arch/x86/entry/vdso/Makefile
@@ -51,7 +51,7 @@ VDSO_LDFLAGS_vdso.lds = -m64 -Wl,-soname=linux-vdso.so.1 \
-Wl,-z,max-page-size=4096 -Wl,-z,common-page-size=4096 \
$(DISABLE_LTO)
 
-$(obj)/vdso64.so.dbg: $(src)/vdso.lds $(vobjs) FORCE
+$(obj)/vdso64.so.dbg: $(obj)/vdso.lds $(vobjs) FORCE
$(call if_changed,vdso)
 
 HOST_EXTRACFLAGS += -I$(srctree)/tools/include -I$(srctree)/include/uapi 
-I$(srctree)/arch/$(SUBARCH)/include/uapi
@@ -119,7 +119,7 @@ $(obj)/%.so: OBJCOPYFLAGS := -S
 $(obj)/%.so: $(obj)/%.so.dbg
$(call if_changed,objcopy)
 
-$(obj)/vdsox32.so.dbg: $(src)/vdsox32.lds $(vobjx32s) FORCE
+$(obj)/vdsox32.so.dbg: $(obj)/vdsox32.lds $(vobjx32s) FORCE
$(call if_changed,vdso)
 
 CPPFLAGS_vdso32.lds = $(CPPFLAGS_vdso.lds)
diff --git a/arch/x86/um/vdso/Makefile b/arch/x86/um/vdso/Makefile
index e51d95c9098c..b2d6967262b2 100644
--- a/arch/x86/um/vdso/Makefile
+++ b/arch/x86/um/vdso/Makefile
@@ -30,7 +30,7 @@ VDSO_LDFLAGS_vdso.lds = -m64 -Wl,-soname=linux-vdso.so.1 \
 
 $(obj)/vdso.o: $(src)/vdso.S $(obj)/vdso.so
 
-$(obj)/vdso.so.dbg: $(src)/vdso.lds $(vobjs) FORCE
+$(obj)/vdso.so.dbg: $(obj)/vdso.lds $(vobjs) FORCE
$(call if_changed,vdso)
 
 $(obj)/%.so: OBJCOPYFLAGS := -S

[tip:x86/build] x86/build/vdso: Remove unnecessary export in Makefile

2018-05-14 Thread tip-bot for Masahiro Yamada 
Commit-ID:  61615faf0a8968b604bd279fec5cb834ba59ed58
Gitweb: https://git.kernel.org/tip/61615faf0a8968b604bd279fec5cb834ba59ed58
Author: Masahiro Yamada 
AuthorDate: Tue, 15 May 2018 11:52:23 +0900
Committer:  Ingo Molnar 
CommitDate: Tue, 15 May 2018 07:32:42 +0200

x86/build/vdso: Remove unnecessary export in Makefile

CPPFLAGS_vdso.lds is assigned and referenced internally in each
Makefile.  No need to export it.

Signed-off-by: Masahiro Yamada 
Cc: Andy Lutomirski 
Cc: Jeff Dike 
Cc: Linus Torvalds 
Cc: Peter Zijlstra 
Cc: Richard Weinberger 
Cc: Thomas Gleixner 
Cc: user-mode-linux-de...@lists.sourceforge.net
Cc: user-mode-linux-u...@lists.sourceforge.net
Link: 
http://lkml.kernel.org/r/1526352744-28229-3-git-send-email-yamada.masah...@socionext.com
Signed-off-by: Ingo Molnar 
---
 arch/x86/entry/vdso/Makefile | 2 +-
 arch/x86/um/vdso/Makefile| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile
index 298850683ee2..690df4c6b40a 100644
--- a/arch/x86/entry/vdso/Makefile
+++ b/arch/x86/entry/vdso/Makefile
@@ -44,7 +44,7 @@ obj-y += $(vdso_img_objs)
 targets += $(vdso_img_cfiles)
 targets += $(vdso_img_sodbg) $(vdso_img-y:%=vdso%.so)
 
-export CPPFLAGS_vdso.lds += -P -C
+CPPFLAGS_vdso.lds += -P -C
 
 VDSO_LDFLAGS_vdso.lds = -m64 -Wl,-soname=linux-vdso.so.1 \
-Wl,--no-undefined \
diff --git a/arch/x86/um/vdso/Makefile b/arch/x86/um/vdso/Makefile
index 10003359e633..e51d95c9098c 100644
--- a/arch/x86/um/vdso/Makefile
+++ b/arch/x86/um/vdso/Makefile
@@ -23,7 +23,7 @@ $(obj)/vdso.o: $(obj)/vdso.so
 
 targets += vdso.so vdso.so.dbg vdso.lds $(vobjs-y)
 
-export CPPFLAGS_vdso.lds += -P -C
+CPPFLAGS_vdso.lds += -P -C
 
 VDSO_LDFLAGS_vdso.lds = -m64 -Wl,-soname=linux-vdso.so.1 \
-Wl,-z,max-page-size=4096 -Wl,-z,common-page-size=4096

[tip:x86/build] x86/build/vdso: Remove unused $(vobjs-nox32) in Makefile

2018-05-14 Thread tip-bot for Masahiro Yamada 
Commit-ID:  b3656612118f8961182f988168c835f023f0408a
Gitweb: https://git.kernel.org/tip/b3656612118f8961182f988168c835f023f0408a
Author: Masahiro Yamada 
AuthorDate: Tue, 15 May 2018 11:52:22 +0900
Committer:  Ingo Molnar 
CommitDate: Tue, 15 May 2018 07:32:42 +0200

x86/build/vdso: Remove unused $(vobjs-nox32) in Makefile

Since commit bfad381c0d1e ("x86/vdso: Improve the fake section
headers"), $(vobjs-nox32) is empty.  Therefore, $(vobjs64-for-x32)
is the same as $(vobjs-y).

Signed-off-by: Masahiro Yamada 
Cc: Andy Lutomirski 
Cc: Linus Torvalds 
Cc: Peter Zijlstra 
Cc: Thomas Gleixner 
Link: 
http://lkml.kernel.org/r/1526352744-28229-2-git-send-email-yamada.masah...@socionext.com
Signed-off-by: Ingo Molnar 
---
 arch/x86/entry/vdso/Makefile | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile
index d998a487c9b1..298850683ee2 100644
--- a/arch/x86/entry/vdso/Makefile
+++ b/arch/x86/entry/vdso/Makefile
@@ -100,11 +100,8 @@ VDSO_LDFLAGS_vdsox32.lds = -Wl,-m,elf32_x86_64 \
   -Wl,-z,max-page-size=4096 \
   -Wl,-z,common-page-size=4096
 
-# 64-bit objects to re-brand as x32
-vobjs64-for-x32 := $(filter-out $(vobjs-nox32),$(vobjs-y))
-
 # x32-rebranded versions
-vobjx32s-y := $(vobjs64-for-x32:.o=-x32.o)
+vobjx32s-y := $(vobjs-y:.o=-x32.o)
 
 # same thing, but in the output directory
 vobjx32s := $(foreach F,$(vobjx32s-y),$(obj)/$F)

[tip:x86/build] x86/build/vdso: Remove unused $(vobjs-nox32) in Makefile

2018-05-14 Thread tip-bot for Masahiro Yamada 
Commit-ID:  b3656612118f8961182f988168c835f023f0408a
Gitweb: https://git.kernel.org/tip/b3656612118f8961182f988168c835f023f0408a
Author: Masahiro Yamada 
AuthorDate: Tue, 15 May 2018 11:52:22 +0900
Committer:  Ingo Molnar 
CommitDate: Tue, 15 May 2018 07:32:42 +0200

x86/build/vdso: Remove unused $(vobjs-nox32) in Makefile

Since commit bfad381c0d1e ("x86/vdso: Improve the fake section
headers"), $(vobjs-nox32) is empty.  Therefore, $(vobjs64-for-x32)
is the same as $(vobjs-y).

Signed-off-by: Masahiro Yamada 
Cc: Andy Lutomirski 
Cc: Linus Torvalds 
Cc: Peter Zijlstra 
Cc: Thomas Gleixner 
Link: 
http://lkml.kernel.org/r/1526352744-28229-2-git-send-email-yamada.masah...@socionext.com
Signed-off-by: Ingo Molnar 
---
 arch/x86/entry/vdso/Makefile | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile
index d998a487c9b1..298850683ee2 100644
--- a/arch/x86/entry/vdso/Makefile
+++ b/arch/x86/entry/vdso/Makefile
@@ -100,11 +100,8 @@ VDSO_LDFLAGS_vdsox32.lds = -Wl,-m,elf32_x86_64 \
   -Wl,-z,max-page-size=4096 \
   -Wl,-z,common-page-size=4096
 
-# 64-bit objects to re-brand as x32
-vobjs64-for-x32 := $(filter-out $(vobjs-nox32),$(vobjs-y))
-
 # x32-rebranded versions
-vobjx32s-y := $(vobjs64-for-x32:.o=-x32.o)
+vobjx32s-y := $(vobjs-y:.o=-x32.o)
 
 # same thing, but in the output directory
 vobjx32s := $(foreach F,$(vobjx32s-y),$(obj)/$F)

[tip:x86/build] x86/build: Remove no-op macro VMLINUX_SYMBOL()

2018-05-13 Thread tip-bot for Masahiro Yamada 
Commit-ID:  2a7ffe465769bc15cb4a77f6a71e6f071d644068
Gitweb: https://git.kernel.org/tip/2a7ffe465769bc15cb4a77f6a71e6f071d644068
Author: Masahiro Yamada 
AuthorDate: Wed, 9 May 2018 16:49:34 +0900
Committer:  Thomas Gleixner 
CommitDate: Sun, 13 May 2018 15:11:34 +0200

x86/build: Remove no-op macro VMLINUX_SYMBOL()

VMLINUX_SYMBOL() is no-op unless CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX
is defined.  It has ever been selected only by BLACKFIN and METAG.
VMLINUX_SYMBOL() is unneeded for x86-specific code.

Signed-off-by: Masahiro Yamada 
Signed-off-by: Thomas Gleixner 
Cc: linux-arch 
Cc: "H. Peter Anvin" 
Link: 
https://lkml.kernel.org/r/1525852174-29022-1-git-send-email-yamada.masah...@socionext.com

---
 arch/x86/kernel/vmlinux.lds.S | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
index 795f3a80e576..5e1458f609a1 100644
--- a/arch/x86/kernel/vmlinux.lds.S
+++ b/arch/x86/kernel/vmlinux.lds.S
@@ -117,11 +117,11 @@ SECTIONS
 
 #ifdef CONFIG_X86_64
. = ALIGN(PAGE_SIZE);
-   VMLINUX_SYMBOL(__entry_trampoline_start) = .;
+   __entry_trampoline_start = .;
_entry_trampoline = .;
*(.entry_trampoline)
. = ALIGN(PAGE_SIZE);
-   VMLINUX_SYMBOL(__entry_trampoline_end) = .;
+   __entry_trampoline_end = .;
ASSERT(. - _entry_trampoline == PAGE_SIZE, "entry trampoline is 
too big");
 #endif

[tip:x86/build] x86/build: Remove no-op macro VMLINUX_SYMBOL()

2018-05-13 Thread tip-bot for Masahiro Yamada 
Commit-ID:  2a7ffe465769bc15cb4a77f6a71e6f071d644068
Gitweb: https://git.kernel.org/tip/2a7ffe465769bc15cb4a77f6a71e6f071d644068
Author: Masahiro Yamada 
AuthorDate: Wed, 9 May 2018 16:49:34 +0900
Committer:  Thomas Gleixner 
CommitDate: Sun, 13 May 2018 15:11:34 +0200

x86/build: Remove no-op macro VMLINUX_SYMBOL()

VMLINUX_SYMBOL() is no-op unless CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX
is defined.  It has ever been selected only by BLACKFIN and METAG.
VMLINUX_SYMBOL() is unneeded for x86-specific code.

Signed-off-by: Masahiro Yamada 
Signed-off-by: Thomas Gleixner 
Cc: linux-arch 
Cc: "H. Peter Anvin" 
Link: 
https://lkml.kernel.org/r/1525852174-29022-1-git-send-email-yamada.masah...@socionext.com

---
 arch/x86/kernel/vmlinux.lds.S | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
index 795f3a80e576..5e1458f609a1 100644
--- a/arch/x86/kernel/vmlinux.lds.S
+++ b/arch/x86/kernel/vmlinux.lds.S
@@ -117,11 +117,11 @@ SECTIONS
 
 #ifdef CONFIG_X86_64
. = ALIGN(PAGE_SIZE);
-   VMLINUX_SYMBOL(__entry_trampoline_start) = .;
+   __entry_trampoline_start = .;
_entry_trampoline = .;
*(.entry_trampoline)
. = ALIGN(PAGE_SIZE);
-   VMLINUX_SYMBOL(__entry_trampoline_end) = .;
+   __entry_trampoline_end = .;
ASSERT(. - _entry_trampoline == PAGE_SIZE, "entry trampoline is 
too big");
 #endif

[tip:timers/urgent] clocksource/atmel-st: Add 'depends on HAS_IOMEM' to fix unmet dependency

2018-03-09 Thread tip-bot for Masahiro Yamada 
Commit-ID:  bd2746f09e1d8e37164f53b846f5225f3d36ee2d
Gitweb: https://git.kernel.org/tip/bd2746f09e1d8e37164f53b846f5225f3d36ee2d
Author: Masahiro Yamada 
AuthorDate: Tue, 6 Mar 2018 20:20:33 +0900
Committer:  Thomas Gleixner 
CommitDate: Fri, 9 Mar 2018 11:11:58 +0100

clocksource/atmel-st: Add 'depends on HAS_IOMEM' to fix unmet dependency

The ATMEL_ST config selects MFD_SYSCON, but does not depend on HAS_IOMEM.

Compile testing on architecture without HAS_IOMEM causes "unmet direct
dependencies" in Kconfig phase. Detected by "make ARCH=score allyesconfig".

Add the proper dependency to the ATMEL_ST config.

Signed-off-by: Masahiro Yamada 
Signed-off-by: Thomas Gleixner 
Cc: Daniel Lezcano 
Cc: Arnd Bergmann 
Link: 
https://lkml.kernel.org/r/1520335233-11277-1-git-send-email-yamada.masah...@socionext.com

---
 drivers/clocksource/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
index b3b4ed9b6874..d2e5382821a4 100644
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@ -386,6 +386,7 @@ config ATMEL_PIT
 
 config ATMEL_ST
bool "Atmel ST timer support" if COMPILE_TEST
+   depends on HAS_IOMEM
select TIMER_OF
select MFD_SYSCON
help

[tip:timers/urgent] clocksource/atmel-st: Add 'depends on HAS_IOMEM' to fix unmet dependency

2018-03-09 Thread tip-bot for Masahiro Yamada 
Commit-ID:  bd2746f09e1d8e37164f53b846f5225f3d36ee2d
Gitweb: https://git.kernel.org/tip/bd2746f09e1d8e37164f53b846f5225f3d36ee2d
Author: Masahiro Yamada 
AuthorDate: Tue, 6 Mar 2018 20:20:33 +0900
Committer:  Thomas Gleixner 
CommitDate: Fri, 9 Mar 2018 11:11:58 +0100

clocksource/atmel-st: Add 'depends on HAS_IOMEM' to fix unmet dependency

The ATMEL_ST config selects MFD_SYSCON, but does not depend on HAS_IOMEM.

Compile testing on architecture without HAS_IOMEM causes "unmet direct
dependencies" in Kconfig phase. Detected by "make ARCH=score allyesconfig".

Add the proper dependency to the ATMEL_ST config.

Signed-off-by: Masahiro Yamada 
Signed-off-by: Thomas Gleixner 
Cc: Daniel Lezcano 
Cc: Arnd Bergmann 
Link: 
https://lkml.kernel.org/r/1520335233-11277-1-git-send-email-yamada.masah...@socionext.com

---
 drivers/clocksource/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
index b3b4ed9b6874..d2e5382821a4 100644
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@ -386,6 +386,7 @@ config ATMEL_PIT
 
 config ATMEL_ST
bool "Atmel ST timer support" if COMPILE_TEST
+   depends on HAS_IOMEM
select TIMER_OF
select MFD_SYSCON
help

[tip:x86/build] x86/build: Beautify build log of syscall headers

2017-10-27 Thread tip-bot for Masahiro Yamada 
Commit-ID:  af8e947079a7dab0480b5d6db6b093fd04b86fc9
Gitweb: https://git.kernel.org/tip/af8e947079a7dab0480b5d6db6b093fd04b86fc9
Author: Masahiro Yamada 
AuthorDate: Fri, 27 Oct 2017 13:11:10 +0900
Committer:  Ingo Molnar 
CommitDate: Fri, 27 Oct 2017 10:22:45 +0200

x86/build: Beautify build log of syscall headers

This makes the build log look nicer.

Before:
  SYSTBL  arch/x86/entry/syscalls/../../include/generated/asm/syscalls_32.h
  SYSHDR  arch/x86/entry/syscalls/../../include/generated/asm/unistd_32_ia32.h
  SYSHDR  arch/x86/entry/syscalls/../../include/generated/asm/unistd_64_x32.h
  SYSTBL  arch/x86/entry/syscalls/../../include/generated/asm/syscalls_64.h
  SYSHDR  arch/x86/entry/syscalls/../../include/generated/uapi/asm/unistd_32.h
  SYSHDR  arch/x86/entry/syscalls/../../include/generated/uapi/asm/unistd_64.h
  SYSHDR  arch/x86/entry/syscalls/../../include/generated/uapi/asm/unistd_x32.h

After:
  SYSTBL  arch/x86/include/generated/asm/syscalls_32.h
  SYSHDR  arch/x86/include/generated/asm/unistd_32_ia32.h
  SYSHDR  arch/x86/include/generated/asm/unistd_64_x32.h
  SYSTBL  arch/x86/include/generated/asm/syscalls_64.h
  SYSHDR  arch/x86/include/generated/uapi/asm/unistd_32.h
  SYSHDR  arch/x86/include/generated/uapi/asm/unistd_64.h
  SYSHDR  arch/x86/include/generated/uapi/asm/unistd_x32.h

Signed-off-by: Masahiro Yamada 
Acked-by: Thomas Gleixner 
Cc: Linus Torvalds 
Cc: Peter Zijlstra 
Cc: "H. Peter Anvin" 
Cc: linux-kbu...@vger.kernel.org
Link: 
http://lkml.kernel.org/r/1509077470-2735-1-git-send-email-yamada.masah...@socionext.com
Signed-off-by: Ingo Molnar 
---
 arch/x86/entry/syscalls/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/entry/syscalls/Makefile b/arch/x86/entry/syscalls/Makefile
index 57aa59f..e34c7a9 100644
--- a/arch/x86/entry/syscalls/Makefile
+++ b/arch/x86/entry/syscalls/Makefile
@@ -1,5 +1,5 @@
-out := $(obj)/../../include/generated/asm
-uapi := $(obj)/../../include/generated/uapi/asm
+out := arch/$(SRCARCH)/include/generated/asm
+uapi := arch/$(SRCARCH)/include/generated/uapi/asm
 
 # Create output directory if not already present
 _dummy := $(shell [ -d '$(out)' ] || mkdir -p '$(out)') \

[tip:x86/build] x86/build: Beautify build log of syscall headers

2017-10-27 Thread tip-bot for Masahiro Yamada 
Commit-ID:  af8e947079a7dab0480b5d6db6b093fd04b86fc9
Gitweb: https://git.kernel.org/tip/af8e947079a7dab0480b5d6db6b093fd04b86fc9
Author: Masahiro Yamada 
AuthorDate: Fri, 27 Oct 2017 13:11:10 +0900
Committer:  Ingo Molnar 
CommitDate: Fri, 27 Oct 2017 10:22:45 +0200

x86/build: Beautify build log of syscall headers

This makes the build log look nicer.

Before:
  SYSTBL  arch/x86/entry/syscalls/../../include/generated/asm/syscalls_32.h
  SYSHDR  arch/x86/entry/syscalls/../../include/generated/asm/unistd_32_ia32.h
  SYSHDR  arch/x86/entry/syscalls/../../include/generated/asm/unistd_64_x32.h
  SYSTBL  arch/x86/entry/syscalls/../../include/generated/asm/syscalls_64.h
  SYSHDR  arch/x86/entry/syscalls/../../include/generated/uapi/asm/unistd_32.h
  SYSHDR  arch/x86/entry/syscalls/../../include/generated/uapi/asm/unistd_64.h
  SYSHDR  arch/x86/entry/syscalls/../../include/generated/uapi/asm/unistd_x32.h

After:
  SYSTBL  arch/x86/include/generated/asm/syscalls_32.h
  SYSHDR  arch/x86/include/generated/asm/unistd_32_ia32.h
  SYSHDR  arch/x86/include/generated/asm/unistd_64_x32.h
  SYSTBL  arch/x86/include/generated/asm/syscalls_64.h
  SYSHDR  arch/x86/include/generated/uapi/asm/unistd_32.h
  SYSHDR  arch/x86/include/generated/uapi/asm/unistd_64.h
  SYSHDR  arch/x86/include/generated/uapi/asm/unistd_x32.h

Signed-off-by: Masahiro Yamada 
Acked-by: Thomas Gleixner 
Cc: Linus Torvalds 
Cc: Peter Zijlstra 
Cc: "H. Peter Anvin" 
Cc: linux-kbu...@vger.kernel.org
Link: 
http://lkml.kernel.org/r/1509077470-2735-1-git-send-email-yamada.masah...@socionext.com
Signed-off-by: Ingo Molnar 
---
 arch/x86/entry/syscalls/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/entry/syscalls/Makefile b/arch/x86/entry/syscalls/Makefile
index 57aa59f..e34c7a9 100644
--- a/arch/x86/entry/syscalls/Makefile
+++ b/arch/x86/entry/syscalls/Makefile
@@ -1,5 +1,5 @@
-out := $(obj)/../../include/generated/asm
-uapi := $(obj)/../../include/generated/uapi/asm
+out := arch/$(SRCARCH)/include/generated/asm
+uapi := arch/$(SRCARCH)/include/generated/uapi/asm
 
 # Create output directory if not already present
 _dummy := $(shell [ -d '$(out)' ] || mkdir -p '$(out)') \

[tip:x86/boot] x86/boot: Remove unnecessary #include

2017-10-11 Thread tip-bot for Masahiro Yamada 
Commit-ID:  dc0fdf7d2bf9e7efdc690b8a594e39de5b3a993b
Gitweb: https://git.kernel.org/tip/dc0fdf7d2bf9e7efdc690b8a594e39de5b3a993b
Author: Masahiro Yamada 
AuthorDate: Thu, 21 Sep 2017 00:27:12 +0900
Committer:  Ingo Molnar 
CommitDate: Wed, 11 Oct 2017 16:46:23 +0200

x86/boot: Remove unnecessary #include 

The  defines UTS_RELEASE, but I do not
see any reference to it in arch/x86/boot/header.S.

Signed-off-by: Masahiro Yamada 
Cc: Linus Torvalds 
Cc: Peter Zijlstra 
Cc: Thomas Gleixner 
Link: 
http://lkml.kernel.org/r/1505921232-8960-1-git-send-email-yamada.masah...@socionext.com
Signed-off-by: Ingo Molnar 
---
 arch/x86/boot/header.S | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S
index 1bb08ec..16c516b 100644
--- a/arch/x86/boot/header.S
+++ b/arch/x86/boot/header.S
@@ -16,7 +16,6 @@
  */
 
 #include 
-#include 
 #include 
 #include 
 #include

[tip:x86/boot] x86/boot: Remove unnecessary #include

2017-10-11 Thread tip-bot for Masahiro Yamada 
Commit-ID:  dc0fdf7d2bf9e7efdc690b8a594e39de5b3a993b
Gitweb: https://git.kernel.org/tip/dc0fdf7d2bf9e7efdc690b8a594e39de5b3a993b
Author: Masahiro Yamada 
AuthorDate: Thu, 21 Sep 2017 00:27:12 +0900
Committer:  Ingo Molnar 
CommitDate: Wed, 11 Oct 2017 16:46:23 +0200

x86/boot: Remove unnecessary #include 

The  defines UTS_RELEASE, but I do not
see any reference to it in arch/x86/boot/header.S.

Signed-off-by: Masahiro Yamada 
Cc: Linus Torvalds 
Cc: Peter Zijlstra 
Cc: Thomas Gleixner 
Link: 
http://lkml.kernel.org/r/1505921232-8960-1-git-send-email-yamada.masah...@socionext.com
Signed-off-by: Ingo Molnar 
---
 arch/x86/boot/header.S | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S
index 1bb08ec..16c516b 100644
--- a/arch/x86/boot/header.S
+++ b/arch/x86/boot/header.S
@@ -16,7 +16,6 @@
  */
 
 #include 
-#include 
 #include 
 #include 
 #include

[tip:irq/core] genirq: Fix for_each_action_of_desc() macro

2017-08-14 Thread tip-bot for Masahiro Yamada 
Commit-ID:  163616cf2f6ab7a8e37452ec00320039ab65bd45
Gitweb: http://git.kernel.org/tip/163616cf2f6ab7a8e37452ec00320039ab65bd45
Author: Masahiro Yamada 
AuthorDate: Wed, 9 Aug 2017 15:32:21 +0900
Committer:  Thomas Gleixner 
CommitDate: Mon, 14 Aug 2017 12:10:37 +0200

genirq: Fix for_each_action_of_desc() macro

struct irq_desc does not have a member named "act".  The correct
name is "action".

Currently, all users of this macro use an iterator named "action".
If a different name is used, it will cause a build error.

Fixes: f944b5a7aff0 ("genirq: Use a common macro to go through the actions 
list")
Signed-off-by: Masahiro Yamada 
Signed-off-by: Thomas Gleixner 
Cc: Marc Zyngier 
Cc: Daniel Lezcano 
Cc: Jason Cooper 
Link: 
http://lkml.kernel.org/r/1502260341-28184-1-git-send-email-yamada.masah...@socionext.com
---
 kernel/irq/internals.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/irq/internals.h b/kernel/irq/internals.h
index a2c4805..a4aa390 100644
--- a/kernel/irq/internals.h
+++ b/kernel/irq/internals.h
@@ -151,7 +151,7 @@ static inline void chip_bus_sync_unlock(struct irq_desc 
*desc)
 #define IRQ_GET_DESC_CHECK_PERCPU  (_IRQ_DESC_CHECK | _IRQ_DESC_PERCPU)
 
 #define for_each_action_of_desc(desc, act) \
-   for (act = desc->act; act; act = act->next)
+   for (act = desc->action; act; act = act->next)
 
 struct irq_desc *
 __irq_get_desc_lock(unsigned int irq, unsigned long *flags, bool bus,

[tip:irq/core] genirq: Fix for_each_action_of_desc() macro

2017-08-14 Thread tip-bot for Masahiro Yamada 
Commit-ID:  163616cf2f6ab7a8e37452ec00320039ab65bd45
Gitweb: http://git.kernel.org/tip/163616cf2f6ab7a8e37452ec00320039ab65bd45
Author: Masahiro Yamada 
AuthorDate: Wed, 9 Aug 2017 15:32:21 +0900
Committer:  Thomas Gleixner 
CommitDate: Mon, 14 Aug 2017 12:10:37 +0200

genirq: Fix for_each_action_of_desc() macro

struct irq_desc does not have a member named "act".  The correct
name is "action".

Currently, all users of this macro use an iterator named "action".
If a different name is used, it will cause a build error.

Fixes: f944b5a7aff0 ("genirq: Use a common macro to go through the actions 
list")
Signed-off-by: Masahiro Yamada 
Signed-off-by: Thomas Gleixner 
Cc: Marc Zyngier 
Cc: Daniel Lezcano 
Cc: Jason Cooper 
Link: 
http://lkml.kernel.org/r/1502260341-28184-1-git-send-email-yamada.masah...@socionext.com
---
 kernel/irq/internals.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/irq/internals.h b/kernel/irq/internals.h
index a2c4805..a4aa390 100644
--- a/kernel/irq/internals.h
+++ b/kernel/irq/internals.h
@@ -151,7 +151,7 @@ static inline void chip_bus_sync_unlock(struct irq_desc 
*desc)
 #define IRQ_GET_DESC_CHECK_PERCPU  (_IRQ_DESC_CHECK | _IRQ_DESC_PERCPU)
 
 #define for_each_action_of_desc(desc, act) \
-   for (act = desc->act; act; act = act->next)
+   for (act = desc->action; act; act = act->next)
 
 struct irq_desc *
 __irq_get_desc_lock(unsigned int irq, unsigned long *flags, bool bus,

[tip:x86/cleanups] x86: Clean up various simple wrapper functions

2016-09-13 Thread tip-bot for Masahiro Yamada 
Commit-ID:  f148b41e8b2e114d0aba023adf326b03368f3246
Gitweb: http://git.kernel.org/tip/f148b41e8b2e114d0aba023adf326b03368f3246
Author: Masahiro Yamada 
AuthorDate: Sun, 11 Sep 2016 14:58:21 +0900
Committer:  Ingo Molnar 
CommitDate: Tue, 13 Sep 2016 20:42:58 +0200

x86: Clean up various simple wrapper functions

Remove unneeded variables and assignments.

While we are here, let's fix the following as well:

  - Remove unnecessary parentheses
  - Remove unnecessary unsigned-suffix 'U' from constant values
  - Reword the comment in set_apic_id() (suggested by Thomas Gleixner)

Signed-off-by: Masahiro Yamada 
Cc: Alex Thorlton 
Cc: Andrew Banman 
Cc: Borislav Petkov 
Cc: Daniel J Blueman 
Cc: Denys Vlasenko 
Cc: Dimitri Sivanich 
Cc: Linus Torvalds 
Cc: Matt Fleming 
Cc: Mike Travis 
Cc: Nathan Zimmer 
Cc: Paul Gortmaker 
Cc: Peter Zijlstra 
Cc: Steffen Persvold 
Cc: Thomas Gleixner 
Cc: Toshi Kani 
Cc: Wei Jiangang 
Link: 
http://lkml.kernel.org/r/1473573502-27954-1-git-send-email-yamada.masah...@socionext.com
Signed-off-by: Ingo Molnar 
---
 arch/x86/kernel/apic/apic_flat_64.c  | 16 +++-
 arch/x86/kernel/apic/apic_numachip.c |  5 +
 arch/x86/kernel/apic/x2apic_uv_x.c   |  7 ++-
 arch/x86/mm/pat_rbtree.c |  4 +---
 arch/x86/platform/uv/bios_uv.c   |  7 ++-
 arch/x86/platform/uv/tlb_uv.c|  6 +-
 6 files changed, 10 insertions(+), 35 deletions(-)

diff --git a/arch/x86/kernel/apic/apic_flat_64.c 
b/arch/x86/kernel/apic/apic_flat_64.c
index 5b2ae10..70796f5 100644
--- a/arch/x86/kernel/apic/apic_flat_64.c
+++ b/arch/x86/kernel/apic/apic_flat_64.c
@@ -116,27 +116,17 @@ static void flat_send_IPI_all(int vector)
 
 static unsigned int flat_get_apic_id(unsigned long x)
 {
-   unsigned int id;
-
-   id = (((x)>>24) & 0xFFu);
-
-   return id;
+   return (x >> 24) & 0xFF;
 }
 
 static unsigned long set_apic_id(unsigned int id)
 {
-   unsigned long x;
-
-   x = ((id & 0xFFu)<<24);
-   return x;
+   return (id & 0xFF) << 24;
 }
 
 static unsigned int read_xapic_id(void)
 {
-   unsigned int id;
-
-   id = flat_get_apic_id(apic_read(APIC_ID));
-   return id;
+   return flat_get_apic_id(apic_read(APIC_ID));
 }
 
 static int flat_apic_id_registered(void)
diff --git a/arch/x86/kernel/apic/apic_numachip.c 
b/arch/x86/kernel/apic/apic_numachip.c
index 714d4fd..e08fe2c 100644
--- a/arch/x86/kernel/apic/apic_numachip.c
+++ b/arch/x86/kernel/apic/apic_numachip.c
@@ -40,10 +40,7 @@ static unsigned int numachip1_get_apic_id(unsigned long x)
 
 static unsigned long numachip1_set_apic_id(unsigned int id)
 {
-   unsigned long x;
-
-   x = ((id & 0xffU) << 24);
-   return x;
+   return (id & 0xff) << 24;
 }
 
 static unsigned int numachip2_get_apic_id(unsigned long x)
diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c 
b/arch/x86/kernel/apic/x2apic_uv_x.c
index cb0673c..0f8cd92 100644
--- a/arch/x86/kernel/apic/x2apic_uv_x.c
+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
@@ -533,11 +533,8 @@ static unsigned int x2apic_get_apic_id(unsigned long x)
 
 static unsigned long set_apic_id(unsigned int id)
 {
-   unsigned long x;
-
-   /* maskout x2apic_extra_bits ? */
-   x = id;
-   return x;
+   /* CHECKME: Do we need to mask out the xapic extra bits? */
+   return id;
 }
 
 static unsigned int uv_read_apic_id(void)
diff --git a/arch/x86/mm/pat_rbtree.c b/arch/x86/mm/pat_rbtree.c
index de391b7..159b52c 100644
--- a/arch/x86/mm/pat_rbtree.c
+++ b/arch/x86/mm/pat_rbtree.c
@@ -254,9 +254,7 @@ struct memtype *rbt_memtype_erase(u64 start, u64 end)
 
 struct memtype *rbt_memtype_lookup(u64 addr)
 {
-   struct memtype *data;
-   data = memtype_rb_lowest_match(_rbroot, addr, addr + PAGE_SIZE);
-   return data;
+   return memtype_rb_lowest_match(_rbroot, addr, addr + PAGE_SIZE);
 }
 
 #if defined(CONFIG_DEBUG_FS)
diff --git a/arch/x86/platform/uv/bios_uv.c b/arch/x86/platform/uv/bios_uv.c
index 23f2f3e..b4d5e95 100644
--- a/arch/x86/platform/uv/bios_uv.c
+++ b/arch/x86/platform/uv/bios_uv.c
@@ -149,11 +149,8 @@ EXPORT_SYMBOL_GPL(uv_bios_change_memprotect);
 s64
 uv_bios_reserved_page_pa(u64 buf, u64 *cookie, u64 *addr, u64 *len)
 {
-   s64 ret;
-
-   ret = uv_bios_call_irqsave(UV_BIOS_GET_PARTITION_ADDR, (u64)cookie,
-   (u64)addr, buf, (u64)len, 0);
-   return ret;
+   return uv_bios_call_irqsave(UV_BIOS_GET_PARTITION_ADDR, (u64)cookie,
+   (u64)addr, buf, (u64)len, 0);
 }

[tip:x86/cleanups] x86: Clean up various simple wrapper functions

2016-09-13 Thread tip-bot for Masahiro Yamada 
Commit-ID:  f148b41e8b2e114d0aba023adf326b03368f3246
Gitweb: http://git.kernel.org/tip/f148b41e8b2e114d0aba023adf326b03368f3246
Author: Masahiro Yamada 
AuthorDate: Sun, 11 Sep 2016 14:58:21 +0900
Committer:  Ingo Molnar 
CommitDate: Tue, 13 Sep 2016 20:42:58 +0200

x86: Clean up various simple wrapper functions

Remove unneeded variables and assignments.

While we are here, let's fix the following as well:

  - Remove unnecessary parentheses
  - Remove unnecessary unsigned-suffix 'U' from constant values
  - Reword the comment in set_apic_id() (suggested by Thomas Gleixner)

Signed-off-by: Masahiro Yamada 
Cc: Alex Thorlton 
Cc: Andrew Banman 
Cc: Borislav Petkov 
Cc: Daniel J Blueman 
Cc: Denys Vlasenko 
Cc: Dimitri Sivanich 
Cc: Linus Torvalds 
Cc: Matt Fleming 
Cc: Mike Travis 
Cc: Nathan Zimmer 
Cc: Paul Gortmaker 
Cc: Peter Zijlstra 
Cc: Steffen Persvold 
Cc: Thomas Gleixner 
Cc: Toshi Kani 
Cc: Wei Jiangang 
Link: 
http://lkml.kernel.org/r/1473573502-27954-1-git-send-email-yamada.masah...@socionext.com
Signed-off-by: Ingo Molnar 
---
 arch/x86/kernel/apic/apic_flat_64.c  | 16 +++-
 arch/x86/kernel/apic/apic_numachip.c |  5 +
 arch/x86/kernel/apic/x2apic_uv_x.c   |  7 ++-
 arch/x86/mm/pat_rbtree.c |  4 +---
 arch/x86/platform/uv/bios_uv.c   |  7 ++-
 arch/x86/platform/uv/tlb_uv.c|  6 +-
 6 files changed, 10 insertions(+), 35 deletions(-)

diff --git a/arch/x86/kernel/apic/apic_flat_64.c 
b/arch/x86/kernel/apic/apic_flat_64.c
index 5b2ae10..70796f5 100644
--- a/arch/x86/kernel/apic/apic_flat_64.c
+++ b/arch/x86/kernel/apic/apic_flat_64.c
@@ -116,27 +116,17 @@ static void flat_send_IPI_all(int vector)
 
 static unsigned int flat_get_apic_id(unsigned long x)
 {
-   unsigned int id;
-
-   id = (((x)>>24) & 0xFFu);
-
-   return id;
+   return (x >> 24) & 0xFF;
 }
 
 static unsigned long set_apic_id(unsigned int id)
 {
-   unsigned long x;
-
-   x = ((id & 0xFFu)<<24);
-   return x;
+   return (id & 0xFF) << 24;
 }
 
 static unsigned int read_xapic_id(void)
 {
-   unsigned int id;
-
-   id = flat_get_apic_id(apic_read(APIC_ID));
-   return id;
+   return flat_get_apic_id(apic_read(APIC_ID));
 }
 
 static int flat_apic_id_registered(void)
diff --git a/arch/x86/kernel/apic/apic_numachip.c 
b/arch/x86/kernel/apic/apic_numachip.c
index 714d4fd..e08fe2c 100644
--- a/arch/x86/kernel/apic/apic_numachip.c
+++ b/arch/x86/kernel/apic/apic_numachip.c
@@ -40,10 +40,7 @@ static unsigned int numachip1_get_apic_id(unsigned long x)
 
 static unsigned long numachip1_set_apic_id(unsigned int id)
 {
-   unsigned long x;
-
-   x = ((id & 0xffU) << 24);
-   return x;
+   return (id & 0xff) << 24;
 }
 
 static unsigned int numachip2_get_apic_id(unsigned long x)
diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c 
b/arch/x86/kernel/apic/x2apic_uv_x.c
index cb0673c..0f8cd92 100644
--- a/arch/x86/kernel/apic/x2apic_uv_x.c
+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
@@ -533,11 +533,8 @@ static unsigned int x2apic_get_apic_id(unsigned long x)
 
 static unsigned long set_apic_id(unsigned int id)
 {
-   unsigned long x;
-
-   /* maskout x2apic_extra_bits ? */
-   x = id;
-   return x;
+   /* CHECKME: Do we need to mask out the xapic extra bits? */
+   return id;
 }
 
 static unsigned int uv_read_apic_id(void)
diff --git a/arch/x86/mm/pat_rbtree.c b/arch/x86/mm/pat_rbtree.c
index de391b7..159b52c 100644
--- a/arch/x86/mm/pat_rbtree.c
+++ b/arch/x86/mm/pat_rbtree.c
@@ -254,9 +254,7 @@ struct memtype *rbt_memtype_erase(u64 start, u64 end)
 
 struct memtype *rbt_memtype_lookup(u64 addr)
 {
-   struct memtype *data;
-   data = memtype_rb_lowest_match(_rbroot, addr, addr + PAGE_SIZE);
-   return data;
+   return memtype_rb_lowest_match(_rbroot, addr, addr + PAGE_SIZE);
 }
 
 #if defined(CONFIG_DEBUG_FS)
diff --git a/arch/x86/platform/uv/bios_uv.c b/arch/x86/platform/uv/bios_uv.c
index 23f2f3e..b4d5e95 100644
--- a/arch/x86/platform/uv/bios_uv.c
+++ b/arch/x86/platform/uv/bios_uv.c
@@ -149,11 +149,8 @@ EXPORT_SYMBOL_GPL(uv_bios_change_memprotect);
 s64
 uv_bios_reserved_page_pa(u64 buf, u64 *cookie, u64 *addr, u64 *len)
 {
-   s64 ret;
-
-   ret = uv_bios_call_irqsave(UV_BIOS_GET_PARTITION_ADDR, (u64)cookie,
-   (u64)addr, buf, (u64)len, 0);
-   return ret;
+   return uv_bios_call_irqsave(UV_BIOS_GET_PARTITION_ADDR, (u64)cookie,
+   (u64)addr, buf, (u64)len, 0);
 }
 EXPORT_SYMBOL_GPL(uv_bios_reserved_page_pa);
 
diff --git a/arch/x86/platform/uv/tlb_uv.c b/arch/x86/platform/uv/tlb_uv.c
index fdb4d42..276e1b7 100644
--- a/arch/x86/platform/uv/tlb_uv.c
+++ b/arch/x86/platform/uv/tlb_uv.c
@@ -580,11 +580,7 @@ static int uv1_wait_completion(struct bau_desc *bau_desc,
  */
 static unsigned long uv2_3_read_status(unsigned long offset, int rshft, int 
desc)
 {
-   unsigned long descriptor_status;
-
-

[tip:perf/core] tools build: Use .s extension for preprocessed assembler code

2016-03-05 Thread tip-bot for Masahiro Yamada 
Commit-ID:  676787939ef8ccfcf8039104f766ebe5ebe23924
Gitweb: http://git.kernel.org/tip/676787939ef8ccfcf8039104f766ebe5ebe23924
Author: Masahiro Yamada 
AuthorDate: Mon, 1 Feb 2016 02:59:00 +0900
Committer:  Arnaldo Carvalho de Melo 
CommitDate: Thu, 3 Mar 2016 11:10:37 -0300

tools build: Use .s extension for preprocessed assembler code

The "man gcc" says .i extension represents the file is C source code
that should not be preprocessed.  Here, .s should be used.

For clarification,
  .c  ---(preprocess)--->  .i
  .S  ---(preprocess)--->  .s

Signed-off-by: Masahiro Yamada 
Acked-by: Jiri Olsa 
Cc: Aaro Koskinen 
Cc: Adrian Hunter 
Cc: Lukas Wunner 
Link: 
http://lkml.kernel.org/r/1454263140-19670-1-git-send-email-yamada.masah...@socionext.com
Signed-off-by: Arnaldo Carvalho de Melo 
---
 tools/build/Makefile.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/build/Makefile.build b/tools/build/Makefile.build
index 4a96473..ee566e8 100644
--- a/tools/build/Makefile.build
+++ b/tools/build/Makefile.build
@@ -85,7 +85,7 @@ $(OUTPUT)%.i: %.c FORCE
$(call rule_mkdir)
$(call if_changed_dep,cc_i_c)
 
-$(OUTPUT)%.i: %.S FORCE
+$(OUTPUT)%.s: %.S FORCE
$(call rule_mkdir)
$(call if_changed_dep,cc_i_c)

[tip:perf/core] tools build: Use .s extension for preprocessed assembler code

2016-03-05 Thread tip-bot for Masahiro Yamada 
Commit-ID:  676787939ef8ccfcf8039104f766ebe5ebe23924
Gitweb: http://git.kernel.org/tip/676787939ef8ccfcf8039104f766ebe5ebe23924
Author: Masahiro Yamada 
AuthorDate: Mon, 1 Feb 2016 02:59:00 +0900
Committer:  Arnaldo Carvalho de Melo 
CommitDate: Thu, 3 Mar 2016 11:10:37 -0300

tools build: Use .s extension for preprocessed assembler code

The "man gcc" says .i extension represents the file is C source code
that should not be preprocessed.  Here, .s should be used.

For clarification,
  .c  ---(preprocess)--->  .i
  .S  ---(preprocess)--->  .s

Signed-off-by: Masahiro Yamada 
Acked-by: Jiri Olsa 
Cc: Aaro Koskinen 
Cc: Adrian Hunter 
Cc: Lukas Wunner 
Link: 
http://lkml.kernel.org/r/1454263140-19670-1-git-send-email-yamada.masah...@socionext.com
Signed-off-by: Arnaldo Carvalho de Melo 
---
 tools/build/Makefile.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/build/Makefile.build b/tools/build/Makefile.build
index 4a96473..ee566e8 100644
--- a/tools/build/Makefile.build
+++ b/tools/build/Makefile.build
@@ -85,7 +85,7 @@ $(OUTPUT)%.i: %.c FORCE
$(call rule_mkdir)
$(call if_changed_dep,cc_i_c)
 
-$(OUTPUT)%.i: %.S FORCE
+$(OUTPUT)%.s: %.S FORCE
$(call rule_mkdir)
$(call if_changed_dep,cc_i_c)

[tip:x86/urgent] x86/build: Supress "Nothing to be done for ..." messages

2014-04-14 Thread tip-bot for Masahiro Yamada 
Commit-ID:  e6bcd1a8974fab74e9fd679fb64462b2a8deff41
Gitweb: http://git.kernel.org/tip/e6bcd1a8974fab74e9fd679fb64462b2a8deff41
Author: Masahiro Yamada 
AuthorDate: Thu, 10 Apr 2014 10:35:42 +0900
Committer:  Ingo Molnar 
CommitDate: Mon, 14 Apr 2014 11:44:36 +0200

x86/build: Supress "Nothing to be done for ..." messages

When we build an already built kernel again, arch/x86/syscalls/Makefile
and arch/x86/tools/Makefile emits "Nothing to be done for ..."
messages.

Here is the command log:

  $ make defconfig
 [ snip ]
  $ make
 [ snip ]
  $ make
  make[1]: Nothing to be done for `all'.<-
  make[1]: Nothing to be done for `relocs'. <-
CHK include/config/kernel.release
CHK include/generated/uapi/linux/version.h

Besides not emitting those, "all" and "relocs" should be added to PHONY as well.

Signed-off-by: Masahiro Yamada 
Acked-by: Peter Foley 
Acked-by: Michal Marek 
Link: 
http://lkml.kernel.org/r/1397093742-11144-1-git-send-email-yamad...@jp.panasonic.com
Signed-off-by: Ingo Molnar 
---
 arch/x86/syscalls/Makefile | 2 ++
 arch/x86/tools/Makefile| 2 ++
 2 files changed, 4 insertions(+)

diff --git a/arch/x86/syscalls/Makefile b/arch/x86/syscalls/Makefile
index f325af2..3323c27 100644
--- a/arch/x86/syscalls/Makefile
+++ b/arch/x86/syscalls/Makefile
@@ -54,5 +54,7 @@ syshdr-$(CONFIG_X86_64)   += syscalls_64.h
 
 targets+= $(uapisyshdr-y) $(syshdr-y)
 
+PHONY += all
 all: $(addprefix $(uapi)/,$(uapisyshdr-y))
 all: $(addprefix $(out)/,$(syshdr-y))
+   @:
diff --git a/arch/x86/tools/Makefile b/arch/x86/tools/Makefile
index e812034..604a37e 100644
--- a/arch/x86/tools/Makefile
+++ b/arch/x86/tools/Makefile
@@ -40,4 +40,6 @@ $(obj)/insn_sanity.o: $(srctree)/arch/x86/lib/insn.c 
$(srctree)/arch/x86/lib/ina
 HOST_EXTRACFLAGS += -I$(srctree)/tools/include
 hostprogs-y+= relocs
 relocs-objs := relocs_32.o relocs_64.o relocs_common.o
+PHONY += relocs
 relocs: $(obj)/relocs
+   @:
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[tip:x86/urgent] x86/build: Supress Nothing to be done for ... messages

2014-04-14 Thread tip-bot for Masahiro Yamada 
Commit-ID:  e6bcd1a8974fab74e9fd679fb64462b2a8deff41
Gitweb: http://git.kernel.org/tip/e6bcd1a8974fab74e9fd679fb64462b2a8deff41
Author: Masahiro Yamada yamad...@jp.panasonic.com
AuthorDate: Thu, 10 Apr 2014 10:35:42 +0900
Committer:  Ingo Molnar mi...@kernel.org
CommitDate: Mon, 14 Apr 2014 11:44:36 +0200

x86/build: Supress Nothing to be done for ... messages

When we build an already built kernel again, arch/x86/syscalls/Makefile
and arch/x86/tools/Makefile emits Nothing to be done for ...
messages.

Here is the command log:

  $ make defconfig
 [ snip ]
  $ make
 [ snip ]
  $ make
  make[1]: Nothing to be done for `all'.-
  make[1]: Nothing to be done for `relocs'. -
CHK include/config/kernel.release
CHK include/generated/uapi/linux/version.h

Besides not emitting those, all and relocs should be added to PHONY as well.

Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com
Acked-by: Peter Foley pefol...@pefoley.com
Acked-by: Michal Marek mma...@suse.cz
Link: 
http://lkml.kernel.org/r/1397093742-11144-1-git-send-email-yamad...@jp.panasonic.com
Signed-off-by: Ingo Molnar mi...@kernel.org
---
 arch/x86/syscalls/Makefile | 2 ++
 arch/x86/tools/Makefile| 2 ++
 2 files changed, 4 insertions(+)

diff --git a/arch/x86/syscalls/Makefile b/arch/x86/syscalls/Makefile
index f325af2..3323c27 100644
--- a/arch/x86/syscalls/Makefile
+++ b/arch/x86/syscalls/Makefile
@@ -54,5 +54,7 @@ syshdr-$(CONFIG_X86_64)   += syscalls_64.h
 
 targets+= $(uapisyshdr-y) $(syshdr-y)
 
+PHONY += all
 all: $(addprefix $(uapi)/,$(uapisyshdr-y))
 all: $(addprefix $(out)/,$(syshdr-y))
+   @:
diff --git a/arch/x86/tools/Makefile b/arch/x86/tools/Makefile
index e812034..604a37e 100644
--- a/arch/x86/tools/Makefile
+++ b/arch/x86/tools/Makefile
@@ -40,4 +40,6 @@ $(obj)/insn_sanity.o: $(srctree)/arch/x86/lib/insn.c 
$(srctree)/arch/x86/lib/ina
 HOST_EXTRACFLAGS += -I$(srctree)/tools/include
 hostprogs-y+= relocs
 relocs-objs := relocs_32.o relocs_64.o relocs_common.o
+PHONY += relocs
 relocs: $(obj)/relocs
+   @:
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/