he: Fix __init/__devinit conflict
Subsystems (3)
PATCH 1/1 he: Fix __init/__devinit conflict
he_init_one() is declared __devinit, but calls lots of init functions that are marked __init. However, if CONFIG_HOTPLUG is enabled, __devinit functions go into normal .text, which leads to
WARNING: drivers/atm/he.o - Section mismatch: reference to .init.text: from .text between 'he_start' (at offset 0x2130) and 'he_service_tbrq'
Fix this by changing the __init functions to __devinit.
---
drivers/atm/he.c +8 -8
@@ -454,7 +454,7 @@ #define NONZERO (1 << 14)return (NONZERO | (exp <<9 ) | (rate &0x1ff )); } -static void __init +static void __devinit he_init_rx_lbfp0 (struct he_dev *he_dev) {unsigned i, lbm_offset, lbufd_index, lbuf_addr, lbuf_count;
@@ -485,7 +485,7 @@ he_init_rx_lbfp0(struct he_dev *he_dev)he_writel (he_dev, he_dev->r0_numbuffs,RLBF0_C ); } -static void __init +static void __devinit he_init_rx_lbfp1 (struct he_dev *he_dev) {unsigned i, lbm_offset, lbufd_index, lbuf_addr, lbuf_count;
@@ -516,7 +516,7 @@ he_init_rx_lbfp1(struct he_dev *he_dev)he_writel (he_dev, he_dev->r1_numbuffs,RLBF1_C ); } -static void __init +static void __devinit he_init_tx_lbfp (struct he_dev *he_dev) {unsigned i, lbm_offset, lbufd_index, lbuf_addr, lbuf_count;
@@ -546,7 +546,7 @@ he_init_tx_lbfp(struct he_dev *he_dev)he_writel (he_dev, lbufd_index -1 ,TLBF_T ); } -static int __init +static int __devinit he_init_tpdrq (struct he_dev *he_dev) { he_dev->tpdrq_base = pci_alloc_consistent(he_dev->pci_dev,
@@ -568,7 +568,7 @@ he_init_tpdrq(struct he_dev *he_dev)return 0 ; } -static void __init +static void __devinit he_init_cs_block (struct he_dev *he_dev) {unsigned clock, rate, delta;
@@ -664,7 +664,7 @@ he_init_cs_block(struct he_dev *he_dev) } -static int __init +static int __devinit he_init_cs_block_rcm (struct he_dev *he_dev) {unsigned (*rategrid)[16 ][16 ];
@@ -785,7 +785,7 @@ #define RTGTBL_OFFSET 0x400return 0 ; } -static int __init +static int __devinit he_init_group (struct he_dev *he_dev,int group) {int i;
@@ -955,7 +955,7 @@ #endifreturn 0 ; } -static int __init +static int __devinit he_init_irq (struct he_dev *he_dev) {int i;
he_init_one() is declared __devinit, but calls lots of init functions that are marked __init. However, if CONFIG_HOTPLUG is enabled, __devinit functions go into normal .text, which leads to
WARNING: drivers/atm/he.o - Section mismatch: reference to .init.text: from .text between 'he_start' (at offset 0x2130) and 'he_service_tbrq'
Fix this by changing the __init functions to __devinit.
---
Dave, this was acked by Chas (and he even requested it go into 2.6.18) but it seems to have gotten dropped somewhere -- it's not in Linus's tree even after he pulled your net tree.
Please apply.
drivers/atm/he.c +8 -8
@@ -454,7 +454,7 @@ #define NONZERO (1 << 14)return (NONZERO | (exp <<9 ) | (rate &0x1ff )); } -static void __init +static void __devinit he_init_rx_lbfp0 (struct he_dev *he_dev) {unsigned i, lbm_offset, lbufd_index, lbuf_addr, lbuf_count;
@@ -485,7 +485,7 @@ he_init_rx_lbfp0(struct he_dev *he_dev)he_writel (he_dev, he_dev->r0_numbuffs,RLBF0_C ); } -static void __init +static void __devinit he_init_rx_lbfp1 (struct he_dev *he_dev) {unsigned i, lbm_offset, lbufd_index, lbuf_addr, lbuf_count;
@@ -516,7 +516,7 @@ he_init_rx_lbfp1(struct he_dev *he_dev)he_writel (he_dev, he_dev->r1_numbuffs,RLBF1_C ); } -static void __init +static void __devinit he_init_tx_lbfp (struct he_dev *he_dev) {unsigned i, lbm_offset, lbufd_index, lbuf_addr, lbuf_count;
@@ -546,7 +546,7 @@ he_init_tx_lbfp(struct he_dev *he_dev)he_writel (he_dev, lbufd_index -1 ,TLBF_T ); } -static int __init +static int __devinit he_init_tpdrq (struct he_dev *he_dev) { he_dev->tpdrq_base = pci_alloc_consistent(he_dev->pci_dev,
@@ -568,7 +568,7 @@ he_init_tpdrq(struct he_dev *he_dev)return 0 ; } -static void __init +static void __devinit he_init_cs_block (struct he_dev *he_dev) {unsigned clock, rate, delta;
@@ -664,7 +664,7 @@ he_init_cs_block(struct he_dev *he_dev) } -static int __init +static int __devinit he_init_cs_block_rcm (struct he_dev *he_dev) {unsigned (*rategrid)[16 ][16 ];
@@ -785,7 +785,7 @@ #define RTGTBL_OFFSET 0x400return 0 ; } -static int __init +static int __devinit he_init_group (struct he_dev *he_dev,int group) {int i;
@@ -955,7 +955,7 @@ #endifreturn 0 ; } -static int __init +static int __devinit he_init_irq (struct he_dev *he_dev) {int i;
From: Roland Dreier <[email protected]>
Date: Sat, 23 Sep 2006 17:17:54 -0700
Quoted 5 lines
Dave, this was acked by Chas (and he even requested it go into 2.6.18) but it seems to have gotten dropped somewhere -- it's not in Linus's tree even after he pulled your net tree.
Please apply.
Applied.
I was waiting for a resolution in the fact that the copy Chas posted only had one of the transformations whereas as you pointed out all of the ones in your original patch were necessary.
Chas, as a subsystem maintainer, if you change a submitter's patch in a significant and non-trivial way, you should at least mention a brief reason why you did that. In this case, why did you delete all of Roland's __init/__devinit transformations except one when they all were necessary to fix this bug?
David> I was waiting for a resolution in the fact that the copy David> Chas posted only had one of the transformations whereas as David> you pointed out all of the ones in your original patch were David> necessary.
Actually I think there was some confusion because akpm forwarded a patch from someone else that just changed one __init -> __devinit (which appeared to fix things at least on x86_64 because of the effects of -funit-at-a-time).
I'm not positive but as far as I remember Chas sent my original patch.
Anyway, I think we've wasted enough time on a trivial warning patch.
- R.
Quoted 5 lines · In message <[email protected]>,David Miller writes:
Chas, as a subsystem maintainer, if you change a submitter's patch in a significant and non-trivial way, you should at least mention a brief reason why you did that. In this case, why did you delete all of Roland's __init/__devinit transformations except one when they all were necessary to fix this bug?
i submitted roland patch without modification and therefore without comment. i did change the author field of the patch unintentionally (which wont happen in the future).