aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPali Rohár <pali.rohar@gmail.com>2015-06-06 09:42:28 -0400
committerJonathan Corbet <corbet@lwn.net>2015-06-08 18:42:07 -0400
commitb3fd7368f8f60bc9a7ffc2a5311db5f4dbd42180 (patch)
tree703c811d105751cf3215fd92cf31e02bdff25bfe
parenta28ab162bdf04d0e5d814478340ba32999233e7e (diff)
Move freefall program from Documentation/ to tools/
Signed-off-by: Pali Rohár <pali.rohar@gmail.com> Acked-by: Pavel Machek <pavel@ucw.cz> Signed-off-by: Jonathan Corbet <corbet@lwn.net>
-rw-r--r--Documentation/laptops/.gitignore1
-rw-r--r--Documentation/laptops/00-INDEX2
-rw-r--r--Documentation/laptops/Makefile2
-rw-r--r--tools/Makefile14
-rw-r--r--tools/laptop/freefall/Makefile17
-rw-r--r--tools/laptop/freefall/freefall.c (renamed from Documentation/laptops/freefall.c)0
6 files changed, 30 insertions, 6 deletions
diff --git a/Documentation/laptops/.gitignore b/Documentation/laptops/.gitignore
index da2bd065f4bc..9fc984e64386 100644
--- a/Documentation/laptops/.gitignore
+++ b/Documentation/laptops/.gitignore
@@ -1,2 +1 @@
1dslm dslm
2freefall
diff --git a/Documentation/laptops/00-INDEX b/Documentation/laptops/00-INDEX
index a3b4f209e562..7c0ac2a26b9e 100644
--- a/Documentation/laptops/00-INDEX
+++ b/Documentation/laptops/00-INDEX
@@ -8,8 +8,6 @@ disk-shock-protection.txt
8 - information on hard disk shock protection. 8 - information on hard disk shock protection.
9dslm.c 9dslm.c
10 - Simple Disk Sleep Monitor program 10 - Simple Disk Sleep Monitor program
11freefall.c
12 - (HP/DELL) laptop accelerometer program for disk protection.
13laptop-mode.txt 11laptop-mode.txt
14 - how to conserve battery power using laptop-mode. 12 - how to conserve battery power using laptop-mode.
15sony-laptop.txt 13sony-laptop.txt
diff --git a/Documentation/laptops/Makefile b/Documentation/laptops/Makefile
index 2b0fa5edf1d3..0abe44f68965 100644
--- a/Documentation/laptops/Makefile
+++ b/Documentation/laptops/Makefile
@@ -1,5 +1,5 @@
1# List of programs to build 1# List of programs to build
2hostprogs-y := dslm freefall 2hostprogs-y := dslm
3 3
4# Tell kbuild to always build the programs 4# Tell kbuild to always build the programs
5always := $(hostprogs-y) 5always := $(hostprogs-y)
diff --git a/tools/Makefile b/tools/Makefile
index 9a617adc6675..4557c39805e7 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -18,6 +18,7 @@ help:
18 @echo ' vm - misc vm tools' 18 @echo ' vm - misc vm tools'
19 @echo ' x86_energy_perf_policy - Intel energy policy tool' 19 @echo ' x86_energy_perf_policy - Intel energy policy tool'
20 @echo ' tmon - thermal monitoring and tuning tool' 20 @echo ' tmon - thermal monitoring and tuning tool'
21 @echo ' freefall - laptop accelerometer program for disk protection'
21 @echo '' 22 @echo ''
22 @echo 'You can do:' 23 @echo 'You can do:'
23 @echo ' $$ make -C tools/ <tool>_install' 24 @echo ' $$ make -C tools/ <tool>_install'
@@ -62,6 +63,9 @@ turbostat x86_energy_perf_policy: FORCE
62tmon: FORCE 63tmon: FORCE
63 $(call descend,thermal/$@) 64 $(call descend,thermal/$@)
64 65
66freefall: FORCE
67 $(call descend,laptop/$@)
68
65acpi_install: 69acpi_install:
66 $(call descend,power/$(@:_install=),install) 70 $(call descend,power/$(@:_install=),install)
67 71
@@ -80,10 +84,13 @@ turbostat_install x86_energy_perf_policy_install:
80tmon_install: 84tmon_install:
81 $(call descend,thermal/$(@:_install=),install) 85 $(call descend,thermal/$(@:_install=),install)
82 86
87freefall_install:
88 $(call descend,laptop/$(@:_install=),install)
89
83install: acpi_install cgroup_install cpupower_install hv_install firewire_install lguest_install \ 90install: acpi_install cgroup_install cpupower_install hv_install firewire_install lguest_install \
84 perf_install selftests_install turbostat_install usb_install \ 91 perf_install selftests_install turbostat_install usb_install \
85 virtio_install vm_install net_install x86_energy_perf_policy_install \ 92 virtio_install vm_install net_install x86_energy_perf_policy_install \
86 tmon 93 tmon freefall_install
87 94
88acpi_clean: 95acpi_clean:
89 $(call descend,power/acpi,clean) 96 $(call descend,power/acpi,clean)
@@ -112,8 +119,11 @@ turbostat_clean x86_energy_perf_policy_clean:
112tmon_clean: 119tmon_clean:
113 $(call descend,thermal/tmon,clean) 120 $(call descend,thermal/tmon,clean)
114 121
122freefall_clean:
123 $(call descend,laptop/freefall,clean)
124
115clean: acpi_clean cgroup_clean cpupower_clean hv_clean firewire_clean lguest_clean \ 125clean: acpi_clean cgroup_clean cpupower_clean hv_clean firewire_clean lguest_clean \
116 perf_clean selftests_clean turbostat_clean usb_clean virtio_clean \ 126 perf_clean selftests_clean turbostat_clean usb_clean virtio_clean \
117 vm_clean net_clean x86_energy_perf_policy_clean tmon_clean 127 vm_clean net_clean x86_energy_perf_policy_clean tmon_clean freefall_clean
118 128
119.PHONY: FORCE 129.PHONY: FORCE
diff --git a/tools/laptop/freefall/Makefile b/tools/laptop/freefall/Makefile
new file mode 100644
index 000000000000..48c6c9328419
--- /dev/null
+++ b/tools/laptop/freefall/Makefile
@@ -0,0 +1,17 @@
1PREFIX ?= /usr
2SBINDIR ?= sbin
3INSTALL ?= install
4CC = $(CROSS_COMPILE)gcc
5
6TARGET = freefall
7
8all: $(TARGET)
9
10%: %.c
11 $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
12
13clean:
14 $(RM) $(TARGET)
15
16install: freefall
17 $(INSTALL) -D -m 755 $(TARGET) $(DESTDIR)$(PREFIX)/$(SBINDIR)/$(TARGET)
diff --git a/Documentation/laptops/freefall.c b/tools/laptop/freefall/freefall.c
index 5e44b20b1848..5e44b20b1848 100644
--- a/Documentation/laptops/freefall.c
+++ b/tools/laptop/freefall/freefall.c