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

Merge tag 'x86_misc_for_v5.19_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull misc x86 updates from Borislav Petkov:
 "A variety of fixes which don't fit any other tip bucket:

   - Remove unnecessary function export

   - Correct asm constraint

   - Fix __setup handlers retval"

* tag 'x86_misc_for_v5.19_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/mm: Cleanup the control_va_addr_alignment() __setup handler
  x86: Fix return value of __setup handlers
  x86/delay: Fix the wrong asm constraint in delay_loop()
  x86/amd_nb: Unexport amd_cache_northbridges()
parents 3e2cbc01 1ef64b1e

arch/x86/entry/vdso/vma.c

+1 −1
Original line number Diff line number Diff line
@@ -438,7 +438,7 @@ bool arch_syscall_is_vdso_sigreturn(struct pt_regs *regs) 
static __init int vdso_setup(char *s)

{

	vdso64_enabled = simple_strtoul(s, NULL, 0);

	return 0;

	return 1;

}

__setup("vdso=", vdso_setup);

arch/x86/include/asm/amd_nb.h

+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ extern const struct amd_nb_bus_dev_range amd_nb_bus_dev_ranges[]; 


extern bool early_is_amd_nb(u32 value);

extern struct resource *amd_get_mmconfig_range(struct resource *res);

extern int amd_cache_northbridges(void);

extern void amd_flush_garts(void);

extern int amd_numa_init(void);

extern int amd_get_subcaches(int);

arch/x86/kernel/amd_nb.c

+3 −4
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ int amd_smn_write(u16 node, u32 address, u32 value) 
EXPORT_SYMBOL_GPL(amd_smn_write);





int amd_cache_northbridges(void)

static int amd_cache_northbridges(void)

{

	const struct pci_device_id *misc_ids = amd_nb_misc_ids;

	const struct pci_device_id *link_ids = amd_nb_link_ids;
@@ -210,14 +210,14 @@ int amd_cache_northbridges(void) 
	}



	misc = NULL;

	while ((misc = next_northbridge(misc, misc_ids)) != NULL)

	while ((misc = next_northbridge(misc, misc_ids)))

		misc_count++;



	if (!misc_count)

		return -ENODEV;



	root = NULL;

	while ((root = next_northbridge(root, root_ids)) != NULL)

	while ((root = next_northbridge(root, root_ids)))

		root_count++;



	if (root_count) {
@@ -290,7 +290,6 @@ int amd_cache_northbridges(void) 


	return 0;

}

EXPORT_SYMBOL_GPL(amd_cache_northbridges);



/*

 * Ignores subdevice/subvendor but as far as I can figure out

arch/x86/kernel/apic/apic.c

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ static __init int setup_apicpmtimer(char *s) 
{

	apic_calibrate_pmtmr = 1;

	notsc_setup(NULL);

	return 0;

	return 1;

}

__setup("apicpmtimer", setup_apicpmtimer);

#endif

arch/x86/kernel/cpu/intel.c

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ static bool ring3mwait_disabled __read_mostly; 
static int __init ring3mwait_disable(char *__unused)

{

	ring3mwait_disabled = true;

	return 0;

	return 1;

}

__setup("ring3mwait=disable", ring3mwait_disable);