Commit 61deafa9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'x86_apic_for_6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 APIC update from Dave Hansen:
 "Coccinelle complained about some 64-bit divisions, but the divisor was
  really just a 32-bit value being stored as 'unsigned long'.

  Fixing the types fixes the warning"

* tag 'x86_apic_for_6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/apic: Improve data types to fix Coccinelle warnings
parents 964bbdfd 0049f04c

arch/x86/kernel/apic/apic.c

+4 −4
Original line number Diff line number Diff line
@@ -631,7 +631,7 @@ void lapic_update_tsc_freq(void) 
static __initdata int lapic_cal_loops = -1;

static __initdata long lapic_cal_t1, lapic_cal_t2;

static __initdata unsigned long long lapic_cal_tsc1, lapic_cal_tsc2;

static __initdata unsigned long lapic_cal_pm1, lapic_cal_pm2;

static __initdata u32 lapic_cal_pm1, lapic_cal_pm2;

static __initdata unsigned long lapic_cal_j1, lapic_cal_j2;



/*
@@ -641,7 +641,7 @@ static void __init lapic_cal_handler(struct clock_event_device *dev) 
{

	unsigned long long tsc = 0;

	long tapic = apic_read(APIC_TMCCT);

	unsigned long pm = acpi_pm_read_early();

	u32 pm = acpi_pm_read_early();



	if (boot_cpu_has(X86_FEATURE_TSC))

		tsc = rdtsc();
@@ -666,7 +666,7 @@ static void __init lapic_cal_handler(struct clock_event_device *dev) 
}



static int __init

calibrate_by_pmtimer(long deltapm, long *delta, long *deltatsc)

calibrate_by_pmtimer(u32 deltapm, long *delta, long *deltatsc)

{

	const long pm_100ms = PMTMR_TICKS_PER_SEC / 10;

	const long pm_thresh = pm_100ms / 100;
@@ -677,7 +677,7 @@ calibrate_by_pmtimer(long deltapm, long *delta, long *deltatsc) 
	return -1;

#endif



	apic_printk(APIC_VERBOSE, "... PM-Timer delta = %ld\n", deltapm);

	apic_printk(APIC_VERBOSE, "... PM-Timer delta = %u\n", deltapm);



	/* Check, if the PM timer is available */

	if (!deltapm)