Commit b15943c4 authored by Patryk Wlazlyn's avatar Patryk Wlazlyn Committed by Len Brown
Browse files

tools/power turbostat: Add local build_bug.h header for snapshot target 



Fixes compilation errors for Makefile snapshot target described in:
commit 231ce08b ("tools/power turbostat: Add "snapshot:" Makefile target")

Signed-off-by: default avatarPatryk Wlazlyn <patryk.wlazlyn@linux.intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent c5120a33

tools/power/x86/turbostat/Makefile

+5 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ turbostat : turbostat.c 
override CFLAGS +=	-O2 -Wall -Wextra -I../../../include

override CFLAGS +=	-DMSRHEADER='"../../../../arch/x86/include/asm/msr-index.h"'

override CFLAGS +=	-DINTEL_FAMILY_HEADER='"../../../../arch/x86/include/asm/intel-family.h"'

override CFLAGS +=	-DBUILD_BUG_HEADER='"../../../../include/linux/build_bug.h"'

override CFLAGS +=	-D_FILE_OFFSET_BITS=64

override CFLAGS +=	-D_FORTIFY_SOURCE=2
@@ -44,10 +45,13 @@ snapshot: turbostat 
	@echo "#define GENMASK(h, l) (((~0UL) << (l)) & (~0UL >> (sizeof(long) * 8 - 1 - (h))))" >> $(SNAPSHOT)/bits.h

	@echo "#define GENMASK_ULL(h, l) (((~0ULL) << (l)) & (~0ULL >> (sizeof(long long) * 8 - 1 - (h))))" >> $(SNAPSHOT)/bits.h



	@echo '#define BUILD_BUG_ON(cond) do { enum { compile_time_check ## __COUNTER__ = 1/(!(cond)) }; } while (0)' > $(SNAPSHOT)/build_bug.h



	@echo PWD=. > $(SNAPSHOT)/Makefile

	@echo "CFLAGS +=	-DMSRHEADER='\"msr-index.h\"'" >> $(SNAPSHOT)/Makefile

	@echo "CFLAGS +=	-DINTEL_FAMILY_HEADER='\"intel-family.h\"'" >> $(SNAPSHOT)/Makefile

	@sed -e's/.*MSRHEADER.*//' -e's/.*INTEL_FAMILY_HEADER.*//' Makefile >> $(SNAPSHOT)/Makefile

	@echo "CFLAGS +=	-DBUILD_BUG_HEADER='\"build_bug.h\"'" >> $(SNAPSHOT)/Makefile

	@sed -e's/.*MSRHEADER.*//' -e's/.*INTEL_FAMILY_HEADER.*//' -e's/.*BUILD_BUG_HEADER.*//' Makefile >> $(SNAPSHOT)/Makefile



	@rm -f $(SNAPSHOT).tar.gz

	tar cvzf $(SNAPSHOT).tar.gz $(SNAPSHOT)

tools/power/x86/turbostat/turbostat.c

+1 −1
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#define _GNU_SOURCE

#include MSRHEADER

#include INTEL_FAMILY_HEADER

#include BUILD_BUG_HEADER

#include <stdarg.h>

#include <stdio.h>

#include <err.h>
@@ -38,7 +39,6 @@ 
#include <stdbool.h>

#include <assert.h>

#include <linux/kernel.h>

#include <linux/build_bug.h>



#define UNUSED(x) (void)(x)