diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-30 01:28:29 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-30 01:28:29 +0200 |
| commit | 10f3291a1d7a7dc3ded403cb3caa31916364be60 (patch) | |
| tree | dc642b00558988f3e6a98d33a8f8299fc88444c3 /tools/testing/selftests/memfd/Makefile | |
| parent | Merge tag 'nfs-for-3.17-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs (diff) | |
| parent | kexec: purgatory: add clean-up for purgatory directory (diff) | |
| download | linux-10f3291a1d7a7dc3ded403cb3caa31916364be60.tar.xz linux-10f3291a1d7a7dc3ded403cb3caa31916364be60.zip | |
Merge branch 'akpm' (fixes from Andrew Morton)
Merge patches from Andrew Morton:
"22 fixes"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (22 commits)
kexec: purgatory: add clean-up for purgatory directory
Documentation/kdump/kdump.txt: add ARM description
flush_icache_range: export symbol to fix build errors
tools: selftests: fix build issue with make kselftests target
ocfs2: quorum: add a log for node not fenced
ocfs2: o2net: set tcp user timeout to max value
ocfs2: o2net: don't shutdown connection when idle timeout
ocfs2: do not write error flag to user structure we cannot copy from/to
x86/purgatory: use approprate -m64/-32 build flag for arch/x86/purgatory
drivers/rtc/rtc-s5m.c: re-add support for devices without irq specified
xattr: fix check for simultaneous glibc header inclusion
kexec: remove CONFIG_KEXEC dependency on crypto
kexec: create a new config option CONFIG_KEXEC_FILE for new syscall
x86,mm: fix pte_special versus pte_numa
hugetlb_cgroup: use lockdep_assert_held rather than spin_is_locked
mm/zpool: use prefixed module loading
zram: fix incorrect stat with failed_reads
lib: turn CONFIG_STACKTRACE into an actual option.
mm: actually clear pmd_numa before invalidating
memblock, memhotplug: fix wrong type in memblock_find_in_range_node().
...
Diffstat (limited to 'tools/testing/selftests/memfd/Makefile')
| -rw-r--r-- | tools/testing/selftests/memfd/Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/testing/selftests/memfd/Makefile b/tools/testing/selftests/memfd/Makefile index 6816c491c5ff..ad4ab01cd28f 100644 --- a/tools/testing/selftests/memfd/Makefile +++ b/tools/testing/selftests/memfd/Makefile @@ -1,10 +1,10 @@ uname_M := $(shell uname -m 2>/dev/null || echo not) ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/i386/) ifeq ($(ARCH),i386) - ARCH := X86 + ARCH := x86 endif ifeq ($(ARCH),x86_64) - ARCH := X86 + ARCH := x86 endif CFLAGS += -D_FILE_OFFSET_BITS=64 @@ -14,20 +14,20 @@ CFLAGS += -I../../../../include/uapi/ CFLAGS += -I../../../../include/ all: -ifeq ($(ARCH),X86) +ifeq ($(ARCH),x86) gcc $(CFLAGS) memfd_test.c -o memfd_test else echo "Not an x86 target, can't build memfd selftest" endif run_tests: all -ifeq ($(ARCH),X86) +ifeq ($(ARCH),x86) gcc $(CFLAGS) memfd_test.c -o memfd_test endif @./memfd_test || echo "memfd_test: [FAIL]" build_fuse: -ifeq ($(ARCH),X86) +ifeq ($(ARCH),x86) gcc $(CFLAGS) fuse_mnt.c `pkg-config fuse --cflags --libs` -o fuse_mnt gcc $(CFLAGS) fuse_test.c -o fuse_test else |