diff options
| author | Shuah Khan <shuahkh@osg.samsung.com> | 2016-09-16 17:20:42 -0600 |
|---|---|---|
| committer | Shuah Khan <shuahkh@osg.samsung.com> | 2016-09-23 11:51:58 -0600 |
| commit | 155fe001c6cd840c1cef3a8c42a8f14296a47c57 (patch) | |
| tree | 14d1f3f9ded611d9eca37894cc4879b90b30c9e4 | |
| parent | 986b891ad121c61200d3dffcc8ed128a1397682e (diff) | |
| download | linux-155fe001c6cd840c1cef3a8c42a8f14296a47c57.tar.gz linux-155fe001c6cd840c1cef3a8c42a8f14296a47c57.tar.bz2 linux-155fe001c6cd840c1cef3a8c42a8f14296a47c57.zip | |
samples: move timers example code from Documentation
Move timers examples to samples and remove it from Documentation
Makefile. Create a new Makefile to build timers. It can be built
from top level directory or from timers directory:
Run make -C samples/timers or cd samples/timers; make
Acked-by: Jonathan Corbet <corbet@lwn.net>
Acked-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
| -rw-r--r-- | Documentation/Makefile | 2 | ||||
| -rw-r--r-- | Documentation/timers/Makefile | 5 | ||||
| -rw-r--r-- | Documentation/timers/hpet.txt | 2 | ||||
| -rw-r--r-- | samples/timers/.gitignore (renamed from Documentation/timers/.gitignore) | 0 | ||||
| -rw-r--r-- | samples/timers/Makefile | 15 | ||||
| -rw-r--r-- | samples/timers/hpet_example.c (renamed from Documentation/timers/hpet_example.c) | 0 |
6 files changed, 17 insertions, 7 deletions
diff --git a/Documentation/Makefile b/Documentation/Makefile index 3c2a207a7c40..fc386b7a01b2 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -1,2 +1,2 @@ subdir-y := accounting auxdisplay blackfin \ - laptops pcmcia timers watchdog + laptops pcmcia watchdog diff --git a/Documentation/timers/Makefile b/Documentation/timers/Makefile deleted file mode 100644 index 6c09ee6ca721..000000000000 --- a/Documentation/timers/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -# List of programs to build -hostprogs-$(CONFIG_X86) := hpet_example - -# Tell kbuild to always build the programs -always := $(hostprogs-y) diff --git a/Documentation/timers/hpet.txt b/Documentation/timers/hpet.txt index a484d2c109d7..895345ec513b 100644 --- a/Documentation/timers/hpet.txt +++ b/Documentation/timers/hpet.txt @@ -25,4 +25,4 @@ arch/x86/kernel/hpet.c. The driver provides a userspace API which resembles the API found in the RTC driver framework. An example user space program is provided in -file:Documentation/timers/hpet_example.c +file:samples/timers/hpet_example.c diff --git a/Documentation/timers/.gitignore b/samples/timers/.gitignore index c5c45d7ec0df..c5c45d7ec0df 100644 --- a/Documentation/timers/.gitignore +++ b/samples/timers/.gitignore diff --git a/samples/timers/Makefile b/samples/timers/Makefile new file mode 100644 index 000000000000..a5c3c4a35ca1 --- /dev/null +++ b/samples/timers/Makefile @@ -0,0 +1,15 @@ +ifndef CROSS_COMPILE +uname_M := $(shell uname -m 2>/dev/null || echo not) +ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/x86/ -e s/x86_64/x86/) + +ifeq ($(ARCH),x86) +CC := $(CROSS_COMPILE)gcc +PROGS := hpet_example + +all: $(PROGS) + +clean: + rm -fr $(PROGS) + +endif +endif diff --git a/Documentation/timers/hpet_example.c b/samples/timers/hpet_example.c index 3ab4993d85e0..3ab4993d85e0 100644 --- a/Documentation/timers/hpet_example.c +++ b/samples/timers/hpet_example.c |