From: Borislav Petkov <bp@alien8.de>
To: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Cc: Thomas Gleixner <tglx@linutronix.de>, Peter Anvin <hpa@zytor.com>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] x86/boot: fix kaslr-enabled build
Date: Thu, 30 Jan 2020 12:00:08 +0100 [thread overview]
Message-ID: <20200130110008.GD6656@zn.tnic> (raw)
In-Reply-To: <20200129162926.1006-1-sergey.senozhatsky@gmail.com>
On Thu, Jan 30, 2020 at 01:29:26AM +0900, Sergey Senozhatsky wrote:
> Both pgtable_64 and kaslr_64 define `__force_order', which breaks
> the build:
>
> ld: arch/x86/boot/compressed/pgtable_64.o:(.bss+0x0): multiple definition of `__force_order';
> arch/x86/boot/compressed/kaslr_64.o:(.bss+0x0): first defined here
>
> Make KASLR use extern pgtable_64's definition.
>
> Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
> ---
> arch/x86/boot/compressed/kaslr_64.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/x86/boot/compressed/kaslr_64.c b/arch/x86/boot/compressed/kaslr_64.c
> index 748456c365f4..274df8f9e659 100644
> --- a/arch/x86/boot/compressed/kaslr_64.c
> +++ b/arch/x86/boot/compressed/kaslr_64.c
> @@ -30,7 +30,7 @@
> #include "../../mm/ident_map.c"
>
> /* Used by pgtable.h asm code to force instruction serialization. */
> -unsigned long __force_order;
> +extern unsigned long __force_order;
>
> /* Used to track our page table allocation area. */
> struct alloc_pgt_data {
> --
Hmm, I can't trigger that. gcc version and .config pls.
--
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette
next prev parent reply other threads:[~2020-01-30 11:00 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-29 16:29 Sergey Senozhatsky
2020-01-30 11:00 ` Borislav Petkov [this message]
2020-01-30 11:31 ` Sergey Senozhatsky
2020-01-30 11:36 ` Borislav Petkov
2020-01-30 11:46 ` Sergey Senozhatsky
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=20200130110008.GD6656@zn.tnic \
--to=bp@alien8.de \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=sergey.senozhatsky@gmail.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®