Commit a49a879f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'x86-cleanups-2025-03-22' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 cleanups from Ingo Molnar:
 "Miscellaneous x86 cleanups by Arnd Bergmann, Charles Han, Mirsad
  Todorovac, Randy Dunlap, Thorsten Blum and Zhang Kunbo"

* tag 'x86-cleanups-2025-03-22' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/coco: Replace 'static const cc_mask' with the newly introduced cc_get_mask() function
  x86/delay: Fix inconsistent whitespace
  selftests/x86/syscall: Fix coccinelle WARNING recommending the use of ARRAY_SIZE()
  x86/platform: Fix missing declaration of 'x86_apple_machine'
  x86/irq: Fix missing declaration of 'io_apic_irqs'
  x86/usercopy: Fix kernel-doc func param name in clean_cache_range()'s description
  x86/apic: Use str_disabled_enabled() helper in print_ipi_mode()
parents 71b639af ec73859d

arch/x86/include/asm/coco.h

+9 −1
Original line number Diff line number Diff line
@@ -15,6 +15,11 @@ enum cc_vendor { 
extern enum cc_vendor cc_vendor;

extern u64 cc_mask;



static inline u64 cc_get_mask(void)

{

	return cc_mask;

}



static inline void cc_set_mask(u64 mask)

{

	RIP_REL_REF(cc_mask) = mask;
@@ -25,7 +30,10 @@ u64 cc_mkdec(u64 val); 
void cc_random_init(void);

#else

#define cc_vendor (CC_VENDOR_NONE)

static const u64 cc_mask = 0;

static inline u64 cc_get_mask(void)

{

	return 0;

}



static inline u64 cc_mkenc(u64 val)

{

arch/x86/include/asm/pgtable_types.h

+1 −1
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ enum page_cache_mode { 
};

#endif



#define _PAGE_CC		(_AT(pteval_t, cc_mask))

#define _PAGE_CC		(_AT(pteval_t, cc_get_mask()))

#define _PAGE_ENC		(_AT(pteval_t, sme_me_mask))



#define _PAGE_CACHE_MASK	(_PAGE_PWT | _PAGE_PCD | _PAGE_PAT)

arch/x86/kernel/apic/ipi.c

+2 −1
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
#include <linux/cpumask.h>

#include <linux/delay.h>

#include <linux/smp.h>

#include <linux/string_choices.h>



#include <asm/io_apic.h>
@@ -23,7 +24,7 @@ __setup("no_ipi_broadcast=", apic_ipi_shorthand); 
static int __init print_ipi_mode(void)

{

	pr_info("IPI shorthand broadcast: %s\n",

		apic_ipi_shorthand_off ? "disabled" : "enabled");

		str_disabled_enabled(apic_ipi_shorthand_off));

	return 0;

}

late_initcall(print_ipi_mode);

arch/x86/kernel/i8259.c

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <asm/desc.h>

#include <asm/apic.h>

#include <asm/i8259.h>

#include <asm/io_apic.h>



/*

 * This is the 'legacy' 8259A Programmable Interrupt Controller,

arch/x86/kernel/quirks.c

+2 −0
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ 
#include <asm/setup.h>

#include <asm/mce.h>



#include <linux/platform_data/x86/apple.h>



#if defined(CONFIG_X86_IO_APIC) && defined(CONFIG_SMP) && defined(CONFIG_PCI)



static void quirk_intel_irqbalance(struct pci_dev *dev)