Skip to contentSkip to conversation

Exported funtions that are marked inline

PATCH Applied Denis Efremov 14 participants 40 messages May 9, 2013 – May 30, 2013 1 message not in the archive

Subsystems (27)
lore
Share & tools
lore
#0 lore raw

cover Exported funtions that are marked inline

Hello everyone,
this is a patchset to remove inline marking of exported functions. Patchset is motivated by
https://lkml.org/lkml/2012/5/10/545 (af3b56289)

I run some tests and inspect the binaries. (You can find the tests
here: https://bitbucket.org/evdenis/tests/src) And it seems (at least on my configuration) that EXPORT_SYMBOL completely revokes inline directive. GCC can handle this, but other compilers may be confused by these two directives. Anyway, you can't inline function that you expect not to be available for modules with incompatible license and to be available for the rest.

The tool I use to check the sources:
https://bitbucket.org/evdenis/export_checking.git

arch/arm/mach-sa1100/jornada720_ssp.c  |  2 +-
arch/arm64/lib/delay.c                 |  2 +-
arch/cris/arch-v32/kernel/cache.c      |  2 +-
arch/m68k/sun3/sun3dvma.c              |  2 +-
arch/metag/lib/delay.c                 |  2 +-
arch/mips/pmcs-msp71xx/msp_prom.c      |  2 +-
arch/openrisc/lib/delay.c              |  2 +-
arch/powerpc/platforms/ps3/spu.c       |  2 +-
arch/sparc/prom/tree_64.c              | 14 +++++++-------
arch/tile/lib/spinlock_32.c            |  2 +-
arch/x86/lib/delay.c                   |  2 +-
arch/x86/um/delay.c                    |  2 +-
drivers/dma/dw_dmac.c                  |  4 ++--
drivers/net/wireless/iwlegacy/common.c |  2 +-
drivers/scsi/libiscsi.c                |  2 +-
drivers/scsi/libiscsi_tcp.c            |  8 ++++----
drivers/staging/nvec/nvec.c            |  2 +-
fs/bio.c                               |  2 +-
fs/block_dev.c                         |  2 +-
fs/buffer.c                            |  2 +-
mm/filemap.c                           |  2 +-
net/9p/client.c                        |  4 ++--
net/ipv4/ip_output.c                   |  2 +-
net/netfilter/nf_nat_core.c            |  2 +-
net/nfc/core.c                         |  2 +-
25 files changed, 36 insertions(+), 36 deletions(-)
#1 lore raw

PATCH 1/21 libiscsi: remove inline marking of EXPORT_SYMBOL functions

EXPORT_SYMBOL and inline directives are contradictory to each other. The patch fixes this inconsistency.

Found by Linux Driver Verification project (linuxtesting.org).

---
 drivers/scsi/libiscsi.c     | 2 +-
 drivers/scsi/libiscsi_tcp.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)
drivers/scsi/libiscsi.c +1 -1
index 5de9469..8d8d3a5 100644
@@ -85,7 +85,7 @@ MODULE_PARM_DESC(debug_libiscsi_eh,
 					     __func__, ##arg);		\
 	} while (0);
 
