From df68a01014fd5dea890349321787ca08a5377f0b Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Thu, 25 Sep 2014 11:23:02 -0700 Subject: Documentation: use subdir-y to avoid unnecessary built-in.o files Change the Documentation makefiles from obj-m to subdir-y to avoid generating unnecessary built-in.o files since nothing in Documentation/ is ever linked in to vmlinux. Signed-off-by: Peter Foley Acked-by: Sam Ravnborg Signed-off-by: Randy Dunlap Signed-off-by: Jiri Kosina --- Documentation/Makefile | 6 +++--- Documentation/accounting/Makefile | 3 --- Documentation/auxdisplay/Makefile | 3 --- Documentation/filesystems/Makefile | 3 --- Documentation/ia64/Makefile | 3 --- Documentation/laptops/Makefile | 3 --- Documentation/misc-devices/Makefile | 1 + Documentation/misc-devices/mei/Makefile | 3 --- Documentation/networking/Makefile | 8 +------- Documentation/networking/timestamping/Makefile | 3 --- Documentation/pcmcia/Makefile | 3 --- Documentation/spi/Makefile | 3 --- Documentation/timers/Makefile | 3 --- Documentation/watchdog/Makefile | 1 + Documentation/watchdog/src/Makefile | 3 --- 15 files changed, 6 insertions(+), 43 deletions(-) create mode 100644 Documentation/misc-devices/Makefile create mode 100644 Documentation/watchdog/Makefile (limited to 'Documentation') diff --git a/Documentation/Makefile b/Documentation/Makefile index 31d302b..605f84f 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -1,3 +1,3 @@ -obj-m := DocBook/ accounting/ auxdisplay/ connector/ \ - filesystems/ filesystems/configfs/ ia64/ laptops/ networking/ \ - pcmcia/ spi/ timers/ watchdog/src/ misc-devices/mei/ +subdir-y := DocBook accounting auxdisplay connector \ + filesystems filesystems ia64 laptops networking \ + pcmcia spi timers watchdog misc-devices diff --git a/Documentation/accounting/Makefile b/Documentation/accounting/Makefile index 31929eb..7e232cb 100644 --- a/Documentation/accounting/Makefile +++ b/Documentation/accounting/Makefile @@ -1,6 +1,3 @@ -# kbuild trick to avoid linker error. Can be omitted if a module is built. -obj- := dummy.o - # List of programs to build hostprogs-y := getdelays diff --git a/Documentation/auxdisplay/Makefile b/Documentation/auxdisplay/Makefile index 51fe233..ada4dac 100644 --- a/Documentation/auxdisplay/Makefile +++ b/Documentation/auxdisplay/Makefile @@ -1,6 +1,3 @@ -# kbuild trick to avoid linker error. Can be omitted if a module is built. -obj- := dummy.o - # List of programs to build hostprogs-y := cfag12864b-example diff --git a/Documentation/filesystems/Makefile b/Documentation/filesystems/Makefile index a5dd114..883010c 100644 --- a/Documentation/filesystems/Makefile +++ b/Documentation/filesystems/Makefile @@ -1,6 +1,3 @@ -# kbuild trick to avoid linker error. Can be omitted if a module is built. -obj- := dummy.o - # List of programs to build hostprogs-y := dnotify_test diff --git a/Documentation/ia64/Makefile b/Documentation/ia64/Makefile index b75db69..d493163 100644 --- a/Documentation/ia64/Makefile +++ b/Documentation/ia64/Makefile @@ -1,6 +1,3 @@ -# kbuild trick to avoid linker error. Can be omitted if a module is built. -obj- := dummy.o - # List of programs to build hostprogs-y := aliasing-test diff --git a/Documentation/laptops/Makefile b/Documentation/laptops/Makefile index 5cb144a..0abe44f 100644 --- a/Documentation/laptops/Makefile +++ b/Documentation/laptops/Makefile @@ -1,6 +1,3 @@ -# kbuild trick to avoid linker error. Can be omitted if a module is built. -obj- := dummy.o - # List of programs to build hostprogs-y := dslm diff --git a/Documentation/misc-devices/Makefile b/Documentation/misc-devices/Makefile new file mode 100644 index 0000000..e2b7aa4 --- /dev/null +++ b/Documentation/misc-devices/Makefile @@ -0,0 +1 @@ +subdir-y := mei diff --git a/Documentation/misc-devices/mei/Makefile b/Documentation/misc-devices/mei/Makefile index 00e8c3e..d758047 100644 --- a/Documentation/misc-devices/mei/Makefile +++ b/Documentation/misc-devices/mei/Makefile @@ -1,6 +1,3 @@ -# kbuild trick to avoid linker error. Can be omitted if a module is built. -obj- := dummy.o - # List of programs to build hostprogs-y := mei-amt-version HOSTCFLAGS_mei-amt-version.o += -I$(objtree)/usr/include diff --git a/Documentation/networking/Makefile b/Documentation/networking/Makefile index 0aa1ac9..4c5d7c48 100644 --- a/Documentation/networking/Makefile +++ b/Documentation/networking/Makefile @@ -1,7 +1 @@ -# kbuild trick to avoid linker error. Can be omitted if a module is built. -obj- := dummy.o - -# Tell kbuild to always build the programs -always := $(hostprogs-y) - -obj-m := timestamping/ +subdir-y := timestamping diff --git a/Documentation/networking/timestamping/Makefile b/Documentation/networking/timestamping/Makefile index d934afc..bbe6f81 100644 --- a/Documentation/networking/timestamping/Makefile +++ b/Documentation/networking/timestamping/Makefile @@ -1,6 +1,3 @@ -# kbuild trick to avoid linker error. Can be omitted if a module is built. -obj- := dummy.o - # List of programs to build hostprogs-y := timestamping hwtstamp_config diff --git a/Documentation/pcmcia/Makefile b/Documentation/pcmcia/Makefile index accde87..47a8fa1 100644 --- a/Documentation/pcmcia/Makefile +++ b/Documentation/pcmcia/Makefile @@ -1,6 +1,3 @@ -# kbuild trick to avoid linker error. Can be omitted if a module is built. -obj- := dummy.o - # List of programs to build hostprogs-y := crc32hash diff --git a/Documentation/spi/Makefile b/Documentation/spi/Makefile index a5b03c8..efa2558 100644 --- a/Documentation/spi/Makefile +++ b/Documentation/spi/Makefile @@ -1,6 +1,3 @@ -# kbuild trick to avoid linker error. Can be omitted if a module is built. -obj- := dummy.o - # List of programs to build hostprogs-y := spidev_test spidev_fdx diff --git a/Documentation/timers/Makefile b/Documentation/timers/Makefile index 73f75f8..6c09ee6 100644 --- a/Documentation/timers/Makefile +++ b/Documentation/timers/Makefile @@ -1,6 +1,3 @@ -# kbuild trick to avoid linker error. Can be omitted if a module is built. -obj- := dummy.o - # List of programs to build hostprogs-$(CONFIG_X86) := hpet_example diff --git a/Documentation/watchdog/Makefile b/Documentation/watchdog/Makefile new file mode 100644 index 0000000..6018f45 --- /dev/null +++ b/Documentation/watchdog/Makefile @@ -0,0 +1 @@ +subdir-y := src diff --git a/Documentation/watchdog/src/Makefile b/Documentation/watchdog/src/Makefile index 40e5f46..4a892c3 100644 --- a/Documentation/watchdog/src/Makefile +++ b/Documentation/watchdog/src/Makefile @@ -1,6 +1,3 @@ -# kbuild trick to avoid linker error. Can be omitted if a module is built. -obj- := dummy.o - # List of programs to build hostprogs-y := watchdog-simple watchdog-test -- cgit v1.1 From adb19fb66eeebac07fe37d968725bb8906dadb8e Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Thu, 25 Sep 2014 11:23:09 -0700 Subject: Documentation: add makefiles for more targets Add a bunch of previously unbuilt source files to the Documentation build machinery. Signed-off-by: Peter Foley Signed-off-by: Randy Dunlap Signed-off-by: Jiri Kosina --- Documentation/Makefile | 7 +++--- Documentation/arm/Makefile | 1 + Documentation/arm/SH-Mobile/Makefile | 11 ++++----- Documentation/blackfin/Makefile | 7 ++---- Documentation/filesystems/Makefile | 2 ++ Documentation/laptops/Makefile | 2 +- Documentation/mic/Makefile | 1 + Documentation/mic/mpssd/Makefile | 24 +++++++++---------- Documentation/networking/timestamping/Makefile | 5 +--- Documentation/prctl/Makefile | 8 +++++++ Documentation/ptp/Makefile | 8 +++++++ Documentation/ptp/testptp.mk | 33 -------------------------- Documentation/vDSO/Makefile | 9 +++++++ Documentation/video4linux/Makefile | 1 + 14 files changed, 55 insertions(+), 64 deletions(-) create mode 100644 Documentation/arm/Makefile create mode 100644 Documentation/mic/Makefile create mode 100644 Documentation/prctl/Makefile create mode 100644 Documentation/ptp/Makefile delete mode 100644 Documentation/ptp/testptp.mk create mode 100644 Documentation/vDSO/Makefile create mode 100644 Documentation/video4linux/Makefile (limited to 'Documentation') diff --git a/Documentation/Makefile b/Documentation/Makefile index 605f84f..6883a1b 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -1,3 +1,4 @@ -subdir-y := DocBook accounting auxdisplay connector \ - filesystems filesystems ia64 laptops networking \ - pcmcia spi timers watchdog misc-devices +subdir-y := accounting arm auxdisplay blackfin connector \ + filesystems filesystems ia64 laptops mic misc-devices \ + networking pcmcia prctl ptp spi timers vDSO video4linux \ + watchdog diff --git a/Documentation/arm/Makefile b/Documentation/arm/Makefile new file mode 100644 index 0000000..732c770 --- /dev/null +++ b/Documentation/arm/Makefile @@ -0,0 +1 @@ +subdir-y := SH-Mobile diff --git a/Documentation/arm/SH-Mobile/Makefile b/Documentation/arm/SH-Mobile/Makefile index 8771d83..ac8075d 100644 --- a/Documentation/arm/SH-Mobile/Makefile +++ b/Documentation/arm/SH-Mobile/Makefile @@ -1,8 +1,7 @@ -BIN := vrl4 +# List of programs to build +hostprogs-y := vrl4 -.PHONY: all -all: $(BIN) +# Tell kbuild to always build the programs +always := $(hostprogs-y) -.PHONY: clean -clean: - rm -f *.o $(BIN) +HOSTCFLAGS_vrl4.o += -I$(objtree)/usr/include diff --git a/Documentation/blackfin/Makefile b/Documentation/blackfin/Makefile index 773dbb1..c7e6c99 100644 --- a/Documentation/blackfin/Makefile +++ b/Documentation/blackfin/Makefile @@ -1,6 +1,3 @@ +ifneq ($(CONFIG_BLACKFIN),) obj-m := gptimers-example.o - -all: modules - -modules clean: - $(MAKE) -C ../.. SUBDIRS=$(PWD) $@ +endif diff --git a/Documentation/filesystems/Makefile b/Documentation/filesystems/Makefile index 883010c..13483d1 100644 --- a/Documentation/filesystems/Makefile +++ b/Documentation/filesystems/Makefile @@ -1,3 +1,5 @@ +subdir-y := configfs + # List of programs to build hostprogs-y := dnotify_test diff --git a/Documentation/laptops/Makefile b/Documentation/laptops/Makefile index 0abe44f..2b0fa5e 100644 --- a/Documentation/laptops/Makefile +++ b/Documentation/laptops/Makefile @@ -1,5 +1,5 @@ # List of programs to build -hostprogs-y := dslm +hostprogs-y := dslm freefall # Tell kbuild to always build the programs always := $(hostprogs-y) diff --git a/Documentation/mic/Makefile b/Documentation/mic/Makefile new file mode 100644 index 0000000..a191d45 --- /dev/null +++ b/Documentation/mic/Makefile @@ -0,0 +1 @@ +subdir-y := mpssd diff --git a/Documentation/mic/mpssd/Makefile b/Documentation/mic/mpssd/Makefile index eb860a7..aaa89d1 100644 --- a/Documentation/mic/mpssd/Makefile +++ b/Documentation/mic/mpssd/Makefile @@ -1,19 +1,19 @@ -# -# Makefile - Intel MIC User Space Tools. -# Copyright(c) 2013, Intel Corporation. -# +# 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_mpssd.o += -I$(objtree)/usr/include + ifdef DEBUG -CFLAGS += $(USERWARNFLAGS) -I. -g -Wall -DDEBUG=$(DEBUG) -else -CFLAGS += $(USERWARNFLAGS) -I. -g -Wall +HOSTCFLAGS += -DDEBUG=$(DEBUG) endif -mpssd: mpssd.o sysfs.o - $(CC) $(CFLAGS) -o $@ $^ -lpthread +HOSTLOADLIBES_mpssd := -lpthread install: install mpssd /usr/sbin/mpssd install micctrl /usr/sbin/micctrl - -clean: - rm -f mpssd *.o diff --git a/Documentation/networking/timestamping/Makefile b/Documentation/networking/timestamping/Makefile index bbe6f81..52ac67d 100644 --- a/Documentation/networking/timestamping/Makefile +++ b/Documentation/networking/timestamping/Makefile @@ -1,11 +1,8 @@ # List of programs to build -hostprogs-y := timestamping hwtstamp_config +hostprogs-y := hwtstamp_config timestamping # Tell kbuild to always build the programs always := $(hostprogs-y) HOSTCFLAGS_timestamping.o += -I$(objtree)/usr/include HOSTCFLAGS_hwtstamp_config.o += -I$(objtree)/usr/include - -clean: - rm -f timestamping hwtstamp_config diff --git a/Documentation/prctl/Makefile b/Documentation/prctl/Makefile new file mode 100644 index 0000000..3e3232d --- /dev/null +++ b/Documentation/prctl/Makefile @@ -0,0 +1,8 @@ +# List of programs to build +hostprogs-y := disable-tsc-ctxt-sw-stress-test disable-tsc-on-off-stress-test disable-tsc-test +# Tell kbuild to always build the programs +always := $(hostprogs-y) + +HOSTCFLAGS_disable-tsc-ctxt-sw-stress-test.o += -I$(objtree)/usr/include +HOSTCFLAGS_disable-tsc-on-off-stress-test.o += -I$(objtree)/usr/include +HOSTCFLAGS_disable-tsc-test.o += -I$(objtree)/usr/include diff --git a/Documentation/ptp/Makefile b/Documentation/ptp/Makefile new file mode 100644 index 0000000..293d6c0 --- /dev/null +++ b/Documentation/ptp/Makefile @@ -0,0 +1,8 @@ +# List of programs to build +hostprogs-y := testptp + +# Tell kbuild to always build the programs +always := $(hostprogs-y) + +HOSTCFLAGS_testptp.o += -I$(objtree)/usr/include +HOSTLOADLIBES_testptp := -lrt diff --git a/Documentation/ptp/testptp.mk b/Documentation/ptp/testptp.mk deleted file mode 100644 index 4ef2d97..0000000 --- a/Documentation/ptp/testptp.mk +++ /dev/null @@ -1,33 +0,0 @@ -# PTP 1588 clock support - User space test program -# -# Copyright (C) 2010 OMICRON electronics GmbH -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -CC = $(CROSS_COMPILE)gcc -INC = -I$(KBUILD_OUTPUT)/usr/include -CFLAGS = -Wall $(INC) -LDLIBS = -lrt -PROGS = testptp - -all: $(PROGS) - -testptp: testptp.o - -clean: - rm -f testptp.o - -distclean: clean - rm -f $(PROGS) diff --git a/Documentation/vDSO/Makefile b/Documentation/vDSO/Makefile new file mode 100644 index 0000000..6cbd612 --- /dev/null +++ b/Documentation/vDSO/Makefile @@ -0,0 +1,9 @@ +# List of programs to build +hostprogs-$(CONFIG_X86) := vdso_test +vdso_test-objs := parse_vdso.o vdso_test.o + +# Tell kbuild to always build the programs +##always := $(hostprogs-y) + +HOSTCFLAGS := -I$(objtree)/usr/include -std=gnu99 +HOSTLDFLAGS = -nostdlib -fno-asynchronous-unwind-tables diff --git a/Documentation/video4linux/Makefile b/Documentation/video4linux/Makefile new file mode 100644 index 0000000..d58101e --- /dev/null +++ b/Documentation/video4linux/Makefile @@ -0,0 +1 @@ +obj-m := v4l2-pci-skeleton.o -- cgit v1.1 From 0421fc837c822e86c76884a30a9155e512a5a66a Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Thu, 25 Sep 2014 11:23:15 -0700 Subject: Documentation: make functions static to avoid prototype warnings Signed-off-by: Peter Foley Signed-off-by: Randy Dunlap Signed-off-by: Jiri Kosina --- Documentation/arm/SH-Mobile/vrl4.c | 6 +++--- Documentation/prctl/disable-tsc-ctxt-sw-stress-test.c | 11 ++++++----- Documentation/prctl/disable-tsc-on-off-stress-test.c | 7 ++++--- Documentation/prctl/disable-tsc-test.c | 5 +++-- 4 files changed, 16 insertions(+), 13 deletions(-) (limited to 'Documentation') diff --git a/Documentation/arm/SH-Mobile/vrl4.c b/Documentation/arm/SH-Mobile/vrl4.c index e8a1913..4cbbba5 100644 --- a/Documentation/arm/SH-Mobile/vrl4.c +++ b/Documentation/arm/SH-Mobile/vrl4.c @@ -77,7 +77,7 @@ struct hdr { #define ROUND_UP(x) ((x + ALIGN - 1) & ~(ALIGN - 1)) -ssize_t do_read(int fd, void *buf, size_t count) +static ssize_t do_read(int fd, void *buf, size_t count) { size_t offset = 0; ssize_t l; @@ -98,7 +98,7 @@ ssize_t do_read(int fd, void *buf, size_t count) return offset; } -ssize_t do_write(int fd, const void *buf, size_t count) +static ssize_t do_write(int fd, const void *buf, size_t count) { size_t offset = 0; ssize_t l; @@ -117,7 +117,7 @@ ssize_t do_write(int fd, const void *buf, size_t count) return offset; } -ssize_t write_zero(int fd, size_t len) +static ssize_t write_zero(int fd, size_t len) { size_t i = len; diff --git a/Documentation/prctl/disable-tsc-ctxt-sw-stress-test.c b/Documentation/prctl/disable-tsc-ctxt-sw-stress-test.c index f8e8e95e8..81fdd42 100644 --- a/Documentation/prctl/disable-tsc-ctxt-sw-stress-test.c +++ b/Documentation/prctl/disable-tsc-ctxt-sw-stress-test.c @@ -27,19 +27,20 @@ # define PR_TSC_SIGSEGV 2 /* throw a SIGSEGV instead of reading the TSC */ #endif -uint64_t rdtsc() { +static uint64_t rdtsc(void) +{ uint32_t lo, hi; /* We cannot use "=A", since this would use %rax on x86_64 */ __asm__ __volatile__ ("rdtsc" : "=a" (lo), "=d" (hi)); return (uint64_t)hi << 32 | lo; } -void sigsegv_expect(int sig) +static void sigsegv_expect(int sig) { /* */ } -void segvtask(void) +static void segvtask(void) { if (prctl(PR_SET_TSC, PR_TSC_SIGSEGV) < 0) { @@ -54,13 +55,13 @@ void segvtask(void) } -void sigsegv_fail(int sig) +static void sigsegv_fail(int sig) { fprintf(stderr, "FATAL ERROR, rdtsc() failed while enabled\n"); exit(0); } -void rdtsctask(void) +static void rdtsctask(void) { if (prctl(PR_SET_TSC, PR_TSC_ENABLE) < 0) { diff --git a/Documentation/prctl/disable-tsc-on-off-stress-test.c b/Documentation/prctl/disable-tsc-on-off-stress-test.c index 1fcd9144..4d83a27 100644 --- a/Documentation/prctl/disable-tsc-on-off-stress-test.c +++ b/Documentation/prctl/disable-tsc-on-off-stress-test.c @@ -29,7 +29,8 @@ /* snippet from wikipedia :-) */ -uint64_t rdtsc() { +static uint64_t rdtsc(void) +{ uint32_t lo, hi; /* We cannot use "=A", since this would use %rax on x86_64 */ __asm__ __volatile__ ("rdtsc" : "=a" (lo), "=d" (hi)); @@ -38,7 +39,7 @@ return (uint64_t)hi << 32 | lo; int should_segv = 0; -void sigsegv_cb(int sig) +static void sigsegv_cb(int sig) { if (!should_segv) { @@ -55,7 +56,7 @@ void sigsegv_cb(int sig) rdtsc(); } -void task(void) +static void task(void) { signal(SIGSEGV, sigsegv_cb); alarm(10); diff --git a/Documentation/prctl/disable-tsc-test.c b/Documentation/prctl/disable-tsc-test.c index 843c81e..2541e65 100644 --- a/Documentation/prctl/disable-tsc-test.c +++ b/Documentation/prctl/disable-tsc-test.c @@ -29,14 +29,15 @@ const char *tsc_names[] = [PR_TSC_SIGSEGV] = "PR_TSC_SIGSEGV", }; -uint64_t rdtsc() { +static uint64_t rdtsc(void) +{ uint32_t lo, hi; /* We cannot use "=A", since this would use %rax on x86_64 */ __asm__ __volatile__ ("rdtsc" : "=a" (lo), "=d" (hi)); return (uint64_t)hi << 32 | lo; } -void sigsegv_cb(int sig) +static void sigsegv_cb(int sig) { int tsc_val = 0; -- cgit v1.1 From 6ab0e475f1f38b6be90aff4ef3ebf928c4a73dc8 Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Thu, 25 Sep 2014 11:23:21 -0700 Subject: Documentation: fix misc. warnings Fix a few warnings that gcc emits during a default build. Signed-off-by: Peter Foley Signed-off-by: Randy Dunlap Signed-off-by: Jiri Kosina --- Documentation/mic/mpssd/mpssd.c | 4 ++-- Documentation/ptp/testptp.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'Documentation') diff --git a/Documentation/mic/mpssd/mpssd.c b/Documentation/mic/mpssd/mpssd.c index 4d17487..24203dd 100644 --- a/Documentation/mic/mpssd/mpssd.c +++ b/Documentation/mic/mpssd/mpssd.c @@ -1476,9 +1476,9 @@ set_cmdline(struct mic_info *mic) len = snprintf(buffer, PATH_MAX, "clocksource=tsc highres=off nohz=off "); - len += snprintf(buffer + len, PATH_MAX, + len += snprintf(buffer + len, PATH_MAX - len, "cpufreq_on;corec6_off;pc3_off;pc6_off "); - len += snprintf(buffer + len, PATH_MAX, + len += snprintf(buffer + len, PATH_MAX - len, "ifcfg=static;address,172.31.%d.1;netmask,255.255.255.0", mic->id); diff --git a/Documentation/ptp/testptp.c b/Documentation/ptp/testptp.c index ba1d502..2bc8abc 100644 --- a/Documentation/ptp/testptp.c +++ b/Documentation/ptp/testptp.c @@ -500,11 +500,11 @@ int main(int argc, char *argv[]) interval = t2 - t1; offset = (t2 + t1) / 2 - tp; - printf("system time: %" PRId64 ".%u\n", + printf("system time: %lld.%u\n", (pct+2*i)->sec, (pct+2*i)->nsec); - printf("phc time: %" PRId64 ".%u\n", + printf("phc time: %lld.%u\n", (pct+2*i+1)->sec, (pct+2*i+1)->nsec); - printf("system time: %" PRId64 ".%u\n", + printf("system time: %lld.%u\n", (pct+2*i+2)->sec, (pct+2*i+2)->nsec); printf("system/phc clock time offset is %" PRId64 " ns\n" "system clock time delay is %" PRId64 " ns\n", -- cgit v1.1 From 19f94f97003a70a5241efff035f6c181c290a799 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Thu, 25 Sep 2014 11:23:27 -0700 Subject: v4l2-pci-skeleton: Only build if PCI is available Currently arm64 does not support PCI but it does support v4l2. Since the PCI skeleton driver is built unconditionally as a module with no dependency on PCI this causes build failures for arm64 allmodconfig. Fix this by defining a symbol VIDEO_PCI_SKELETON for the skeleton and conditionalising the build on that. Signed-off-by: Mark Brown Signed-off-by: Randy Dunlap [added VIDEO dependencies] Signed-off-by: Jiri Kosina --- Documentation/video4linux/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Documentation') diff --git a/Documentation/video4linux/Makefile b/Documentation/video4linux/Makefile index d58101e..65a351d 100644 --- a/Documentation/video4linux/Makefile +++ b/Documentation/video4linux/Makefile @@ -1 +1 @@ -obj-m := v4l2-pci-skeleton.o +obj-$(CONFIG_VIDEO_PCI_SKELETON) := v4l2-pci-skeleton.o -- cgit v1.1 From 8c2b0dc83d9840da4d993a5dbb15c5974ad5a188 Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Thu, 25 Sep 2014 11:23:32 -0700 Subject: Documentation: support glibc versions without htole macros glibc 2.9 introduced the htole<16/32/64> macros, add them to tools/include to support older versions of glibc. Reported-by: Andrew Morton Signed-off-by: Peter Foley Signed-off-by: Randy Dunlap Signed-off-by: Jiri Kosina --- Documentation/arm/SH-Mobile/Makefile | 2 +- Documentation/arm/SH-Mobile/vrl4.c | 1 + Documentation/mic/mpssd/Makefile | 2 +- Documentation/mic/mpssd/mpssd.c | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) (limited to 'Documentation') diff --git a/Documentation/arm/SH-Mobile/Makefile b/Documentation/arm/SH-Mobile/Makefile index ac8075d..bca8a7e 100644 --- a/Documentation/arm/SH-Mobile/Makefile +++ b/Documentation/arm/SH-Mobile/Makefile @@ -4,4 +4,4 @@ hostprogs-y := vrl4 # Tell kbuild to always build the programs always := $(hostprogs-y) -HOSTCFLAGS_vrl4.o += -I$(objtree)/usr/include +HOSTCFLAGS_vrl4.o += -I$(objtree)/usr/include -I$(srctree)/tools/include diff --git a/Documentation/arm/SH-Mobile/vrl4.c b/Documentation/arm/SH-Mobile/vrl4.c index 4cbbba5..f4cd8ad 100644 --- a/Documentation/arm/SH-Mobile/vrl4.c +++ b/Documentation/arm/SH-Mobile/vrl4.c @@ -34,6 +34,7 @@ #include #include #include +#include struct hdr { uint32_t magic1; diff --git a/Documentation/mic/mpssd/Makefile b/Documentation/mic/mpssd/Makefile index aaa89d1..505d84f18 100644 --- a/Documentation/mic/mpssd/Makefile +++ b/Documentation/mic/mpssd/Makefile @@ -6,7 +6,7 @@ mpssd-objs := mpssd.o sysfs.o # Tell kbuild to always build the programs always := $(hostprogs-y) -HOSTCFLAGS_mpssd.o += -I$(objtree)/usr/include +HOSTCFLAGS_mpssd.o += -I$(objtree)/usr/include -I$(srctree)/tools/include ifdef DEBUG HOSTCFLAGS += -DDEBUG=$(DEBUG) diff --git a/Documentation/mic/mpssd/mpssd.c b/Documentation/mic/mpssd/mpssd.c index 24203dd..3c5c379 100644 --- a/Documentation/mic/mpssd/mpssd.c +++ b/Documentation/mic/mpssd/mpssd.c @@ -41,6 +41,7 @@ #include "mpssd.h" #include #include +#include static void init_mic(struct mic_info *mic); -- cgit v1.1 From c5e2a7e01269cd9839fef8a5c5ac258277b3b08f Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Thu, 25 Sep 2014 11:23:37 -0700 Subject: Documentation: update .gitignore files Add some missing files to .gitignore. Push Documentation/.gitignore down into subdirectories. Signed-off-by: Peter Foley Signed-off-by: Randy Dunlap Signed-off-by: Jiri Kosina --- Documentation/.gitignore | 7 ------- Documentation/arm/SH-Mobile/.gitignore | 1 + Documentation/filesystems/.gitignore | 1 + Documentation/laptops/.gitignore | 2 ++ Documentation/networking/timestamping/.gitignore | 1 + Documentation/prctl/.gitignore | 3 +++ Documentation/ptp/.gitignore | 1 + Documentation/timers/.gitignore | 1 + Documentation/vDSO/.gitignore | 2 ++ Documentation/video4linux/.gitignore | 1 - 10 files changed, 12 insertions(+), 8 deletions(-) delete mode 100644 Documentation/.gitignore create mode 100644 Documentation/arm/SH-Mobile/.gitignore create mode 100644 Documentation/filesystems/.gitignore create mode 100644 Documentation/laptops/.gitignore create mode 100644 Documentation/prctl/.gitignore create mode 100644 Documentation/ptp/.gitignore create mode 100644 Documentation/timers/.gitignore create mode 100644 Documentation/vDSO/.gitignore delete mode 100644 Documentation/video4linux/.gitignore (limited to 'Documentation') diff --git a/Documentation/.gitignore b/Documentation/.gitignore deleted file mode 100644 index bcd907b..0000000 --- a/Documentation/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -filesystems/dnotify_test -laptops/dslm -timers/hpet_example -vm/hugepage-mmap -vm/hugepage-shm -vm/map_hugetlb - diff --git a/Documentation/arm/SH-Mobile/.gitignore b/Documentation/arm/SH-Mobile/.gitignore new file mode 100644 index 0000000..c928dbf3 --- /dev/null +++ b/Documentation/arm/SH-Mobile/.gitignore @@ -0,0 +1 @@ +vrl4 diff --git a/Documentation/filesystems/.gitignore b/Documentation/filesystems/.gitignore new file mode 100644 index 0000000..31d6e42 --- /dev/null +++ b/Documentation/filesystems/.gitignore @@ -0,0 +1 @@ +dnotify_test diff --git a/Documentation/laptops/.gitignore b/Documentation/laptops/.gitignore new file mode 100644 index 0000000..da2bd06 --- /dev/null +++ b/Documentation/laptops/.gitignore @@ -0,0 +1,2 @@ +dslm +freefall diff --git a/Documentation/networking/timestamping/.gitignore b/Documentation/networking/timestamping/.gitignore index a380159..9e69e98 100644 --- a/Documentation/networking/timestamping/.gitignore +++ b/Documentation/networking/timestamping/.gitignore @@ -1,2 +1,3 @@ timestamping +txtimestamp hwtstamp_config diff --git a/Documentation/prctl/.gitignore b/Documentation/prctl/.gitignore new file mode 100644 index 0000000..0b5c274 --- /dev/null +++ b/Documentation/prctl/.gitignore @@ -0,0 +1,3 @@ +disable-tsc-ctxt-sw-stress-test +disable-tsc-on-off-stress-test +disable-tsc-test diff --git a/Documentation/ptp/.gitignore b/Documentation/ptp/.gitignore new file mode 100644 index 0000000..f562e49 --- /dev/null +++ b/Documentation/ptp/.gitignore @@ -0,0 +1 @@ +testptp diff --git a/Documentation/timers/.gitignore b/Documentation/timers/.gitignore new file mode 100644 index 0000000..c5c45d7 --- /dev/null +++ b/Documentation/timers/.gitignore @@ -0,0 +1 @@ +hpet_example diff --git a/Documentation/vDSO/.gitignore b/Documentation/vDSO/.gitignore new file mode 100644 index 0000000..133bf9e --- /dev/null +++ b/Documentation/vDSO/.gitignore @@ -0,0 +1,2 @@ +vdso_test +vdso_standalone_test_x86 diff --git a/Documentation/video4linux/.gitignore b/Documentation/video4linux/.gitignore deleted file mode 100644 index 9527039..0000000 --- a/Documentation/video4linux/.gitignore +++ /dev/null @@ -1 +0,0 @@ -v4lgrab -- cgit v1.1 From 15565829e75ce6b50449462405dd7e72c37bd74e Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Thu, 25 Sep 2014 11:23:43 -0700 Subject: Documentation: update vDSO makefile to build portable examples Signed-off-by: Peter Foley Signed-off-by: Randy Dunlap Signed-off-by: Jiri Kosina --- Documentation/vDSO/Makefile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'Documentation') diff --git a/Documentation/vDSO/Makefile b/Documentation/vDSO/Makefile index 6cbd612..d87bb29 100644 --- a/Documentation/vDSO/Makefile +++ b/Documentation/vDSO/Makefile @@ -1,9 +1,12 @@ # List of programs to build -hostprogs-$(CONFIG_X86) := vdso_test +hostprogs-y := vdso_test +hostprogs-$(CONFIG_X86) := vdso_standalone_test_x86 +vdso_standalone_test_x86-objs := vdso_standalone_test_x86.o parse_vdso.o vdso_test-objs := parse_vdso.o vdso_test.o # Tell kbuild to always build the programs -##always := $(hostprogs-y) +always := $(hostprogs-y) HOSTCFLAGS := -I$(objtree)/usr/include -std=gnu99 -HOSTLDFLAGS = -nostdlib -fno-asynchronous-unwind-tables +HOSTCFLAGS_vdso_standalone_test_x86.o := -fno-asynchronous-unwind-tables -fno-stack-protector +HOSTLOADLIBES_vdso_standalone_test_x86 := -nostdlib -- cgit v1.1 From 25b91ac204647de6f84fbc1dd7ea4fa2cc7e5a46 Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Thu, 25 Sep 2014 11:23:48 -0700 Subject: Documentation: disable vdso_test to avoid breakage with old glibc glibc versions older than 2.16 don't include sys/auxv.h which this executable uses. Since we don't have a good way to test for specific glibc versions in kbuild, just disable it for now. Signed-off-by: Peter Foley Signed-off-by: Randy Dunlap Signed-off-by: Jiri Kosina --- Documentation/vDSO/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Documentation') diff --git a/Documentation/vDSO/Makefile b/Documentation/vDSO/Makefile index d87bb29..2b99e57 100644 --- a/Documentation/vDSO/Makefile +++ b/Documentation/vDSO/Makefile @@ -1,5 +1,5 @@ -# List of programs to build -hostprogs-y := vdso_test +# vdso_test won't build for glibc < 2.16, so disable it +# hostprogs-y := vdso_test hostprogs-$(CONFIG_X86) := vdso_standalone_test_x86 vdso_standalone_test_x86-objs := vdso_standalone_test_x86.o parse_vdso.o vdso_test-objs := parse_vdso.o vdso_test.o -- cgit v1.1 From dd42a0882a70f10e429b8306dec8aad40babe19c Mon Sep 17 00:00:00 2001 From: Mark Rutland Date: Thu, 25 Sep 2014 11:23:53 -0700 Subject: Docs: this_cpu_ops: remove redundant add forms Commit ac490f4dca94 (Documentation: this_cpu_ops.txt: Update description of this_cpu_ops) added lists of {__,}this_cpu operations, but these have duplicate, parameter-less entries for {__,}this_cpu_add which don't correspond to any implementation. No other operations have such duplicate entries. Given both are also listed with their full complement of arguments, the empty forms are redundant and can be removed. This patch performs said removal. Signed-off-by: Mark Rutland Reviewed-by: Pranith Kumar Acked-by: Christoph Lameter Signed-off-by: Randy Dunlap Signed-off-by: Jiri Kosina --- Documentation/this_cpu_ops.txt | 2 -- 1 file changed, 2 deletions(-) (limited to 'Documentation') diff --git a/Documentation/this_cpu_ops.txt b/Documentation/this_cpu_ops.txt index 0ec9957..2cbf719 100644 --- a/Documentation/this_cpu_ops.txt +++ b/Documentation/this_cpu_ops.txt @@ -41,7 +41,6 @@ The following this_cpu() operations with implied preemption protection are defined. These operations can be used without worrying about preemption and interrupts. - this_cpu_add() this_cpu_read(pcp) this_cpu_write(pcp, val) this_cpu_add(pcp, val) @@ -225,7 +224,6 @@ still occur while an operation is in progress and if the interrupt too modifies the variable, then RMW actions can not be guaranteed to be safe. - __this_cpu_add() __this_cpu_read(pcp) __this_cpu_write(pcp, val) __this_cpu_add(pcp, val) -- cgit v1.1 From e043271b6ab41500c83dc79a2be1c3c592b4f78d Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Thu, 25 Sep 2014 11:24:09 -0700 Subject: Documentation: remove networking/.gitignore Remove empty networking/.gitignore Signed-off-by: Peter Foley Cc: rdunlap@infradead.org Cc: linux-doc@vger.kernel.org Signed-off-by: Randy Dunlap Signed-off-by: Jiri Kosina --- Documentation/networking/.gitignore | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Documentation/networking/.gitignore (limited to 'Documentation') diff --git a/Documentation/networking/.gitignore b/Documentation/networking/.gitignore deleted file mode 100644 index e69de29..0000000 -- cgit v1.1 From b2dd83b377d390ab503420c9a5867df5741e273d Mon Sep 17 00:00:00 2001 From: Liu Hua Date: Thu, 18 Sep 2014 12:15:28 +0800 Subject: Documentation: correct parameter error for dma_mapping_error dma_mapping_error takes two parameters, but some of examples in Documentation/DMA-API-HOWTO.txt just takes one. So correct it. Signed-off-by: Liu Hua Acked-by: Randy Dunlap Signed-off-by: Jiri Kosina --- Documentation/DMA-API-HOWTO.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Documentation') diff --git a/Documentation/DMA-API-HOWTO.txt b/Documentation/DMA-API-HOWTO.txt index dcbbe36..0f7afb2 100644 --- a/Documentation/DMA-API-HOWTO.txt +++ b/Documentation/DMA-API-HOWTO.txt @@ -531,7 +531,7 @@ To map a single region, you do: size_t size = buffer->len; dma_handle = dma_map_single(dev, addr, size, direction); - if (dma_mapping_error(dma_handle)) { + if (dma_mapping_error(dev, dma_handle)) { /* * reduce current DMA mapping usage, * delay and try again later or @@ -588,7 +588,7 @@ Specifically: size_t size = buffer->len; dma_handle = dma_map_page(dev, page, offset, size, direction); - if (dma_mapping_error(dma_handle)) { + if (dma_mapping_error(dev, dma_handle)) { /* * reduce current DMA mapping usage, * delay and try again later or @@ -689,7 +689,7 @@ to use the dma_sync_*() interfaces. dma_addr_t mapping; mapping = dma_map_single(cp->dev, buffer, len, DMA_FROM_DEVICE); - if (dma_mapping_error(dma_handle)) { + if (dma_mapping_error(cp->dev, dma_handle)) { /* * reduce current DMA mapping usage, * delay and try again later or -- cgit v1.1 From 7b345771ba921361b318e95bf21b257c65ac141c Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Thu, 2 Oct 2014 19:35:26 -0400 Subject: Documentation: update include path for mpssd sysfs.c includes mpssd.h which includes virtio_ids.h. sysfs.c doesn't have the proper include flags set to use the latest headers, so this causes a build error if the system headers are too old. Signed-off-by: Peter Foley Cc: rdunlap@infradead.org Cc: linux-doc@vger.kernel.org Cc: sudeep.dutt@intel.com Cc: nikhil.rao@intel.com Cc: ashutosh.dixit@intel.com Cc: akpm@linux-foundation.org Cc: gregkh@linuxfoundation.org Cc: harshavardhan.r.kharche@intel.com Cc: caz.yokoyama@intel.com Cc: dasaratharaman.chandramouli@intel.com Cc: jkosina@suse.cz Signed-off-by: Jiri Kosina --- Documentation/mic/mpssd/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Documentation') diff --git a/Documentation/mic/mpssd/Makefile b/Documentation/mic/mpssd/Makefile index 505d84f18..0f31568 100644 --- a/Documentation/mic/mpssd/Makefile +++ b/Documentation/mic/mpssd/Makefile @@ -6,7 +6,7 @@ mpssd-objs := mpssd.o sysfs.o # Tell kbuild to always build the programs always := $(hostprogs-y) -HOSTCFLAGS_mpssd.o += -I$(objtree)/usr/include -I$(srctree)/tools/include +HOSTCFLAGS += -I$(objtree)/usr/include -I$(srctree)/tools/include ifdef DEBUG HOSTCFLAGS += -DDEBUG=$(DEBUG) -- cgit v1.1 From 0415447aa3b4decc2c05dfc45a0aa34a5eb4fc54 Mon Sep 17 00:00:00 2001 From: Michael Opdenacker Date: Thu, 2 Oct 2014 22:45:48 +0200 Subject: Documentation: fix broken v4l-utils URL This replaces http://git.linuxtv.org/v4l-utils/ (broken link) by http://git.linuxtv.org/cgit.cgi/v4l-utils.git/ Signed-off-by: Michael Opdenacker Signed-off-by: Jiri Kosina --- Documentation/DocBook/media/v4l/common.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Documentation') diff --git a/Documentation/DocBook/media/v4l/common.xml b/Documentation/DocBook/media/v4l/common.xml index 71f6bf9..8b5e014 100644 --- a/Documentation/DocBook/media/v4l/common.xml +++ b/Documentation/DocBook/media/v4l/common.xml @@ -110,7 +110,7 @@ makes no provisions to find these related devices. Some really complex devices use the Media Controller (see ) which can be used for this purpose. But most drivers do not use it, and while some code exists that uses sysfs to discover related devices -(see libmedia_dev in the v4l-utils +(see libmedia_dev in the v4l-utils git repository), there is no library yet that can provide a single API towards both Media Controller-based devices and devices that do not use the Media Controller. If you want to work on this please write to the linux-media mailing list: &v4l-ml;. -- cgit v1.1