Revision 0228ecf6128c92b47eadd2ac270c5574d9150c09 authored by Paul Burton on 01 October 2019, 21:56:37 UTC, committed by Paul Burton on 02 October 2019, 17:08:20 UTC
Commit 171a9bae68c7 ("staging/octeon: Allow test build on !MIPS") moved the inclusion of a bunch of headers by various files in the Octeon ethernet driver into a common header, but in doing so it changed the order in which those headers are included. Prior to the referenced commit drivers/staging/octeon/ethernet.c included asm/octeon/cvmx-pip.h before asm/octeon/cvmx-ipd.h, which makes use of the CVMX_PIP_SFT_RST definition pulled in by the former. After commit 171a9bae68c7 ("staging/octeon: Allow test build on !MIPS") we pull in asm/octeon/cvmx-ipd.h first & builds fail with: In file included from drivers/staging/octeon/octeon-ethernet.h:27, from drivers/staging/octeon/ethernet.c:22: arch/mips/include/asm/octeon/cvmx-ipd.h: In function 'cvmx_ipd_free_ptr': arch/mips/include/asm/octeon/cvmx-ipd.h:330:27: error: storage size of 'pip_sft_rst' isn't known union cvmx_pip_sft_rst pip_sft_rst; ^~~~~~~~~~~ arch/mips/include/asm/octeon/cvmx-ipd.h:331:36: error: 'CVMX_PIP_SFT_RST' undeclared (first use in this function); did you mean 'CVMX_CIU_SOFT_RST'? pip_sft_rst.u64 = cvmx_read_csr(CVMX_PIP_SFT_RST); ^~~~~~~~~~~~~~~~ CVMX_CIU_SOFT_RST arch/mips/include/asm/octeon/cvmx-ipd.h:331:36: note: each undeclared identifier is reported only once for each function it appears in arch/mips/include/asm/octeon/cvmx-ipd.h:330:27: warning: unused variable 'pip_sft_rst' [-Wunused-variable] union cvmx_pip_sft_rst pip_sft_rst; ^~~~~~~~~~~ make[4]: *** [scripts/Makefile.build:266: drivers/staging/octeon/ethernet.o] Error 1 make[3]: *** [scripts/Makefile.build:509: drivers/staging/octeon] Error 2 Fix this by having asm/octeon/cvmx-ipd.h include the asm/octeon/cvmx-pip-defs.h header that it is reliant upon, rather than requiring its users to pull in that header before it. Signed-off-by: Paul Burton <paul.burton@mips.com> Fixes: 171a9bae68c7 ("staging/octeon: Allow test build on !MIPS") Cc: David S. Miller <davem@davemloft.net> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Matthew Wilcox (Oracle) <willy@infradead.org> Cc: linux-mips@vger.kernel.org Cc: David S . Miller <davem@davemloft.net> Cc: Matthew Wilcox <willy@infradead.org>
1 parent d345d9c
File | Mode | Size |
---|---|---|
partitions | ||
Kconfig | -rw-r--r-- | 6.2 KB |
Kconfig.iosched | -rw-r--r-- | 1.3 KB |
Makefile | -rw-r--r-- | 1.5 KB |
badblocks.c | -rw-r--r-- | 14.1 KB |
bfq-cgroup.c | -rw-r--r-- | 36.9 KB |
bfq-iosched.c | -rw-r--r-- | 235.2 KB |
bfq-iosched.h | -rw-r--r-- | 36.2 KB |
bfq-wf2q.c | -rw-r--r-- | 52.4 KB |
bio-integrity.c | -rw-r--r-- | 12.3 KB |
bio.c | -rw-r--r-- | 54.0 KB |
blk-cgroup.c | -rw-r--r-- | 47.0 KB |
blk-core.c | -rw-r--r-- | 48.6 KB |
blk-exec.c | -rw-r--r-- | 2.6 KB |
blk-flush.c | -rw-r--r-- | 14.5 KB |
blk-integrity.c | -rw-r--r-- | 11.6 KB |
blk-ioc.c | -rw-r--r-- | 10.2 KB |
blk-iocost.c | -rw-r--r-- | 66.9 KB |
blk-iolatency.c | -rw-r--r-- | 28.0 KB |
blk-lib.c | -rw-r--r-- | 10.2 KB |
blk-map.c | -rw-r--r-- | 6.0 KB |
blk-merge.c | -rw-r--r-- | 23.9 KB |
blk-mq-cpumap.c | -rw-r--r-- | 2.2 KB |
blk-mq-debugfs-zoned.c | -rw-r--r-- | 435 bytes |
blk-mq-debugfs.c | -rw-r--r-- | 24.4 KB |
blk-mq-debugfs.h | -rw-r--r-- | 2.7 KB |
blk-mq-pci.c | -rw-r--r-- | 1.3 KB |
blk-mq-rdma.c | -rw-r--r-- | 1.3 KB |
blk-mq-sched.c | -rw-r--r-- | 14.1 KB |
blk-mq-sched.h | -rw-r--r-- | 2.5 KB |
blk-mq-sysfs.c | -rw-r--r-- | 8.4 KB |
blk-mq-tag.c | -rw-r--r-- | 15.1 KB |
blk-mq-tag.h | -rw-r--r-- | 2.3 KB |
blk-mq-virtio.c | -rw-r--r-- | 1.3 KB |
blk-mq.c | -rw-r--r-- | 86.0 KB |
blk-mq.h | -rw-r--r-- | 7.8 KB |
blk-pm.c | -rw-r--r-- | 6.6 KB |
blk-pm.h | -rw-r--r-- | 1.4 KB |
blk-rq-qos.c | -rw-r--r-- | 6.9 KB |
blk-rq-qos.h | -rw-r--r-- | 5.0 KB |
blk-settings.c | -rw-r--r-- | 28.0 KB |
blk-softirq.c | -rw-r--r-- | 3.7 KB |
blk-stat.c | -rw-r--r-- | 4.6 KB |
blk-stat.h | -rw-r--r-- | 4.6 KB |
blk-sysfs.c | -rw-r--r-- | 26.4 KB |
blk-throttle.c | -rw-r--r-- | 67.9 KB |
blk-timeout.c | -rw-r--r-- | 3.8 KB |
blk-wbt.c | -rw-r--r-- | 19.9 KB |
blk-wbt.h | -rw-r--r-- | 2.9 KB |
blk-zoned.c | -rw-r--r-- | 13.1 KB |
blk.h | -rw-r--r-- | 10.7 KB |
bounce.c | -rw-r--r-- | 9.3 KB |
bsg-lib.c | -rw-r--r-- | 9.8 KB |
bsg.c | -rw-r--r-- | 11.1 KB |
cmdline-parser.c | -rw-r--r-- | 4.9 KB |
compat_ioctl.c | -rw-r--r-- | 10.9 KB |
elevator.c | -rw-r--r-- | 18.6 KB |
genhd.c | -rw-r--r-- | 50.5 KB |
ioctl.c | -rw-r--r-- | 15.4 KB |
ioprio.c | -rw-r--r-- | 5.1 KB |
kyber-iosched.c | -rw-r--r-- | 27.8 KB |
mq-deadline.c | -rw-r--r-- | 20.6 KB |
opal_proto.h | -rw-r--r-- | 9.3 KB |
partition-generic.c | -rw-r--r-- | 17.4 KB |
scsi_ioctl.c | -rw-r--r-- | 18.5 KB |
sed-opal.c | -rw-r--r-- | 58.2 KB |
t10-pi.c | -rw-r--r-- | 7.7 KB |
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...