diff options
| author | Xavier Boudet <x-boudet@ti.com> | 2012-10-15 10:18:09 +0200 |
|---|---|---|
| committer | Xavier Boudet <x-boudet@ti.com> | 2012-10-15 10:18:09 +0200 |
| commit | 309bb6d5a4d7f8408e521dd443e52d4c796626c6 (patch) | |
| tree | 3ee17e79e8a9bb7b2476e915a617bf6e105779c0 /tools | |
| parent | 4e1b3b8d7df3e4146c60ff79a313f36ba227924c (diff) | |
| parent | e3f681ae691bd64d1dc06bab9ad4c98ad4effa82 (diff) | |
Merge remote-tracking branch 'upstream-stable/linux-3.4.y' into tilt-3.4
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/lguest/lguest.c | 1 | ||||
| -rw-r--r-- | tools/perf/Makefile | 2 | ||||
| -rw-r--r-- | tools/power/cpupower/Makefile | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/tools/lguest/lguest.c b/tools/lguest/lguest.c index f759f4f097c7..fd2f9221b241 100644 --- a/tools/lguest/lguest.c +++ b/tools/lguest/lguest.c @@ -1299,6 +1299,7 @@ static struct device *new_device(const char *name, u16 type) dev->feature_len = 0; dev->num_vq = 0; dev->running = false; + dev->next = NULL; /* * Append to device list. Prepending to a single-linked list is diff --git a/tools/perf/Makefile b/tools/perf/Makefile index 92271d32bc30..c3dd3d4424fe 100644 --- a/tools/perf/Makefile +++ b/tools/perf/Makefile @@ -70,7 +70,7 @@ ifeq ($(ARCH),x86_64) ARCH := x86 IS_X86_64 := 0 ifeq (, $(findstring m32,$(EXTRA_CFLAGS))) - IS_X86_64 := $(shell echo __x86_64__ | ${CC} -E -xc - | tail -n 1) + IS_X86_64 := $(shell echo __x86_64__ | ${CC} -E -x c - | tail -n 1) endif ifeq (${IS_X86_64}, 1) RAW_ARCH := x86_64 diff --git a/tools/power/cpupower/Makefile b/tools/power/cpupower/Makefile index a93e06cfcc2a..cf397bd26d0c 100644 --- a/tools/power/cpupower/Makefile +++ b/tools/power/cpupower/Makefile @@ -111,7 +111,7 @@ GMO_FILES = ${shell for HLANG in ${LANGUAGES}; do echo $(OUTPUT)po/$$HLANG.gmo; export CROSS CC AR STRIP RANLIB CFLAGS LDFLAGS LIB_OBJS # check if compiler option is supported -cc-supports = ${shell if $(CC) ${1} -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; fi;} +cc-supports = ${shell if $(CC) ${1} -S -o /dev/null -x c /dev/null > /dev/null 2>&1; then echo "$(1)"; fi;} # use '-Os' optimization if available, else use -O2 OPTIMIZATION := $(call cc-supports,-Os,-O2) |