diff options
author | Shuah Khan <shuahkh@osg.samsung.com> | 2016-09-16 15:53:52 -0600 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-04-18 07:55:51 +0200 |
commit | ea506f99379ad68237ae898ab399994904196459 (patch) | |
tree | 0013faa7b1ba2941d7f21b845abbdd17c64766ce | |
parent | 53e8a594222b877d62d45d2295df0e36f45c6099 (diff) | |
download | linux-stable-ea506f99379ad68237ae898ab399994904196459.tar.gz linux-stable-ea506f99379ad68237ae898ab399994904196459.tar.bz2 linux-stable-ea506f99379ad68237ae898ab399994904196459.zip |
samples: move mic/mpssd example code from Documentation
commit 6bee835dd54e279f3d3ae2eca92a9c394b4fd028 upstream.
Move mic/mpssd examples to samples and remove it from Documentation
Makefile. Create a new Makefile to build mic/mpssd. It can be built
from top level directory or from mic/mpssd directory:
Run make -C samples/mic/mpssd or cd samples/mic/mpssd; make
Acked-by: Jonathan Corbet <corbet@lwn.net>
Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
[backported to 3.18-stable as this code is broken on newer versions of
gcc and we don't want to break the build for a Documentation sample.
- gregkh]
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | Documentation/Makefile | 2 | ||||
-rw-r--r-- | Documentation/mic/Makefile | 1 | ||||
-rw-r--r-- | Documentation/mic/mpssd/Makefile | 19 | ||||
-rw-r--r-- | samples/mic/mpssd/.gitignore (renamed from Documentation/mic/mpssd/.gitignore) | 0 | ||||
-rw-r--r-- | samples/mic/mpssd/Makefile | 27 | ||||
-rw-r--r--[-rwxr-xr-x] | samples/mic/mpssd/micctrl (renamed from Documentation/mic/mpssd/micctrl) | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | samples/mic/mpssd/mpss (renamed from Documentation/mic/mpssd/mpss) | 0 | ||||
-rw-r--r-- | samples/mic/mpssd/mpssd.c (renamed from Documentation/mic/mpssd/mpssd.c) | 0 | ||||
-rw-r--r-- | samples/mic/mpssd/mpssd.h (renamed from Documentation/mic/mpssd/mpssd.h) | 0 | ||||
-rw-r--r-- | samples/mic/mpssd/sysfs.c (renamed from Documentation/mic/mpssd/sysfs.c) | 0 |
10 files changed, 28 insertions, 21 deletions
diff --git a/Documentation/Makefile b/Documentation/Makefile index bc0548201755..fc759598c4c9 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -1,4 +1,4 @@ subdir-y := accounting auxdisplay blackfin connector \ - filesystems filesystems ia64 laptops mic misc-devices \ + filesystems filesystems ia64 laptops misc-devices \ networking pcmcia prctl ptp spi timers vDSO video4linux \ watchdog diff --git a/Documentation/mic/Makefile b/Documentation/mic/Makefile deleted file mode 100644 index a191d453badf..000000000000 --- a/Documentation/mic/Makefile +++ /dev/null @@ -1 +0,0 @@ -subdir-y := mpssd diff --git a/Documentation/mic/mpssd/Makefile b/Documentation/mic/mpssd/Makefile deleted file mode 100644 index 0f3156888048..000000000000 --- a/Documentation/mic/mpssd/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -# List of programs to build -hostprogs-y := mpssd - -mpssd-objs := mpssd.o sysfs.o - -# Tell kbuild to always build the programs -always := $(hostprogs-y) - -HOSTCFLAGS += -I$(objtree)/usr/include -I$(srctree)/tools/include - -ifdef DEBUG -HOSTCFLAGS += -DDEBUG=$(DEBUG) -endif - -HOSTLOADLIBES_mpssd := -lpthread - -install: - install mpssd /usr/sbin/mpssd - install micctrl /usr/sbin/micctrl diff --git a/Documentation/mic/mpssd/.gitignore b/samples/mic/mpssd/.gitignore index 8b7c72f07c92..8b7c72f07c92 100644 --- a/Documentation/mic/mpssd/.gitignore +++ b/samples/mic/mpssd/.gitignore diff --git a/samples/mic/mpssd/Makefile b/samples/mic/mpssd/Makefile new file mode 100644 index 000000000000..3e3ef91fed6b --- /dev/null +++ b/samples/mic/mpssd/Makefile @@ -0,0 +1,27 @@ +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) + +PROGS := mpssd +CC = $(CROSS_COMPILE)gcc +CFLAGS := -I../../../usr/include -I../../../tools/include + +ifdef DEBUG +CFLAGS += -DDEBUG=$(DEBUG) +endif + +all: $(PROGS) +mpssd: mpssd.c sysfs.c + $(CC) $(CFLAGS) mpssd.c sysfs.c -o mpssd -lpthread + +install: + install mpssd /usr/sbin/mpssd + install micctrl /usr/sbin/micctrl + +clean: + rm -fr $(PROGS) + +endif +endif diff --git a/Documentation/mic/mpssd/micctrl b/samples/mic/mpssd/micctrl index 8f2629b41c5f..8f2629b41c5f 100755..100644 --- a/Documentation/mic/mpssd/micctrl +++ b/samples/mic/mpssd/micctrl diff --git a/Documentation/mic/mpssd/mpss b/samples/mic/mpssd/mpss index cacbdb0aefb9..cacbdb0aefb9 100755..100644 --- a/Documentation/mic/mpssd/mpss +++ b/samples/mic/mpssd/mpss diff --git a/Documentation/mic/mpssd/mpssd.c b/samples/mic/mpssd/mpssd.c index 3c5c379fc29d..3c5c379fc29d 100644 --- a/Documentation/mic/mpssd/mpssd.c +++ b/samples/mic/mpssd/mpssd.c diff --git a/Documentation/mic/mpssd/mpssd.h b/samples/mic/mpssd/mpssd.h index f5f18b15d9a0..f5f18b15d9a0 100644 --- a/Documentation/mic/mpssd/mpssd.h +++ b/samples/mic/mpssd/mpssd.h diff --git a/Documentation/mic/mpssd/sysfs.c b/samples/mic/mpssd/sysfs.c index 8dd326936083..8dd326936083 100644 --- a/Documentation/mic/mpssd/sysfs.c +++ b/samples/mic/mpssd/sysfs.c |