summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShuah Khan <shuahkh@osg.samsung.com>2016-09-16 19:40:40 -0400
committerShuah Khan <shuahkh@osg.samsung.com>2016-09-23 13:52:14 -0400
commit071bf69a0220253a44acb8b2a27f7a262b9a46bf (patch)
tree866502794134b58f493a6257d8ff49cd41353237
parent155fe001c6cd840c1cef3a8c42a8f14296a47c57 (diff)
samples: move watchdog example code from Documentation
Move watchdog examples to samples and remove it from Documentation Makefile. Create a new Makefile to build watchdog. It can be built from top level directory or from watchdog directory: Run make -C samples/watchdog or cd samples/watchdog; make Acked-by: Jonathan Corbet <corbet@lwn.net> Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
-rw-r--r--Documentation/Makefile2
-rw-r--r--Documentation/watchdog/Makefile1
-rw-r--r--Documentation/watchdog/src/Makefile5
-rw-r--r--Documentation/watchdog/watchdog-api.txt2
-rw-r--r--Documentation/watchdog/wdt.txt2
-rw-r--r--samples/watchdog/.gitignore (renamed from Documentation/watchdog/src/.gitignore)0
-rw-r--r--samples/watchdog/Makefile8
-rw-r--r--samples/watchdog/watchdog-simple.c (renamed from Documentation/watchdog/src/watchdog-simple.c)0
8 files changed, 11 insertions, 9 deletions
diff --git a/Documentation/Makefile b/Documentation/Makefile
index fc386b7a01b2..b2210b7af2e5 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -1,2 +1,2 @@
1subdir-y := accounting auxdisplay blackfin \ 1subdir-y := accounting auxdisplay blackfin \
2 laptops pcmcia watchdog 2 laptops pcmcia
diff --git a/Documentation/watchdog/Makefile b/Documentation/watchdog/Makefile
deleted file mode 100644
index 6018f45f2471..000000000000
--- a/Documentation/watchdog/Makefile
+++ /dev/null
@@ -1 +0,0 @@
1subdir-y := src
diff --git a/Documentation/watchdog/src/Makefile b/Documentation/watchdog/src/Makefile
deleted file mode 100644
index 47be791827d4..000000000000
--- a/Documentation/watchdog/src/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
1# List of programs to build
2hostprogs-y := watchdog-simple
3
4# Tell kbuild to always build the programs
5always := $(hostprogs-y)
diff --git a/Documentation/watchdog/watchdog-api.txt b/Documentation/watchdog/watchdog-api.txt
index b3a701f48118..0e62ba33b7fb 100644
--- a/Documentation/watchdog/watchdog-api.txt
+++ b/Documentation/watchdog/watchdog-api.txt
@@ -37,7 +37,7 @@ activates as soon as /dev/watchdog is opened and will reboot unless
37the watchdog is pinged within a certain time, this time is called the 37the watchdog is pinged within a certain time, this time is called the
38timeout or margin. The simplest way to ping the watchdog is to write 38timeout or margin. The simplest way to ping the watchdog is to write
39some data to the device. So a very simple watchdog daemon would look 39some data to the device. So a very simple watchdog daemon would look
40like this source file: see Documentation/watchdog/src/watchdog-simple.c 40like this source file: see samples/watchdog/watchdog-simple.c
41 41
42A more advanced driver could for example check that a HTTP server is 42A more advanced driver could for example check that a HTTP server is
43still responding before doing the write call to ping the watchdog. 43still responding before doing the write call to ping the watchdog.
diff --git a/Documentation/watchdog/wdt.txt b/Documentation/watchdog/wdt.txt
index 061c2e35384f..ed2f0b860869 100644
--- a/Documentation/watchdog/wdt.txt
+++ b/Documentation/watchdog/wdt.txt
@@ -47,4 +47,4 @@ The external event interfaces on the WDT boards are not currently supported.
47Minor numbers are however allocated for it. 47Minor numbers are however allocated for it.
48 48
49 49
50Example Watchdog Driver: see Documentation/watchdog/src/watchdog-simple.c 50Example Watchdog Driver: see samples/watchdog/watchdog-simple.c
diff --git a/Documentation/watchdog/src/.gitignore b/samples/watchdog/.gitignore
index ff0ebb540333..ff0ebb540333 100644
--- a/Documentation/watchdog/src/.gitignore
+++ b/samples/watchdog/.gitignore
diff --git a/samples/watchdog/Makefile b/samples/watchdog/Makefile
new file mode 100644
index 000000000000..9b53d89b1ccf
--- /dev/null
+++ b/samples/watchdog/Makefile
@@ -0,0 +1,8 @@
1CC := $(CROSS_COMPILE)gcc
2PROGS := watchdog-simple
3
4all: $(PROGS)
5
6clean:
7 rm -fr $(PROGS)
8
diff --git a/Documentation/watchdog/src/watchdog-simple.c b/samples/watchdog/watchdog-simple.c
index ba45803a2216..ba45803a2216 100644
--- a/Documentation/watchdog/src/watchdog-simple.c
+++ b/samples/watchdog/watchdog-simple.c