Skip to contentSkip to conversation

Patch "samples: move mic/mpssd example code from Documentation" has been added to the 4.4-stable tree

PATCH [email protected] 1 participant 1 message Mar 12, 2017

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

samples: move mic/mpssd example code from Documentation

to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
samples-move-mic-mpssd-example-code-from-documentation.patch
and it can be found in the queue-4.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 6bee835dd54e279f3d3ae2eca92a9c394b4fd028 Mon Sep 17 00:00:00 2001

From: Shuah Khan <[email protected]>
Date: Fri, 16 Sep 2016 15:53:52 -0600
Subject: samples: move mic/mpssd example code from Documentation

From: Shuah Khan <[email protected]>

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

[backported to 4.4-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]

---
 Documentation/Makefile             |    2 
 Documentation/mic/Makefile         |    1 
 Documentation/mic/mpssd/.gitignore |    1 
 Documentation/mic/mpssd/Makefile   |   21 
 Documentation/mic/mpssd/micctrl    |  173 ---
 Documentation/mic/mpssd/mpss       |  200 ----
 Documentation/mic/mpssd/mpssd.c    | 1826 -------------------------------------
 Documentation/mic/mpssd/mpssd.h    |  103 --
 Documentation/mic/mpssd/sysfs.c    |  102 --
 samples/mic/mpssd/.gitignore       |    1 
 samples/mic/mpssd/Makefile         |   27 
 samples/mic/mpssd/micctrl          |  173 +++
 samples/mic/mpssd/mpss             |  200 ++++
 samples/mic/mpssd/mpssd.c          | 1826 +++++++++++++++++++++++++++++++++++++
 samples/mic/mpssd/mpssd.h          |  103 ++
 samples/mic/mpssd/sysfs.c          |  102 ++
 16 files changed, 2433 insertions(+), 2428 deletions(-)
Documentation/Makefile +1 -1
@@ -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
Documentation/mic/Makefile deleted +0 -1
@@ -1 +0,0 @@
-subdir-y := mpssd
Documentation/mic/mpssd/.gitignore deleted +0 -1
@@ -1 +0,0 @@
-mpssd
Documentation/mic/mpssd/Makefile deleted +0 -21
@@ -1,21 +0,0 @@
-ifndef CROSS_COMPILE
-# List of programs to build
-hostprogs-$(CONFIG_X86_64) := 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
-endif
Documentation/mic/mpssd/micctrl deleted +0 -173

173 lines not on this page · raw message

Documentation/mic/mpssd/mpss deleted +0 -200

200 lines not on this page · raw message

Documentation/mic/mpssd/mpssd.c deleted +0 -1826

1,826 lines not on this page · raw message

Documentation/mic/mpssd/mpssd.h deleted +0 -103

103 lines not on this page · raw message

Documentation/mic/mpssd/sysfs.c deleted +0 -102

102 lines not on this page · raw message

samples/mic/mpssd/.gitignore new file +1 -0
@@ -0,0 +1 @@
+mpssd
samples/mic/mpssd/Makefile new file +27 -0
@@ -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
samples/mic/mpssd/micctrl new file +173 -0

173 lines not on this page · raw message

samples/mic/mpssd/mpss new file +200 -0

200 lines not on this page · raw message

samples/mic/mpssd/mpssd.c new file +1826 -0

167 lines not on this page · raw message

samples/mic/mpssd/mpssd.h new file +103 -0

103 lines not on this page · raw message

samples/mic/mpssd/sysfs.c new file +102 -0

102 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Patches currently in stable-queue which might be from [email protected] are

queue-4.4/samples-move-mic-mpssd-example-code-from-documentation.patch

Part of the diff is not shown here. View the raw message.