All of lore.kernel.org
 help / color / mirror / Atom feed
From: Vasily Gorbik <gor@linux.ibm.com>
To: Joe Lawrence <joe.lawrence@redhat.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>,
	Sumanth Korikkar <sumanthk@linux.ibm.com>,
	Heiko Carstens <hca@linux.ibm.com>,
	Masahiro Yamada <masahiroy@kernel.org>,
	linux-s390 <linux-s390@vger.kernel.org>,
	linux-kbuild@vger.kernel.org
Subject: [PATCH 2/2] s390/nospec: remove unneeded header includes
Date: Mon, 27 Jun 2022 14:50:56 +0200	[thread overview]
Message-ID: <patch-2.thread-d13b6c.git-d13b6c96fb5f.your-ad-here.call-01656331067-ext-4899@work.hours> (raw)
In-Reply-To: <cover.thread-d13b6c.your-ad-here.call-01656331067-ext-4899@work.hours>

Commit 4efd417f298b ("s390: raise minimum supported machine generation
to z10") removed the usage of alternatives and lowcore in expolines
macros. Remove unneeded header includes as well.

With that, expoline.S doesn't require asm-offsets.h and
expoline_prepare target dependency could be removed.

Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
---
 arch/s390/Makefile                  | 2 +-
 arch/s390/include/asm/nospec-insn.h | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/arch/s390/Makefile b/arch/s390/Makefile
index fc72a35a1f07..4cb5d17e7ead 100644
--- a/arch/s390/Makefile
+++ b/arch/s390/Makefile
@@ -166,7 +166,7 @@ vdso_prepare: prepare0
 
 ifdef CONFIG_EXPOLINE_EXTERN
 modules_prepare: expoline_prepare
-expoline_prepare: prepare0
+expoline_prepare:
 	$(Q)$(MAKE) $(build)=arch/s390/lib/expoline arch/s390/lib/expoline/expoline.o
 endif
 endif
diff --git a/arch/s390/include/asm/nospec-insn.h b/arch/s390/include/asm/nospec-insn.h
index d910d71b5bb5..7e9e99523e95 100644
--- a/arch/s390/include/asm/nospec-insn.h
+++ b/arch/s390/include/asm/nospec-insn.h
@@ -2,8 +2,6 @@
 #ifndef _ASM_S390_NOSPEC_ASM_H
 #define _ASM_S390_NOSPEC_ASM_H
 
-#include <asm/alternative-asm.h>
-#include <asm/asm-offsets.h>
 #include <asm/dwarf.h>
 
 #ifdef __ASSEMBLY__
-- 
2.35.1

  parent reply	other threads:[~2022-06-27 12:51 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <8417373c-9dba-54bd-ce08-2d36d0a2af04@redhat.com>
2022-06-07 17:26 ` Fwd: s390/nospec: add an option to use thunk-extern Joe Lawrence
2022-06-27 12:50   ` Vasily Gorbik
2022-06-27 12:50     ` [PATCH 1/2] s390/nospec: build expoline.o for modules_prepare target Vasily Gorbik
2022-06-27 12:50     ` Vasily Gorbik [this message]
2023-03-16 11:14       ` [PATCH 2/2] s390/nospec: remove unneeded header includes Jiri Slaby
2023-03-16 11:28         ` [PATCH] s390: reintroduce expoline dependence to scripts Jiri Slaby (SUSE)
2023-03-21 21:19           ` Vasily Gorbik
2023-03-17 10:58         ` [PATCH 2/2] s390/nospec: remove unneeded header includes Masahiro Yamada
2023-03-17 11:17         ` Vasily Gorbik
2023-03-17 11:32           ` Jiri Slaby
2023-03-17 23:36           ` Masahiro Yamada
2022-06-29 15:16     ` s390/nospec: add an option to use thunk-extern Joe Lawrence
     [not found]       ` <CAPQ7N1RFyZRCJZc84UxjSQj44ksa6f6ib5B=dVwoqMU9_=s8QA@mail.gmail.com>
2022-07-01 21:39         ` Joe Lawrence
2022-07-17 13:11           ` Sumanth Korikkar
2022-08-17 13:59             ` Joe Lawrence

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=patch-2.thread-d13b6c.git-d13b6c96fb5f.your-ad-here.call-01656331067-ext-4899@work.hours \
    --to=gor@linux.ibm.com \
    --cc=hca@linux.ibm.com \
    --cc=joe.lawrence@redhat.com \
    --cc=linux-kbuild@vger.kernel.org \
    --cc=linux-s390@vger.kernel.org \
    --cc=masahiroy@kernel.org \
    --cc=mpe@ellerman.id.au \
    --cc=sumanthk@linux.ibm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.