diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-15 11:17:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-15 11:17:41 -0700 |
| commit | 0336104dcba613586cd22279db445840d4ebcdeb (patch) | |
| tree | 94df76934cc043810211f9de59d9d62ac20ec491 /tools | |
| parent | Merge tag 'pm+acpi-4.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm (diff) | |
| parent | mm, numa: really disable NUMA balancing by default on single node machines (diff) | |
| download | linux-rng-0336104dcba613586cd22279db445840d4ebcdeb.tar.xz linux-rng-0336104dcba613586cd22279db445840d4ebcdeb.zip | |
Merge branch 'akpm' (patches from Andrew)
Merge misc fixes from Andrew Morton:
"8 fixes"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
mm, numa: really disable NUMA balancing by default on single node machines
MAINTAINERS: update Jingoo Han's email address
CMA: page_isolation: check buddy before accessing it
uidgid: make uid_valid and gid_valid work with !CONFIG_MULTIUSER
kernfs: do not account ino_ida allocations to memcg
gfp: add __GFP_NOACCOUNT
tools/vm: fix page-flags build
drivers/rtc/rtc-armada38x.c: remove unused local `flags'
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/vm/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/vm/Makefile b/tools/vm/Makefile index ac884b65a072..93aadaf7ff63 100644 --- a/tools/vm/Makefile +++ b/tools/vm/Makefile @@ -3,7 +3,7 @@ TARGETS=page-types slabinfo page_owner_sort LIB_DIR = ../lib/api -LIBS = $(LIB_DIR)/libapikfs.a +LIBS = $(LIB_DIR)/libapi.a CC = $(CROSS_COMPILE)gcc CFLAGS = -Wall -Wextra -I../lib/ |