* [PATCH 1/2] samples: move blackfin gptimers-example from Documentation
2016-09-26 18:40 [PATCH 0/2] Moving runnable code from Documentation (last 2 patches) Shuah Khan
@ 2016-09-26 18:40 ` Shuah Khan
2016-09-26 18:40 ` [PATCH 2/2] Doc: update 00-INDEX files to reflect the runnable code move Shuah Khan
` (2 subsequent siblings)
3 siblings, 0 replies; 7+ messages in thread
From: Shuah Khan @ 2016-09-26 18:40 UTC (permalink / raw)
To: corbet, mmarek, akpm, keescook, dan.j.williams, mingo, paulmck,
jpoimboe, tj, aryabinin, nikolay, dvyukov, rostedt, olof, arnd,
hans.verkuil, nab, mchehab, broonie, tglx, ecree, davem
Cc: Shuah Khan, linux-doc, linux-kernel, linux-kbuild, linux-spi
Move blackfin gptimers-example to samples and remove it from Documentation
Makefile. Update samples Kconfig and Makefile to build gptimers-example.
blackfin is the last CONFIG_BUILD_DOCSRC target in Documentation/Makefile,
hence this patch also includes changes to remove CONFIG_BUILD_DOCSRC from
Makefile and lib/Kconfig.debug.
Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
---
Documentation/Makefile | 1 -
Documentation/blackfin/00-INDEX | 4 --
Documentation/blackfin/Makefile | 5 --
Documentation/blackfin/gptimers-example.c | 91 -------------------------------
Makefile | 3 -
lib/Kconfig.debug | 9 ---
samples/Kconfig | 6 ++
samples/Makefile | 2 +-
samples/blackfin/Makefile | 1 +
samples/blackfin/gptimers-example.c | 91 +++++++++++++++++++++++++++++++
10 files changed, 99 insertions(+), 114 deletions(-)
delete mode 100644 Documentation/Makefile
delete mode 100644 Documentation/blackfin/Makefile
delete mode 100644 Documentation/blackfin/gptimers-example.c
create mode 100644 samples/blackfin/Makefile
create mode 100644 samples/blackfin/gptimers-example.c
diff --git a/Documentation/Makefile b/Documentation/Makefile
deleted file mode 100644
index 8435965..0000000
--- a/Documentation/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-subdir-y := blackfin
diff --git a/Documentation/blackfin/00-INDEX b/Documentation/blackfin/00-INDEX
index c54fcdd..265a1ef 100644
--- a/Documentation/blackfin/00-INDEX
+++ b/Documentation/blackfin/00-INDEX
@@ -1,10 +1,6 @@
00-INDEX
- This file
-Makefile
- - Makefile for gptimers example file.
bfin-gpio-notes.txt
- Notes in developing/using bfin-gpio driver.
bfin-spi-notes.txt
- Notes for using bfin spi bus driver.
-gptimers-example.c
- - gptimers example
diff --git a/Documentation/blackfin/Makefile b/Documentation/blackfin/Makefile
deleted file mode 100644
index 6782c58..0000000
--- a/Documentation/blackfin/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-ifneq ($(CONFIG_BLACKFIN),)
-ifneq ($(CONFIG_BFIN_GPTIMERS),)
-obj-m := gptimers-example.o
-endif
-endif
diff --git a/Documentation/blackfin/gptimers-example.c b/Documentation/blackfin/gptimers-example.c
deleted file mode 100644
index 283eba9..0000000
--- a/Documentation/blackfin/gptimers-example.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Simple gptimers example
- * http://docs.blackfin.uclinux.org/doku.php?id=linux-kernel:drivers:gptimers
- *
- * Copyright 2007-2009 Analog Devices Inc.
- *
- * Licensed under the GPL-2 or later.
- */
-
-#include <linux/interrupt.h>
-#include <linux/module.h>
-
-#include <asm/gptimers.h>
-#include <asm/portmux.h>
-
-/* ... random driver includes ... */
-
-#define DRIVER_NAME "gptimer_example"
-
-#ifdef IRQ_TIMER5
-#define SAMPLE_IRQ_TIMER IRQ_TIMER5
-#else
-#define SAMPLE_IRQ_TIMER IRQ_TIMER2
-#endif
-
-struct gptimer_data {
- uint32_t period, width;
-};
-static struct gptimer_data data;
-
-/* ... random driver state ... */
-
-static irqreturn_t gptimer_example_irq(int irq, void *dev_id)
-{
- struct gptimer_data *data = dev_id;
-
- /* make sure it was our timer which caused the interrupt */
- if (!get_gptimer_intr(TIMER5_id))
- return IRQ_NONE;
-
- /* read the width/period values that were captured for the waveform */
- data->width = get_gptimer_pwidth(TIMER5_id);
- data->period = get_gptimer_period(TIMER5_id);
-
- /* acknowledge the interrupt */
- clear_gptimer_intr(TIMER5_id);
-
- /* tell the upper layers we took care of things */
- return IRQ_HANDLED;
-}
-
-/* ... random driver code ... */
-
-static int __init gptimer_example_init(void)
-{
- int ret;
-
- /* grab the peripheral pins */
- ret = peripheral_request(P_TMR5, DRIVER_NAME);
- if (ret) {
- printk(KERN_NOTICE DRIVER_NAME ": peripheral request failed\n");
- return ret;
- }
-
- /* grab the IRQ for the timer */
- ret = request_irq(SAMPLE_IRQ_TIMER, gptimer_example_irq,
- IRQF_SHARED, DRIVER_NAME, &data);
- if (ret) {
- printk(KERN_NOTICE DRIVER_NAME ": IRQ request failed\n");
- peripheral_free(P_TMR5);
- return ret;
- }
-
- /* setup the timer and enable it */
- set_gptimer_config(TIMER5_id,
- WDTH_CAP | PULSE_HI | PERIOD_CNT | IRQ_ENA);
- enable_gptimers(TIMER5bit);
-
- return 0;
-}
-module_init(gptimer_example_init);
-
-static void __exit gptimer_example_exit(void)
-{
- disable_gptimers(TIMER5bit);
- free_irq(SAMPLE_IRQ_TIMER, &data);
- peripheral_free(P_TMR5);
-}
-module_exit(gptimer_example_exit);
-
-MODULE_LICENSE("BSD");
diff --git a/Makefile b/Makefile
index 1a8c8dd..de5136a 100644
--- a/Makefile
+++ b/Makefile
@@ -926,9 +926,6 @@ vmlinux_prereq: $(vmlinux-deps) FORCE
ifdef CONFIG_HEADERS_CHECK
$(Q)$(MAKE) -f $(srctree)/Makefile headers_check
endif
-ifdef CONFIG_BUILD_DOCSRC
- $(Q)$(MAKE) $(build)=Documentation
-endif
ifdef CONFIG_GDB_SCRIPTS
$(Q)ln -fsn `cd $(srctree) && /bin/pwd`/scripts/gdb/vmlinux-gdb.py
endif
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 2e2cca5..ac15feb 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -1857,15 +1857,6 @@ config PROVIDE_OHCI1394_DMA_INIT
See Documentation/debugging-via-ohci1394.txt for more information.
-config BUILD_DOCSRC
- bool "Build targets in Documentation/ tree"
- depends on HEADERS_CHECK
- help
- This option attempts to build objects from the source files in the
- kernel Documentation/ tree.
-
- Say N if you are unsure.
-
config DMA_API_DEBUG
bool "Enable debugging of DMA-API usage"
depends on HAVE_DMA_API_DEBUG
diff --git a/samples/Kconfig b/samples/Kconfig
index 85c405f..d67b4b7 100644
--- a/samples/Kconfig
+++ b/samples/Kconfig
@@ -99,4 +99,10 @@ config SAMPLE_SECCOMP
Build samples of seccomp filters using various methods of
BPF filter construction.
+config SAMPLE_BLACKFIN_GPTIMERS
+ tristate "Build blackfin gptimers sample code -- loadable modules only"
+ depends on CONFIG_BLACKFIN && CONFIG_BFIN_GPTIMERS && m
+ help
+ Build samples of blackfin gptimers sample module.
+
endif # SAMPLES
diff --git a/samples/Makefile b/samples/Makefile
index 1a20169..e17d66d 100644
--- a/samples/Makefile
+++ b/samples/Makefile
@@ -2,4 +2,4 @@
obj-$(CONFIG_SAMPLES) += kobject/ kprobes/ trace_events/ livepatch/ \
hw_breakpoint/ kfifo/ kdb/ hidraw/ rpmsg/ seccomp/ \
- configfs/ connector/ v4l/ trace_printk/
+ configfs/ connector/ v4l/ trace_printk/ blackfin/
diff --git a/samples/blackfin/Makefile b/samples/blackfin/Makefile
new file mode 100644
index 0000000..89b86cf
--- /dev/null
+++ b/samples/blackfin/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_SAMPLE_BLACKFIN_GPTIMERS) += gptimers-example.o
diff --git a/samples/blackfin/gptimers-example.c b/samples/blackfin/gptimers-example.c
new file mode 100644
index 0000000..283eba9
--- /dev/null
+++ b/samples/blackfin/gptimers-example.c
@@ -0,0 +1,91 @@
+/*
+ * Simple gptimers example
+ * http://docs.blackfin.uclinux.org/doku.php?id=linux-kernel:drivers:gptimers
+ *
+ * Copyright 2007-2009 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <linux/interrupt.h>
+#include <linux/module.h>
+
+#include <asm/gptimers.h>
+#include <asm/portmux.h>
+
+/* ... random driver includes ... */
+
+#define DRIVER_NAME "gptimer_example"
+
+#ifdef IRQ_TIMER5
+#define SAMPLE_IRQ_TIMER IRQ_TIMER5
+#else
+#define SAMPLE_IRQ_TIMER IRQ_TIMER2
+#endif
+
+struct gptimer_data {
+ uint32_t period, width;
+};
+static struct gptimer_data data;
+
+/* ... random driver state ... */
+
+static irqreturn_t gptimer_example_irq(int irq, void *dev_id)
+{
+ struct gptimer_data *data = dev_id;
+
+ /* make sure it was our timer which caused the interrupt */
+ if (!get_gptimer_intr(TIMER5_id))
+ return IRQ_NONE;
+
+ /* read the width/period values that were captured for the waveform */
+ data->width = get_gptimer_pwidth(TIMER5_id);
+ data->period = get_gptimer_period(TIMER5_id);
+
+ /* acknowledge the interrupt */
+ clear_gptimer_intr(TIMER5_id);
+
+ /* tell the upper layers we took care of things */
+ return IRQ_HANDLED;
+}
+
+/* ... random driver code ... */
+
+static int __init gptimer_example_init(void)
+{
+ int ret;
+
+ /* grab the peripheral pins */
+ ret = peripheral_request(P_TMR5, DRIVER_NAME);
+ if (ret) {
+ printk(KERN_NOTICE DRIVER_NAME ": peripheral request failed\n");
+ return ret;
+ }
+
+ /* grab the IRQ for the timer */
+ ret = request_irq(SAMPLE_IRQ_TIMER, gptimer_example_irq,
+ IRQF_SHARED, DRIVER_NAME, &data);
+ if (ret) {
+ printk(KERN_NOTICE DRIVER_NAME ": IRQ request failed\n");
+ peripheral_free(P_TMR5);
+ return ret;
+ }
+
+ /* setup the timer and enable it */
+ set_gptimer_config(TIMER5_id,
+ WDTH_CAP | PULSE_HI | PERIOD_CNT | IRQ_ENA);
+ enable_gptimers(TIMER5bit);
+
+ return 0;
+}
+module_init(gptimer_example_init);
+
+static void __exit gptimer_example_exit(void)
+{
+ disable_gptimers(TIMER5bit);
+ free_irq(SAMPLE_IRQ_TIMER, &data);
+ peripheral_free(P_TMR5);
+}
+module_exit(gptimer_example_exit);
+
+MODULE_LICENSE("BSD");
--
2.7.4
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 2/2] Doc: update 00-INDEX files to reflect the runnable code move
2016-09-26 18:40 [PATCH 0/2] Moving runnable code from Documentation (last 2 patches) Shuah Khan
2016-09-26 18:40 ` [PATCH 1/2] samples: move blackfin gptimers-example from Documentation Shuah Khan
@ 2016-09-26 18:40 ` Shuah Khan
2016-09-26 18:44 ` [PATCH 0/2] Moving runnable code from Documentation (last 2 patches) Kees Cook
2016-09-30 13:57 ` Shuah Khan
3 siblings, 0 replies; 7+ messages in thread
From: Shuah Khan @ 2016-09-26 18:40 UTC (permalink / raw)
To: corbet, mmarek, akpm, keescook, dan.j.williams, mingo, paulmck,
jpoimboe, tj, aryabinin, nikolay, dvyukov, rostedt, olof, arnd,
hans.verkuil, nab, mchehab, broonie, tglx, ecree, davem
Cc: Shuah Khan, linux-doc, linux-kernel, linux-kbuild, linux-spi
Update 00-INDEX files with the current file list to reflect the runnable
code move.
Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
---
Documentation/00-INDEX | 2 --
Documentation/arm/00-INDEX | 2 --
Documentation/filesystems/00-INDEX | 2 --
Documentation/networking/00-INDEX | 2 --
Documentation/spi/00-INDEX | 2 --
Documentation/timers/00-INDEX | 2 --
6 files changed, 12 deletions(-)
diff --git a/Documentation/00-INDEX b/Documentation/00-INDEX
index cb9a6c6..b79d661 100644
--- a/Documentation/00-INDEX
+++ b/Documentation/00-INDEX
@@ -45,8 +45,6 @@ IRQ.txt
- description of what an IRQ is.
Intel-IOMMU.txt
- basic info on the Intel IOMMU virtualization support.
-Makefile
- - some files in Documentation dir are actually sample code to build
ManagementStyle
- how to (attempt to) manage kernel hackers.
RCU/
diff --git a/Documentation/arm/00-INDEX b/Documentation/arm/00-INDEX
index dea011c..b6e69fd 100644
--- a/Documentation/arm/00-INDEX
+++ b/Documentation/arm/00-INDEX
@@ -8,8 +8,6 @@ Interrupts
- ARM Interrupt subsystem documentation
IXP4xx
- Intel IXP4xx Network processor.
-Makefile
- - Build sourcefiles as part of the Documentation-build for arm
Netwinder
- Netwinder specific documentation
Porting
diff --git a/Documentation/filesystems/00-INDEX b/Documentation/filesystems/00-INDEX
index 9922939..f66e748 100644
--- a/Documentation/filesystems/00-INDEX
+++ b/Documentation/filesystems/00-INDEX
@@ -2,8 +2,6 @@
- this file (info on some of the filesystems supported by linux).
Locking
- info on locking rules as they pertain to Linux VFS.
-Makefile
- - Makefile for building the filsystems-part of DocBook.
9p.txt
- 9p (v9fs) is an implementation of the Plan 9 remote fs protocol.
adfs.txt
diff --git a/Documentation/networking/00-INDEX b/Documentation/networking/00-INDEX
index 415154a..98f3d4b 100644
--- a/Documentation/networking/00-INDEX
+++ b/Documentation/networking/00-INDEX
@@ -10,8 +10,6 @@ LICENSE.qlge
- GPLv2 for QLogic Linux qlge NIC Driver
LICENSE.qlcnic
- GPLv2 for QLogic Linux qlcnic NIC Driver
-Makefile
- - Makefile for docsrc.
PLIP.txt
- PLIP: The Parallel Line Internet Protocol device driver
README.ipw2100
diff --git a/Documentation/spi/00-INDEX b/Documentation/spi/00-INDEX
index 4644bf0..8e4bb17 100644
--- a/Documentation/spi/00-INDEX
+++ b/Documentation/spi/00-INDEX
@@ -1,7 +1,5 @@
00-INDEX
- this file.
-Makefile
- - Makefile for the example sourcefiles.
butterfly
- AVR Butterfly SPI driver overview and pin configuration.
ep93xx_spi
diff --git a/Documentation/timers/00-INDEX b/Documentation/timers/00-INDEX
index ee212a2..6ee117b 100644
--- a/Documentation/timers/00-INDEX
+++ b/Documentation/timers/00-INDEX
@@ -8,8 +8,6 @@ hpet_example.c
- sample hpet timer test program
hrtimers.txt
- subsystem for high-resolution kernel timers
-Makefile
- - Build and link hpet_example
NO_HZ.txt
- Summary of the different methods for the scheduler clock-interrupts management.
timekeeping.txt
--
2.7.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 0/2] Moving runnable code from Documentation (last 2 patches)
2016-09-26 18:40 [PATCH 0/2] Moving runnable code from Documentation (last 2 patches) Shuah Khan
2016-09-26 18:40 ` [PATCH 1/2] samples: move blackfin gptimers-example from Documentation Shuah Khan
2016-09-26 18:40 ` [PATCH 2/2] Doc: update 00-INDEX files to reflect the runnable code move Shuah Khan
@ 2016-09-26 18:44 ` Kees Cook
2016-09-30 13:57 ` Shuah Khan
3 siblings, 0 replies; 7+ messages in thread
From: Kees Cook @ 2016-09-26 18:44 UTC (permalink / raw)
To: Shuah Khan
Cc: Jonathan Corbet, Michal Marek, Andrew Morton, Dan Williams,
Ingo Molnar, Paul McKenney, Josh Poimboeuf, Tejun Heo,
Andrey Ryabinin, Nikolay Aleksandrov, Dmitry Vyukov,
Steven Rostedt, Olof Johansson, Arnd Bergmann, Hans Verkuil,
Nicholas A. Bellinger, mchehab, Mark Brown, Thomas Gleixner,
ecree, David S. Miller
On Mon, Sep 26, 2016 at 11:40 AM, Shuah Khan <shuahkh@osg.samsung.com> wrote:
> This patch series contains the last 2 patches to complete moving runnable
> code from Documentation to selftests, samples, and tools.
>
> The first patch moves blackfin gptimers-example to samples and removes
> CONFIG_BUILD_DOCSRC.
>
> The second one updates 00-INDEX files under Documentation to reflect the
> move of runnable code from Documentation.
Looks good to me!
Reviewed-by: Kees Cook <keescook@chromium.org>
-Kees
--
Kees Cook
Nexus Security
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 0/2] Moving runnable code from Documentation (last 2 patches)
2016-09-26 18:40 [PATCH 0/2] Moving runnable code from Documentation (last 2 patches) Shuah Khan
` (2 preceding siblings ...)
2016-09-26 18:44 ` [PATCH 0/2] Moving runnable code from Documentation (last 2 patches) Kees Cook
@ 2016-09-30 13:57 ` Shuah Khan
[not found] ` <0f5557aa-23ad-c37c-6d97-13789c0b5726-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org>
3 siblings, 1 reply; 7+ messages in thread
From: Shuah Khan @ 2016-09-30 13:57 UTC (permalink / raw)
To: corbet, mmarek
Cc: akpm, keescook, dan.j.williams, mingo, paulmck, jpoimboe, tj,
aryabinin, nikolay, dvyukov, rostedt, olof, arnd, hans.verkuil,
nab, mchehab, broonie, tglx, ecree, davem, linux-doc,
linux-kernel, linux-kbuild, linux-spi, Shuah Khan
On 09/26/2016 12:40 PM, Shuah Khan wrote:
> This patch series contains the last 2 patches to complete moving runnable
> code from Documentation to selftests, samples, and tools.
>
> The first patch moves blackfin gptimers-example to samples and removes
> CONFIG_BUILD_DOCSRC.
>
> The second one updates 00-INDEX files under Documentation to reflect the
> move of runnable code from Documentation.
>
> Shuah Khan (2):
> samples: move blackfin gptimers-example from Documentation
> Doc: update 00-INDEX files to reflect the runnable code move
>
Hi Jon and Michal,
Do these patches look good to you? I can get these into 4.9-rc1
with your Ack.
thanks,
-- Shuah
^ permalink raw reply [flat|nested] 7+ messages in thread