diff options
author | Felipe Balbi | 2015-01-19 16:57:20 +0100 |
---|---|---|
committer | Felipe Balbi | 2015-01-19 16:57:20 +0100 |
commit | d1fc4440d761af47fd0c32661725011bf66ebb51 (patch) | |
tree | d2fdfe049eac9b45a9418bd1be103297b1c0c55e /tools/perf/config/Makefile | |
parent | usb: musb: debugfs: improve copy_from_user() argument (diff) | |
parent | Linux 3.19-rc5 (diff) | |
download | kernel-qcow2-linux-d1fc4440d761af47fd0c32661725011bf66ebb51.tar.gz kernel-qcow2-linux-d1fc4440d761af47fd0c32661725011bf66ebb51.tar.xz kernel-qcow2-linux-d1fc4440d761af47fd0c32661725011bf66ebb51.zip |
Merge tag 'v3.19-rc5' into next
Linux 3.19-rc5
Conflicts:
drivers/usb/dwc2/gadget.c
drivers/usb/gadget/udc/bdc/bdc_ep.c
Diffstat (limited to 'tools/perf/config/Makefile')
-rw-r--r-- | tools/perf/config/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile index 5d4b039fe1ed..648e31ff4021 100644 --- a/tools/perf/config/Makefile +++ b/tools/perf/config/Makefile @@ -20,7 +20,7 @@ NO_PERF_REGS := 1 # Additional ARCH settings for x86 ifeq ($(ARCH),x86) - ifeq (${IS_X86_64}, 1) + ifeq (${IS_64_BIT}, 1) CFLAGS += -DHAVE_ARCH_X86_64_SUPPORT ARCH_INCLUDE = ../../arch/x86/lib/memcpy_64.S ../../arch/x86/lib/memset_64.S LIBUNWIND_LIBS = -lunwind -lunwind-x86_64 |