-inline void iscsi_conn_queue_work(struct iscsi_conn *conn)
+void iscsi_conn_queue_work(struct iscsi_conn *conn)
 {
 	struct Scsi_Host *shost = conn->session->host;
 	struct iscsi_host *ihost = shost_priv(shost);
drivers/scsi/libiscsi_tcp.c +4 -4
index 552e8a2..2e37fcc 100644
@@ -309,7 +309,7 @@ iscsi_tcp_segment_recv(struct iscsi_tcp_conn *tcp_conn,
 	return copied;
 }
 
-inline void
+void
 iscsi_tcp_dgst_header(struct hash_desc *hash, const void *hdr, size_t hdrlen,
 		      unsigned char digest[ISCSI_DIGEST_SIZE])
 {
@@ -353,7 +353,7 @@ __iscsi_segment_init(struct iscsi_segment *segment, size_t size,
 	}
 }
 
-inline void
+void
 iscsi_segment_init_linear(struct iscsi_segment *segment, void *data,
 			  size_t size, iscsi_segment_done_fn_t *done,
 			  struct hash_desc *hash)
@@ -364,7 +364,7 @@ iscsi_segment_init_linear(struct iscsi_segment *segment, void *data,
 }
 EXPORT_SYMBOL_GPL(iscsi_segment_init_linear);
 
-inline int
+int
 iscsi_segment_seek_sg(struct iscsi_segment *segment,
 		      struct scatterlist *sg_list, unsigned int sg_count,
 		      unsigned int offset, size_t size,
@@ -852,7 +852,7 @@ iscsi_tcp_hdr_recv_done(struct iscsi_tcp_conn *tcp_conn,
  * returns non zero if we are currently processing or setup to process
  * a header.
  */
-inline int iscsi_tcp_recv_segment_is_hdr(struct iscsi_tcp_conn *tcp_conn)
+int iscsi_tcp_recv_segment_is_hdr(struct iscsi_tcp_conn *tcp_conn)
 {
 	return tcp_conn->in.segment.done == iscsi_tcp_hdr_recv_done;
 }
Signature · 1 line
1.8.1.4
#2 lore raw

PATCH 2/21 fs: remove inline marking of EXPORT_SYMBOL functions

In reply to Denis Efremov

EXPORT_SYMBOL and inline directives are contradictory to each other. The patch fixes this inconsistency.

Found by Linux Driver Verification project (linuxtesting.org).

---
 fs/bio.c       | 2 +-
 fs/block_dev.c | 2 +-
 fs/buffer.c    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
fs/bio.c +1 -1
index b96fc6c..4e1235f 100644
@@ -402,7 +402,7 @@ void bio_put(struct bio *bio)
 }
 EXPORT_SYMBOL(bio_put);
 
-inline int bio_phys_segments(struct request_queue *q, struct bio *bio)
+int bio_phys_segments(struct request_queue *q, struct bio *bio)
 {
 	if (unlikely(!bio_flagged(bio, BIO_SEG_VALID)))
 		blk_recount_segments(q, bio);
fs/block_dev.c +1 -1
index ce08de7..799d879 100644
@@ -42,7 +42,7 @@ static inline struct bdev_inode *BDEV_I(struct inode *inode)
 	return container_of(inode, struct bdev_inode, vfs_inode);
 }
 
-inline struct block_device *I_BDEV(struct inode *inode)
+struct block_device *I_BDEV(struct inode *inode)
 {
 	return &BDEV_I(inode)->bdev;
 }
fs/buffer.c +1 -1
index bc1fe14..c3cfe44 100644
@@ -54,7 +54,7 @@ void init_buffer(struct buffer_head *bh, bh_end_io_t *handler, void *private)
 }
 EXPORT_SYMBOL(init_buffer);
 
-inline void touch_buffer(struct buffer_head *bh)
+void touch_buffer(struct buffer_head *bh)
 {
 	trace_block_touch_buffer(bh);
 	mark_page_accessed(bh->b_page);
Signature · 1 line
1.8.1.4
maintainer
#3 lore raw

Re: [PATCH 02/21] fs: remove inline marking of EXPORT_SYMBOL functions

Quoted 2 lines · Denis Efremov

EXPORT_SYMBOL and inline directives are contradictory to each other. The patch fixes this inconsistency.

What makes them contradictory, in your opinion? With references to relevant parts of C99, please.

author
#4 lore raw

Re: [PATCH 02/21] fs: remove inline marking of EXPORT_SYMBOL functions

Quoted 5 lines · Al Viro
Quoted 2 lines · Denis Efremov

EXPORT_SYMBOL and inline directives are contradictory to each other. The patch fixes this inconsistency.

What makes them contradictory, in your opinion? With references to relevant parts of C99, please.

Looks like the introductory message was rejected by mailing list. Will try to do something with this. You can find it here:
http://linuxtesting.org/pipermail/ldv-project/2013-May/000101.html

Patchset is based on previous fixes.

#5 lore raw

PATCH 3/21 x86: remove inline marking of EXPORT_SYMBOL functions

In reply to Denis Efremov

EXPORT_SYMBOL and inline directives are contradictory to each other. The patch fixes this inconsistency.

Found by Linux Driver Verification project (linuxtesting.org).

---
 arch/x86/lib/delay.c | 2 +-
 arch/x86/um/delay.c  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/x86/lib/delay.c +1 -1
index 7c3bee6..6ce3f87 100644
@@ -113,7 +113,7 @@ void __delay(unsigned long loops)
 }
 EXPORT_SYMBOL(__delay);
 
-inline void __const_udelay(unsigned long xloops)
+void __const_udelay(unsigned long xloops)
 {
 	int d0;
 
arch/x86/um/delay.c +1 -1
index f3fe1a6..6e35993 100644
@@ -33,7 +33,7 @@ void __delay(unsigned long loops)
 }
 EXPORT_SYMBOL(__delay);
 
-inline void __const_udelay(unsigned long xloops)
+void __const_udelay(unsigned long xloops)
 {
 	int d0;
 
Signature · 1 line
1.8.1.4
#6 lore raw

Re: [PATCH 03/21] x86: remove inline marking of EXPORT_SYMBOL functions

Quoted 4 lines · Denis Efremov

EXPORT_SYMBOL and inline directives are contradictory to each other. The patch fixes this inconsistency.

Found by Linux Driver Verification project (linuxtesting.org).

Nice, but wrong.

They aren't contradictory; in gnu89 syntax this means "this can be inline, but also create an out-of-line copy that others can call."

That being said, I haven't looked at the code to see if that makes sense, but the statement isn't correct.

-hpa

#7 lore raw

PATCH 4/21 NFC: remove inline marking of EXPORT_SYMBOL functions

In reply to Denis Efremov

EXPORT_SYMBOL and inline directives are contradictory to each other. The patch fixes this inconsistency.

Found by Linux Driver Verification project (linuxtesting.org).

---
 net/nfc/core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
net/nfc/core.c +1 -1
index 40d2527..1c4b513 100644
@@ -701,7 +701,7 @@ int nfc_target_lost(struct nfc_dev *dev, u32 target_idx)
 }
 EXPORT_SYMBOL(nfc_target_lost);
 
-inline void nfc_driver_failure(struct nfc_dev *dev, int err)
+void nfc_driver_failure(struct nfc_dev *dev, int err)
 {
 	nfc_targets_found(dev, NULL, 0);
 }
Signature · 1 line
1.8.1.4
#8 lore raw

PATCH 5/21 9p: remove inline marking of EXPORT_SYMBOL functions

In reply to Denis Efremov

EXPORT_SYMBOL and inline directives are contradictory to each other. The patch fixes this inconsistency.

Found by Linux Driver Verification project (linuxtesting.org).

---
 net/9p/client.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
net/9p/client.c +2 -2
index 8eb7542..591c664 100644
@@ -64,13 +64,13 @@ static const match_table_t tokens = {
 	{Opt_err, NULL},
 };
 
-inline int p9_is_proto_dotl(struct p9_client *clnt)
+int p9_is_proto_dotl(struct p9_client *clnt)
 {
 	return clnt->proto_version == p9_proto_2000L;
 }
 EXPORT_SYMBOL(p9_is_proto_dotl);
 
-inline int p9_is_proto_dotu(struct p9_client *clnt)
+int p9_is_proto_dotu(struct p9_client *clnt)
 {
 	return clnt->proto_version == p9_proto_2000u;
 }
Signature · 1 line
1.8.1.4
#9 lore raw

PATCH 6/21 staging: nvec: remove inline marking of EXPORT_SYMBOL functions

In reply to Denis Efremov

EXPORT_SYMBOL and inline directives are contradictory to each other. The patch fixes this inconsistency.

Found by Linux Driver Verification project (linuxtesting.org).

---
 drivers/staging/nvec/nvec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/nvec/nvec.c +1 -1
index a88959f..954c992 100644
@@ -185,7 +185,7 @@ static struct nvec_msg *nvec_msg_alloc(struct nvec_chip *nvec,
  *
  * Free the given message
  */
-inline void nvec_msg_free(struct nvec_chip *nvec, struct nvec_msg *msg)
+void nvec_msg_free(struct nvec_chip *nvec, struct nvec_msg *msg)
 {
 	if (msg != &nvec->tx_scratch)
 		dev_vdbg(nvec->dev, "INFO: Free %ti\n", msg - nvec->msg_pool);
Signature · 1 line
1.8.1.4
#10 lore raw

PATCH 7/21 netfilter: nf_nat: remove inline marking of EXPORT_SYMBOL functions

In reply to Denis Efremov

EXPORT_SYMBOL and inline directives are contradictory to each other. The patch fixes this inconsistency.

Found by Linux Driver Verification project (linuxtesting.org).

---
 net/netfilter/nf_nat_core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/nf_nat_core.c +1 -1
index 038eee5..38492e0 100644
@@ -44,7 +44,7 @@ __nf_nat_l3proto_find(u8 family)
 	return rcu_dereference(nf_nat_l3protos[family]);
 }
 
-inline const struct nf_nat_l4proto *
+const struct nf_nat_l4proto *
 __nf_nat_l4proto_find(u8 family, u8 protonum)
 {
 	return rcu_dereference(nf_nat_l4protos[family][protonum]);
Signature · 1 line
1.8.1.4
#11 lore raw

RE: [PATCH 07/21] netfilter: nf_nat: remove inline marking of EXPORT_SYMBOL functions

Quoted 2 lines

EXPORT_SYMBOL and inline directives are contradictory to each other. The patch fixes this inconsistency.

...

net/netfilter/nf_nat_core.c __nf_nat_l3proto_find(u8 family) · line 50

Quoted 5 lines
net/netfilter/nf_nat_core.c +1 -1
-inline const struct nf_nat_l4proto *
+const struct nf_nat_l4proto *
 __nf_nat_l4proto_find(u8 family, u8 protonum)
 {
 	return rcu_dereference(nf_nat_l4protos[family][protonum]);

If it makes sense to inline the local calls (ie the cost of the call is significant) then possibly add an inlined (or inlinable) static function that is called locally and by the exported one?

I'm not sure that gcc is allowed to make the assumption that the local exported function will be called - and thus inline it.

David

#12 lore raw

PATCH 8/21 iwlegacy: remove inline marking of EXPORT_SYMBOL functions

In reply to Denis Efremov

EXPORT_SYMBOL and inline directives are contradictory to each other. The patch fixes this inconsistency.

Found by Linux Driver Verification project (linuxtesting.org).

---
 drivers/net/wireless/iwlegacy/common.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/iwlegacy/common.c +1 -1
index 592d0aa..e9a3cbc 100644
@@ -1423,7 +1423,7 @@ il_setup_rx_scan_handlers(struct il_priv *il)
 }
 EXPORT_SYMBOL(il_setup_rx_scan_handlers);
 
-inline u16
+u16
 il_get_active_dwell_time(struct il_priv *il, enum ieee80211_band band,
 			 u8 n_probes)
 {
Signature · 1 line
1.8.1.4
#13 lore raw

PATCH 9/21 dw_dmac: remove inline marking of EXPORT_SYMBOL functions

In reply to Denis Efremov

EXPORT_SYMBOL and inline directives are contradictory to each other. The patch fixes this inconsistency.

Found by Linux Driver Verification project (linuxtesting.org).

---
 drivers/dma/dw_dmac.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/dma/dw_dmac.c +2 -2
index 43a5329..a526bb9 100644
@@ -574,14 +574,14 @@ static void dwc_handle_error(struct dw_dma *dw, struct dw_dma_chan *dwc)
 
 /* --------------------- Cyclic DMA API extensions -------------------- */
 
-inline dma_addr_t dw_dma_get_src_addr(struct dma_chan *chan)
+dma_addr_t dw_dma_get_src_addr(struct dma_chan *chan)
 {
 	struct dw_dma_chan *dwc = to_dw_dma_chan(chan);
 	return channel_readl(dwc, SAR);
 }
 EXPORT_SYMBOL(dw_dma_get_src_addr);
 
-inline dma_addr_t dw_dma_get_dst_addr(struct dma_chan *chan)
+dma_addr_t dw_dma_get_dst_addr(struct dma_chan *chan)
 {
 	struct dw_dma_chan *dwc = to_dw_dma_chan(chan);
 	return channel_readl(dwc, DAR);
Signature · 1 line
1.8.1.4

A message that is not in the archive (sent off-list or not yet received): CAHp75VfWzzevr6AQzE25P8FUXd=amzL5-XgkJXvbRDESF=M76A@mail.gmail.com

Acked-by
#15 lore raw

Re: [PATCH 09/21] dw_dmac: remove inline marking of EXPORT_SYMBOL functions

Quoted 14 lines · Andy Shevchenko

Seems those inlines are leftovers from first versions of the driver. Anyway, looks fine by me. I think Viresh can give you an Ack.

9.5.2013 12.22 "Denis Efremov" <[email protected]> kirjoitti:

Quoted 10 lines

EXPORT_SYMBOL and inline directives are contradictory to each other. The patch fixes this inconsistency.

Found by Linux Driver Verification project (linuxtesting.org).

---
 drivers/dma/dw_dmac.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Applied
#16 lore raw

Re: [PATCH 09/21] dw_dmac: remove inline marking of EXPORT_SYMBOL functions

In reply to Denis Efremov
Quoted 6 lines · Denis Efremov

EXPORT_SYMBOL and inline directives are contradictory to each other. The patch fixes this inconsistency.

Found by Linux Driver Verification project (linuxtesting.org).

Applied, thanks

--
~Vinod

Quoted 28 lines
---
 drivers/dma/dw_dmac.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/dma/dw_dmac.c +2 -2
index 43a5329..a526bb9 100644
@@ -574,14 +574,14 @@ static void dwc_handle_error(struct dw_dma *dw, struct dw_dma_chan *dwc)
 
 /* --------------------- Cyclic DMA API extensions -------------------- */
 
-inline dma_addr_t dw_dma_get_src_addr(struct dma_chan *chan)
+dma_addr_t dw_dma_get_src_addr(struct dma_chan *chan)
 {
 	struct dw_dma_chan *dwc = to_dw_dma_chan(chan);
 	return channel_readl(dwc, SAR);
 }
 EXPORT_SYMBOL(dw_dma_get_src_addr);
 
-inline dma_addr_t dw_dma_get_dst_addr(struct dma_chan *chan)
+dma_addr_t dw_dma_get_dst_addr(struct dma_chan *chan)
 {
 	struct dw_dma_chan *dwc = to_dw_dma_chan(chan);
 	return channel_readl(dwc, DAR);
Signature · 1 line
1.8.1.4
#17 lore raw

PATCH 10/21 mm: filemap: remove inline marking of EXPORT_SYMBOL functions

In reply to Denis Efremov

EXPORT_SYMBOL and inline directives are contradictory to each other. The patch fixes this inconsistency.

Found by Linux Driver Verification project (linuxtesting.org).

---
 mm/filemap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
mm/filemap.c +1 -1
index 7905fe7..6aca7a2 100644
@@ -2092,7 +2092,7 @@ EXPORT_SYMBOL(iov_iter_single_seg_count);
  * Returns appropriate error code that caller should return or
  * zero in case that write should be allowed.
  */
-inline int generic_write_checks(struct file *file, loff_t *pos, size_t *count, int isblk)
+int generic_write_checks(struct file *file, loff_t *pos, size_t *count, int isblk)
 {
 	struct inode *inode = file->f_mapping->host;
 	unsigned long limit = rlimit(RLIMIT_FSIZE);
Signature · 1 line
1.8.1.4
#18 lore raw

PATCH 11/21 ipv4: ip_output: remove inline marking of EXPORT_SYMBOL functions

In reply to Denis Efremov

EXPORT_SYMBOL and inline directives are contradictory to each other. The patch fixes this inconsistency.

Found by Linux Driver Verification project (linuxtesting.org).

---
 net/ipv4/ip_output.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv4/ip_output.c +1 -1
index 147abf5..4bcabf3 100644
@@ -84,7 +84,7 @@ int sysctl_ip_default_ttl __read_mostly = IPDEFTTL;
 EXPORT_SYMBOL(sysctl_ip_default_ttl);
 
 /* Generate a checksum for an outgoing IP datagram. */
-__inline__ void ip_send_check(struct iphdr *iph)
+void ip_send_check(struct iphdr *iph)
 {
 	iph->check = 0;
 	iph->check = ip_fast_csum((unsigned char *)iph, iph->ihl);
Signature · 1 line
1.8.1.4
maintainer Applied
#19 lore raw

Re: [PATCH 11/21] ipv4: ip_output: remove inline marking of EXPORT_SYMBOL functions

From: Denis Efremov <[email protected]>
Date: Thu, 9 May 2013 13:19:42 +0400

Quoted 6 lines

EXPORT_SYMBOL and inline directives are contradictory to each other. The patch fixes this inconsistency.

Found by Linux Driver Verification project (linuxtesting.org).

Applied, thanks.

#20 lore raw

PATCH 12/21 metag: delay: remove inline marking of EXPORT_SYMBOL functions

In reply to Denis Efremov

EXPORT_SYMBOL and inline directives are contradictory to each other. The patch fixes this inconsistency.

Found by Linux Driver Verification project (linuxtesting.org).

---
 arch/metag/lib/delay.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/metag/lib/delay.c +1 -1
index 0b308f4..7ff0ca7 100644
@@ -36,7 +36,7 @@ void __delay(unsigned long loops)
 }
 EXPORT_SYMBOL(__delay);
 
-inline void __const_udelay(unsigned long xloops)
+void __const_udelay(unsigned long xloops)
 {
 	u64 loops = (u64)xloops * (u64)loops_per_jiffy * HZ;
 	__delay(loops >> 32);
Signature · 1 line
1.8.1.4
#21 lore raw

Re: [PATCH 12/21] metag: delay: remove inline marking of EXPORT_SYMBOL functions

Quoted 16 lines · Denis Efremov

EXPORT_SYMBOL and inline directives are contradictory to each other. The patch fixes this inconsistency.

Found by Linux Driver Verification project (linuxtesting.org).

---
 arch/metag/lib/delay.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/metag/lib/delay.c +0 -0
index 0b308f4..7ff0ca7 100644

arch/metag/lib/delay.c void __delay(unsigned long loops) · line 42

Quoted 8 lines
arch/metag/lib/delay.c +1 -1
@@ -36,7 +36,7 @@ void __delay(unsigned long loops)
 }
 EXPORT_SYMBOL(__delay);
 
-inline void __const_udelay(unsigned long xloops)
+void __const_udelay(unsigned long xloops)
 {
 	u64 loops = (u64)xloops * (u64)loops_per_jiffy * HZ;
 	__delay(loops >> 32);

The inline still has an effect on code generation if other functions in the same compilation unit use it, so this isn't really a trivial change.

I.e. before this patch __udelay and __ndelay inlined __const_udelay, but after it they are changed to just multiply & branch.

Therefore I'd like to hear some more justification for these changes.

Cheers
James

#22 lore raw

PATCH 13/21 openrisc: delay: remove inline marking of EXPORT_SYMBOL functions

In reply to Denis Efremov

EXPORT_SYMBOL and inline directives are contradictory to each other. The patch fixes this inconsistency.

Found by Linux Driver Verification project (linuxtesting.org).

---
 arch/openrisc/lib/delay.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/openrisc/lib/delay.c +1 -1
index c82b09f..808a55c 100644
@@ -37,7 +37,7 @@ void __delay(unsigned long cycles)
 }
 EXPORT_SYMBOL(__delay);
 
-inline void __const_udelay(unsigned long xloops)
+void __const_udelay(unsigned long xloops)
 {
 	unsigned long long loops;
 
Signature · 1 line
1.8.1.4
Acked-by on v1 13/21
#23 lore raw

Re: [PATCH 13/21] openrisc: delay: remove inline marking of EXPORT_SYMBOL functions

Quoted 15 lines · Denis Efremov

EXPORT_SYMBOL and inline directives are contradictory to each other. The patch fixes this inconsistency.

Found by Linux Driver Verification project (linuxtesting.org).

---
 arch/openrisc/lib/delay.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/openrisc/lib/delay.c +0 -0
index c82b09f..808a55c 100644

arch/openrisc/lib/delay.c void __delay(unsigned long cycles) · line 42

Quoted 7 lines
arch/openrisc/lib/delay.c +1 -1
@@ -37,7 +37,7 @@ void __delay(unsigned long cycles)
 }
 EXPORT_SYMBOL(__delay);
 
-inline void __const_udelay(unsigned long xloops)
+void __const_udelay(unsigned long xloops)
 {
 	unsigned long long loops;

Will

#24 lore raw

PATCH 14/21 arm64: delay: remove inline marking of EXPORT_SYMBOL functions

In reply to Denis Efremov

EXPORT_SYMBOL and inline directives are contradictory to each other. The patch fixes this inconsistency.

Found by Linux Driver Verification project (linuxtesting.org).

---
 arch/arm64/lib/delay.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/lib/delay.c +1 -1
index dad4ec9..368ca15 100644
@@ -33,7 +33,7 @@ void __delay(unsigned long cycles)
 }
 EXPORT_SYMBOL(__delay);
 
-inline void __const_udelay(unsigned long xloops)
+void __const_udelay(unsigned long xloops)
 {
 	unsigned long loops;
 
Signature · 1 line
1.8.1.4
maintainer Acked-by on v1 14/21
#25 lore raw

Re: [PATCH 14/21] arm64: delay: remove inline marking of EXPORT_SYMBOL functions

Quoted 15 lines · Denis Efremov

EXPORT_SYMBOL and inline directives are contradictory to each other. The patch fixes this inconsistency.

Found by Linux Driver Verification project (linuxtesting.org).

---
 arch/arm64/lib/delay.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/lib/delay.c +0 -0
index dad4ec9..368ca15 100644

arch/arm64/lib/delay.c void __delay(unsigned long cycles) · line 38

Quoted 7 lines
arch/arm64/lib/delay.c +1 -1
@@ -33,7 +33,7 @@ void __delay(unsigned long cycles)
 }
 EXPORT_SYMBOL(__delay);
 
-inline void __const_udelay(unsigned long xloops)
+void __const_udelay(unsigned long xloops)
 {
 	unsigned long loops;
#26 lore raw

PATCH 15/21 arch/tile: remove inline marking of EXPORT_SYMBOL functions

In reply to Denis Efremov

EXPORT_SYMBOL and inline directives are contradictory to each other. The patch fixes this inconsistency.

Found by Linux Driver Verification project (linuxtesting.org).

---
 arch/tile/lib/spinlock_32.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/tile/lib/spinlock_32.c +1 -1
index b16ac49..b34f79a 100644
@@ -101,7 +101,7 @@ EXPORT_SYMBOL(arch_spin_unlock_wait);
  * preserve the semantic that the same read lock can be acquired in an
  * interrupt context.
  */
-inline int arch_read_trylock(arch_rwlock_t *rwlock)
+int arch_read_trylock(arch_rwlock_t *rwlock)
 {
 	u32 val;
 	__insn_mtspr(SPR_INTERRUPT_CRITICAL_SECTION, 1);
Signature · 1 line
1.8.1.4
#27 lore raw

Re: [PATCH 15/21] arch/tile: remove inline marking of EXPORT_SYMBOL functions

Quoted 9 lines · Denis Efremov

EXPORT_SYMBOL and inline directives are contradictory to each other. The patch fixes this inconsistency.

Found by Linux Driver Verification project (linuxtesting.org).

---
 arch/tile/lib/spinlock_32.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Thanks, taken into the tile tree.

Signature · 2 lines
Chris Metcalf, Tilera Corp.
http://www.tilera.com
#28 lore raw

PATCH 16/21 sparc: remove inline marking of EXPORT_SYMBOL functions

In reply to Denis Efremov

EXPORT_SYMBOL and inline directives are contradictory to each other. The patch fixes this inconsistency.

Found by Linux Driver Verification project (linuxtesting.org).

---
 arch/sparc/prom/tree_64.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
arch/sparc/prom/tree_64.c +7 -7
index 92204c3..75e4c44 100644
@@ -39,7 +39,7 @@ inline phandle __prom_getchild(phandle node)
 	return prom_node_to_node("child", node);
 }
 
-inline phandle prom_getchild(phandle node)
+phandle prom_getchild(phandle node)
 {
 	phandle cnode;
 
@@ -72,7 +72,7 @@ inline phandle __prom_getsibling(phandle node)
 	return prom_node_to_node(prom_peer_name, node);
 }
 
-inline phandle prom_getsibling(phandle node)
+phandle prom_getsibling(phandle node)
 {
 	phandle sibnode;
 
@@ -89,7 +89,7 @@ EXPORT_SYMBOL(prom_getsibling);
 /* Return the length in bytes of property 'prop' at node 'node'.
  * Return -1 on error.
  */
-inline int prom_getproplen(phandle node, const char *prop)
+int prom_getproplen(phandle node, const char *prop)
 {
 	unsigned long args[6];
 
@@ -113,7 +113,7 @@ EXPORT_SYMBOL(prom_getproplen);
  * 'buffer' which has a size of 'bufsize'.  If the acquisition
  * was successful the length will be returned, else -1 is returned.
  */
-inline int prom_getproperty(phandle node, const char *prop,
+int prom_getproperty(phandle node, const char *prop,
 			    char *buffer, int bufsize)
 {
 	unsigned long args[8];
@@ -141,7 +141,7 @@ EXPORT_SYMBOL(prom_getproperty);
 /* Acquire an integer property and return its value.  Returns -1
  * on failure.
  */
-inline int prom_getint(phandle node, const char *prop)
+int prom_getint(phandle node, const char *prop)
 {
 	int intprop;
 
@@ -235,7 +235,7 @@ static const char *prom_nextprop_name = "nextprop";
 /* Return the first property type for node 'node'.
  * buffer should be at least 32B in length
  */
-inline char *prom_firstprop(phandle node, char *buffer)
+char *prom_firstprop(phandle node, char *buffer)
 {
 	unsigned long args[7];
 
@@ -261,7 +261,7 @@ EXPORT_SYMBOL(prom_firstprop);
  * at node 'node' .  Returns NULL string if no more
  * property types for this node.
  */
-inline char *prom_nextprop(phandle node, const char *oprop, char *buffer)
+char *prom_nextprop(phandle node, const char *oprop, char *buffer)
 {
 	unsigned long args[7];
 	char buf[32];
Signature · 1 line
1.8.1.4
#29 lore raw

PATCH 17/21 CRISv32: remove inline marking of EXPORT_SYMBOL functions

In reply to Denis Efremov

EXPORT_SYMBOL and inline directives are contradictory to each other. The patch fixes this inconsistency.

Found by Linux Driver Verification project (linuxtesting.org).

---
 arch/cris/arch-v32/kernel/cache.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/cris/arch-v32/kernel/cache.c +1 -1
index f38433b..876be53 100644
@@ -5,7 +5,7 @@
 
 /* This file is used to workaround a cache bug, Guinness TR 106. */
 
-inline void flush_dma_descr(struct dma_descr_data *descr, int flush_buf)
+void flush_dma_descr(struct dma_descr_data *descr, int flush_buf)
 {
 	/* Flush descriptor to make sure we get correct in_eop and after. */
 	asm volatile ("ftagd [%0]" :: "r" (descr));
Signature · 1 line
1.8.1.4
Acked-by on v1 17/21
#30 lore raw

Re: [PATCH 17/21] CRISv32: remove inline marking of EXPORT_SYMBOL functions

Quoted 6 lines · Denis Efremov

EXPORT_SYMBOL and inline directives are contradictory to each other. The patch fixes this inconsistency.

Found by Linux Driver Verification project (linuxtesting.org).

Yes, agreed.

Quoted 19 lines
---
 arch/cris/arch-v32/kernel/cache.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/cris/arch-v32/kernel/cache.c +1 -1
index f38433b..876be53 100644
@@ -5,7 +5,7 @@
 
 /* This file is used to workaround a cache bug, Guinness TR 106. */
 
-inline void flush_dma_descr(struct dma_descr_data *descr, int flush_buf)
+void flush_dma_descr(struct dma_descr_data *descr, int flush_buf)
 {
 	/* Flush descriptor to make sure we get correct in_eop and after. */
 	asm volatile ("ftagd [%0]" :: "r" (descr));
Signature · 1 line
1.8.1.4

/^JN - Jesper Nilsson

Signature · 1 line
               Jesper Nilsson -- [email protected]
#31 lore raw

PATCH 18/21 m68k/sun3/: remove inline marking of EXPORT_SYMBOL functions

In reply to Denis Efremov

EXPORT_SYMBOL and inline directives are contradictory to each other. The patch fixes this inconsistency.

Found by Linux Driver Verification project (linuxtesting.org).

---
 arch/m68k/sun3/sun3dvma.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/m68k/sun3/sun3dvma.c +1 -1
index ca0966c..cab5448 100644
@@ -275,7 +275,7 @@ void dvma_init(void)
 
 }
 
-inline unsigned long dvma_map_align(unsigned long kaddr, int len, int align)
+unsigned long dvma_map_align(unsigned long kaddr, int len, int align)
 {
 
 	unsigned long baddr;
Signature · 1 line
1.8.1.4
#32 lore raw

PATCH 18/21 m68k/sun3/: remove inline marking of EXPORT_SYMBOL functions

In reply to Denis Efremov

EXPORT_SYMBOL and inline directives are contradictory to each other. The patch fixes this inconsistency.

Found by Linux Driver Verification project (linuxtesting.org).

---
 arch/m68k/sun3/sun3dvma.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/m68k/sun3/sun3dvma.c +1 -1
index ca0966c..cab5448 100644
@@ -275,7 +275,7 @@ void dvma_init(void)
 
 }
 
-inline unsigned long dvma_map_align(unsigned long kaddr, int len, int align)
+unsigned long dvma_map_align(unsigned long kaddr, int len, int align)
 {
 
 	unsigned long baddr;
Signature · 1 line
1.8.1.4
maintainer Acked-by on v1 18/21
#33 lore raw

Re: [PATCH 18/21] m68k/sun3/: remove inline marking of EXPORT_SYMBOL functions

Quoted 6 lines · Denis Efremov

EXPORT_SYMBOL and inline directives are contradictory to each other. The patch fixes this inconsistency.

Found by Linux Driver Verification project (linuxtesting.org).

Do you want me to queue this in the m68k tree?

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

maintainer Acked-by on v1 18/21
#34 lore raw

Re: [PATCH 18/21] m68k/sun3/: remove inline marking of EXPORT_SYMBOL functions

In reply to Denis Efremov
Quoted 6 lines · Denis Efremov

EXPORT_SYMBOL and inline directives are contradictory to each other. The patch fixes this inconsistency.

Found by Linux Driver Verification project (linuxtesting.org).

Do you want me to queue this in the m68k tree?

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

#35 lore raw

PATCH 19/21 MIPS: MSP71xx: remove inline marking of EXPORT_SYMBOL functions

In reply to Denis Efremov

EXPORT_SYMBOL and inline directives are contradictory to each other. The patch fixes this inconsistency.

Found by Linux Driver Verification project (linuxtesting.org).

---
 arch/mips/pmcs-msp71xx/msp_prom.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/mips/pmcs-msp71xx/msp_prom.c +1 -1
index 0edb89a..1c98975 100644
@@ -83,7 +83,7 @@ static inline unsigned char str2hexnum(unsigned char c)
 	return 0; /* foo */
 }
 
-static inline int str2eaddr(unsigned char *ea, unsigned char *str)
+int str2eaddr(unsigned char *ea, unsigned char *str)
 {
 	int index = 0;
 	unsigned char num = 0;
Signature · 1 line
1.8.1.4
#36 lore raw

PATCH 20/21 powerpc/ps3: remove inline marking of EXPORT_SYMBOL functions

In reply to Denis Efremov

EXPORT_SYMBOL and inline directives are contradictory to each other. The patch fixes this inconsistency.

Found by Linux Driver Verification project (linuxtesting.org).

---
 arch/powerpc/platforms/ps3/spu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/platforms/ps3/spu.c +1 -1
index e17fa14..a0bca05 100644
@@ -143,7 +143,7 @@ static void _dump_areas(unsigned int spe_id, unsigned long priv2,
 	pr_debug("%s:%d: shadow:  %lxh\n", func, line, shadow);
 }
 
-inline u64 ps3_get_spe_id(void *arg)
+u64 ps3_get_spe_id(void *arg)
 {
 	return spu_pdata(arg)->spe_id;
 }
Signature · 1 line
1.8.1.4
maintainer Acked-by on v1 20/21
#37 lore raw

Re: [PATCH 20/21] powerpc/ps3: remove inline marking of EXPORT_SYMBOL functions

Quoted 9 lines · Denis Efremov

EXPORT_SYMBOL and inline directives are contradictory to each other. The patch fixes this inconsistency.

Found by Linux Driver Verification project (linuxtesting.org).

---
 arch/powerpc/platforms/ps3/spu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Looks good, thanks.

#38 lore raw

Re: [PATCH 20/21] powerpc/ps3: remove inline marking of EXPORT_SYMBOL functions

In reply to Denis Efremov
Quoted 15 lines · Denis Efremov

EXPORT_SYMBOL and inline directives are contradictory to each other. The patch fixes this inconsistency.

Found by Linux Driver Verification project (linuxtesting.org).

---
 arch/powerpc/platforms/ps3/spu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/platforms/ps3/spu.c +0 -0
index e17fa14..a0bca05 100644

arch/powerpc/platforms/ps3/spu.c static void _dump_areas(unsigned int spe_id, unsigned long priv2, · line 149

Quoted 8 lines
arch/powerpc/platforms/ps3/spu.c +1 -1
@@ -143,7 +143,7 @@ static void _dump_areas(unsigned int spe_id, unsigned long priv2,
        pr_debug("%s:%d: shadow:  %lxh\n", func, line, shadow);
 }
 
-inline u64 ps3_get_spe_id(void *arg)
+u64 ps3_get_spe_id(void *arg)
 {
        return spu_pdata(arg)->spe_id;
 }

FYI, this symbol is not used in mainline.

IIRC, it's used for profiling only. Any chance the profile code will ever make it
in mainline?

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

maintainer
#39 lore raw

Re: [PATCH 20/21] powerpc/ps3: remove inline marking of EXPORT_SYMBOL functions

Hi Geert,

Quoted 9 lines · Geert Uytterhoeven

arch/powerpc/platforms/ps3/spu.c static void _dump_areas(unsigned int spe_id, unsigned long priv2, · line 149

Quoted 5 lines · Denis Efremov
arch/powerpc/platforms/ps3/spu.c +1 -1
-inline u64 ps3_get_spe_id(void *arg)
+u64 ps3_get_spe_id(void *arg)
 {
        return spu_pdata(arg)->spe_id;
 }

FYI, this symbol is not used in mainline.

Quoted 3 lines

IIRC, it's used for profiling only. Any chance the profile code will ever make it
in mainline?

As I announced (below), I dropped the profiling patches since ps3-queue-v3.8.

The profiling code does not use ps3_get_spe_id(), so I think we should remove it. I'll submit a patch.

-Geoff

-------- Forwarded Message --------
From: Geoff Levand <[email protected]>
To: [email protected]
Subject: Dropping PS3 oprofile support in v3.8
Date: Wed, 13 Feb 2013 17:30:39 -0800

Hi All,

I'll be dropping the PS3 oprofile patches from my ps3-linux git tree from linux-3.8. These are the patches:

7f02610 ps3-debugging: Add oprofile test script 49213b6 powerpc/ps3: PS3 oprofile support aee2985 powerpc/ps3: Add ps3 pmu platform routines 531c3f4 powerpc/ps3: Rearrange order of lpm routines 9d8a7d3 powerpc/cell: Add pmu platform abstraction 6865b99 powerpc/cell: Rearrange order of pmu routines

These patches will still be available in the ps3-queue-v3.7 and earlier branches for anyone who wants them.

-Geoff

#40 lore raw

PATCH 21/21 ARM: remove inline marking of EXPORT_SYMBOL functions

In reply to Denis Efremov

EXPORT_SYMBOL and inline directives are contradictory to each other. The patch fixes this inconsistency.

Found by Linux Driver Verification project (linuxtesting.org).

---
 arch/arm/mach-sa1100/jornada720_ssp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-sa1100/jornada720_ssp.c +1 -1
index b143c46..737842c 100644
@@ -33,7 +33,7 @@ static unsigned long jornada_ssp_flags;
  * we need to reverse all data we receive from the mcu due to its physical location
  * returns : 01110111 -> 11101110
  */
-u8 inline jornada_ssp_reverse(u8 byte)
+u8 jornada_ssp_reverse(u8 byte)
 {
 	return
 		((0x80 & byte) >> 7) |
Signature · 1 line
1.8.1.4