D31332.diff
No OneTemporary
Actions

Size

724 B

Referenced Files

None

Subscribers

None

D31332.diff
View Options

	diff --git a/sys/dev/hwpmc/hwpmc_powerpc.c b/sys/dev/hwpmc/hwpmc_powerpc.c
	--- a/sys/dev/hwpmc/hwpmc_powerpc.c
	+++ b/sys/dev/hwpmc/hwpmc_powerpc.c
	@@ -604,7 +604,7 @@
	}

	/* Set the value for kern.hwpmc.cpuid */
	- snprintf(pmc_cpuid, sizeof(pmc_cpuid), "%08jx", (uintmax_t)mfpvr());
	+ snprintf(pmc_cpuid, sizeof(pmc_cpuid), "%08x", mfpvr());

	return (pmc_mdep);
	}
	diff --git a/sys/powerpc/include/cpufunc.h b/sys/powerpc/include/cpufunc.h
	--- a/sys/powerpc/include/cpufunc.h
	+++ b/sys/powerpc/include/cpufunc.h
	@@ -125,10 +125,10 @@
	return (value);
	}

	-static __inline register_t
	+static __inline uint32_t
	mfpvr(void)
	{
	- register_t value;
	+ uint32_t value;

	__asm __volatile ("mfpvr %0" : "=r"(value));