lkml.org 
[lkml]   [2019]   [Nov]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[GIT PULL] x86/urgent fix for v5.5

* Ingo Molnar <mingo@kernel.org> wrote:

> > Forgot to list the conflicts that may arise if you merge this after the
> > other x86 bits.
> >
> > Firstly the symbol bits would conflict here:
> >
> > arch/x86/entry/entry_32.S
> > arch/x86/kernel/head_32.S
> > arch/x86/xen/xen-asm_32.S
>
> Note that these conflicts will arise once you merge x86-asm-for-linus,
> with an additional semantic conflict in arch/x86/crypto/blake2s-core.S,
> see my merge conflict mail to that pull request.
>
> > There's also a conflict in arch/x86/include/asm/pgtable_32_types.h.
>
> This asm/pgtable_32_types.h conflict will be the only conflict you'll see
> when you merge x86-iopl-for-linus:
>
> <<<<<<< HEAD
> #define CPU_ENTRY_AREA_PAGES (NR_CPUS * 39)
> =======
> #define CPU_ENTRY_AREA_PAGES (NR_CPUS * 41)
> >>>>>>> e3cb0c7102f04c83bf1a7cb1d052e92749310b46
>
> And the correct resolution is to pick the '41' side.

I missed one other semantic conflict that can result in build failures on
certain stripped down x86 32-bit configs, for example 32-bit
"allnoconfig" where CONFIG_X86_IOPL_IOPERM gets turned off.

Here's a (tested) fix for that:

Please pull the latest x86-urgent-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-urgent-for-linus

# HEAD: 0bcd7762727dd8ba9b9b6f828e5a4cbd5da4f725 x86/iopl: Make 'struct tss_struct' constant size again

Thanks,

Ingo

------------------>
Ingo Molnar (1):
x86/iopl: Make 'struct tss_struct' constant size again


arch/x86/include/asm/processor.h | 2 --
1 file changed, 2 deletions(-)

diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
index b4e29d8b9e5a..e51afbb0cbfb 100644
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
@@ -411,9 +411,7 @@ struct tss_struct {
*/
struct x86_hw_tss x86_tss;

-#ifdef CONFIG_X86_IOPL_IOPERM
struct x86_io_bitmap io_bitmap;
-#endif
} __aligned(PAGE_SIZE);

DECLARE_PER_CPU_PAGE_ALIGNED(struct tss_struct, cpu_tss_rw);
\
 
 \ /
  Last update: 2019-11-26 22:05    [W:0.057 / U:0.316 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site