2006-01-30 12:38:50

by Gabriel C.

[permalink] [raw]
Subject: 2.6.16-rc1-mm4

Hello,

I got this compile error with 2.6.16-rc1-mm4 , config attached.


LD .tmp_vmlinux1
drivers/built-in.o: In function
`acx_l_transmit_authen1':common.c:(.text+0x6cd62): undefined reference
to `acxusb_l_alloc_tx' :common.c:(.text+0x6cd74): undefined reference
to `acxusb_l_get_txbuf' :common.c:(.text+0x6cdeb): undefined reference
to `acxusb_l_tx_data' drivers/built-in.o: In function
`acx_s_configure_debug': undefined reference to
`acxusb_s_issue_cmd_timeo_debug' drivers/built-in.o: In function
`acx_s_interrogate_debug': undefined reference to
`acxusb_s_issue_cmd_timeo_debug' drivers/built-in.o: In function
`acx_s_cmd_start_scan': undefined reference to
`acxusb_s_issue_cmd_timeo_debug' drivers/built-in.o: In function
`acx_s_init_max_probe_response_template':common.c:(.text+0x6dbfc):
undefined reference to `acxusb_s_issue_cmd_timeo_debug'
drivers/built-in.o: In function
`acx_s_init_max_tim_template':common.c:(.text+0x6dc3d): undefined
reference to `acxusb_s_issue_cmd_timeo_debug'
drivers/built-in.o:common.c:(.text+0x6dc7b): more undefined references
to `acxusb_s_issue_cmd_timeo_debug' follow drivers/built-in.o: In
function `acx_e_read_proc_phy':common.c:(.text+0x6e2b2): undefined
reference to `acxusb_s_read_phy_reg' drivers/built-in.o: In function
`acx_l_transmit_deauthen':common.c:(.text+0x6e329): undefined reference
to `acxusb_l_alloc_tx' :common.c:(.text+0x6e33b): undefined reference
to `acxusb_l_get_txbuf' :common.c:(.text+0x6e3d6): undefined reference
to `acxusb_l_tx_data' drivers/built-in.o: In function
`acx_i_start_xmit': undefined reference to `acxusb_l_alloc_tx'
drivers/built-in.o: In function `acx_i_start_xmit': undefined reference
to `acxusb_l_get_txbuf' drivers/built-in.o: In function
`acx_i_start_xmit': undefined reference to `acxusb_l_tx_data'
drivers/built-in.o: In function
`acx_l_transmit_assoc_req':common.c:(.text+0x6e5be): undefined
reference to `acxusb_l_alloc_tx' :common.c:(.text+0x6e5d5): undefined
reference to `acxusb_l_get_txbuf' :common.c:(.text+0x6e772): undefined
reference to `acxusb_l_tx_data' drivers/built-in.o: In function
`acx_s_cmd_join_bssid':common.c:(.text+0x6eaa2): undefined reference to
`acxusb_s_issue_cmd_timeo_debug' drivers/built-in.o: In function
`acx_s_update_card_settings': undefined reference to
`acxusb_s_read_phy_reg' drivers/built-in.o: In function
`acx_s_update_card_settings': undefined reference to
`acxusb_s_issue_cmd_timeo_debug' drivers/built-in.o: In function
`acx_s_update_card_settings': undefined reference to
`acxusb_s_issue_cmd_timeo_debug' drivers/built-in.o: In function
`acx_s_update_card_settings': undefined reference to
`acxusb_s_write_phy_reg' drivers/built-in.o: In function
`acx_s_update_card_settings': undefined reference to
`acxusb_s_issue_cmd_timeo_debug' drivers/built-in.o: In function
`acx_s_update_card_settings': undefined reference to
`acxusb_s_issue_cmd_timeo_debug' drivers/built-in.o: In function
`acx_s_update_card_settings': undefined reference to
`acxusb_s_issue_cmd_timeo_debug' drivers/built-in.o: In function
`acx_e_after_interrupt_task':common.c:(.text+0x6ffc8): undefined
reference to
`acxusb_s_issue_cmd_timeo_debug' :common.c:(.text+0x6ffe5): undefined
reference to `acxusb_s_issue_cmd_timeo_debug'
drivers/built-in.o:common.c:(.text+0x6fffe): more undefined references
to `acxusb_s_issue_cmd_timeo_debug' follow drivers/built-in.o: In
function `acx_l_process_authen':common.c:(.text+0x7096b): undefined
reference to `acxusb_l_alloc_tx' :common.c:(.text+0x70982): undefined
reference to `acxusb_l_get_txbuf' :common.c:(.text+0x70a68): undefined
reference to `acxusb_l_tx_data' :common.c:(.text+0x70ac5): undefined
reference to `acxusb_l_alloc_tx' :common.c:(.text+0x70adc): undefined
reference to `acxusb_l_get_txbuf' :common.c:(.text+0x70c23): undefined
reference to `acxusb_l_alloc_tx' :common.c:(.text+0x70c38): undefined
reference to `acxusb_l_get_txbuf' :common.c:(.text+0x70cb3): undefined
reference to `acxusb_l_tx_data' drivers/built-in.o: In function
`acx_l_process_mgmt_frame':common.c:(.text+0x70fc9): undefined
reference to `acxusb_l_alloc_tx' :common.c:(.text+0x70fe0): undefined
reference to `acxusb_l_get_txbuf' :common.c:(.text+0x71252): undefined
reference to `acxusb_l_alloc_tx' :common.c:(.text+0x71269): undefined
reference to `acxusb_l_get_txbuf' :common.c:(.text+0x71362): undefined
reference to `acxusb_l_tx_data' drivers/built-in.o: In function
`acx_l_process_rxbuf': undefined reference to `acxusb_l_alloc_tx'
drivers/built-in.o: In function `acx_l_process_rxbuf': undefined
reference to `acxusb_l_get_txbuf' drivers/built-in.o: In function
`acx_l_process_rxbuf': undefined reference to `acxusb_l_tx_data'
drivers/built-in.o: In function
`sandisk_set_iobase':hostap_cs.c:(.text+0x801ad): undefined reference
to `pcmcia_access_configuration_register' :hostap_cs.c:(.text+0x801f3):
undefined reference to `pcmcia_access_configuration_register'
drivers/built-in.o: In function
`prism2_pccard_cor_sreset':hostap_cs.c:(.text+0x80254): undefined
reference to
`pcmcia_access_configuration_register' :hostap_cs.c:(.text+0x80289):
undefined reference to
`pcmcia_access_configuration_register' :hostap_cs.c:(.text+0x80325):
undefined reference to `pcmcia_access_configuration_register'
drivers/built-in.o:hostap_cs.c:(.text+0x80c4b): more undefined
references to `pcmcia_access_configuration_register' follow
drivers/built-in.o: In function
`prism2_release':hostap_cs.c:(.text+0x849c7): undefined reference to
`pcmcia_disable_device' drivers/built-in.o: In function
`hostap_cs_probe':hostap_cs.c:(.text+0x84d53): undefined reference to
`pccard_get_first_tuple' :hostap_cs.c:(.text+0x84d6d): undefined
reference to `pccard_get_tuple_data' :hostap_cs.c:(.text+0x84d86):
undefined reference to
`pccard_parse_tuple' :hostap_cs.c:(.text+0x84dba): undefined reference
to `pcmcia_get_configuration_info' :hostap_cs.c:(.text+0x84de5):
undefined reference to
`pccard_get_first_tuple' :hostap_cs.c:(.text+0x84e06): undefined
reference to `pccard_get_tuple_data' :hostap_cs.c:(.text+0x84e2b):
undefined reference to
`pccard_parse_tuple' :hostap_cs.c:(.text+0x85087): undefined reference
to `pcmcia_request_io' :hostap_cs.c:(.text+0x850a9): undefined
reference to `cs_error' :hostap_cs.c:(.text+0x850c7): undefined
reference to `pccard_get_next_tuple' :hostap_cs.c:(.text+0x85885):
undefined reference to
`pcmcia_request_irq' :hostap_cs.c:(.text+0x858ab): undefined reference
to `pcmcia_request_configuration' :hostap_cs.c:(.text+0x85a34):
undefined reference to
`pccard_get_first_tuple' :hostap_cs.c:(.text+0x85a4a): undefined
reference to `pccard_get_tuple_data' :hostap_cs.c:(.text+0x85a5b):
undefined reference to
`pccard_parse_tuple' :hostap_cs.c:(.text+0x85a89): undefined reference
to `pccard_get_first_tuple' :hostap_cs.c:(.text+0x85a9f): undefined
reference to `pccard_get_tuple_data' :hostap_cs.c:(.text+0x85ab0):
undefined reference to
`pccard_parse_tuple' :hostap_cs.c:(.text+0x85b11): undefined reference
to `pcmcia_access_configuration_register' :hostap_cs.c:(.text+0x85bac):
undefined reference to
`pcmcia_access_configuration_register' :hostap_cs.c:(.text+0x85d04):
undefined reference to `cs_error' drivers/built-in.o: In function
`init_prism2_pccard':hostap_cs.c:(.init.text+0x6dee): undefined
reference to `pcmcia_register_driver' drivers/built-in.o: In function
`exit_prism2_pccard':hostap_cs.c:(.exit.text+0x51d): undefined
reference to `pcmcia_unregister_driver' make: *** [.tmp_vmlinux1] Error
1


Gnu C 4.0.2
Gnu make 3.80
binutils 2.16.91.0.5
util-linux 2.12r
mount 2.12r
module-init-tools 3.2.2
e2fsprogs 1.38
jfsutils 1.1.10
reiserfsprogs 3.6.19
reiser4progs 1.0.5
xfsprogs 2.7.11
quota-tools 3.13.
PPP 2.4.3
nfs-utils 1.0.7
Linux C Library 2.3.6
Dynamic linker (ldd) 2.3.6
Linux C++ Library 6.0.6
Procps 3.2.6
Net-tools 1.60
Kbd 1.12
Sh-utils 5.2.1
udev 082

Please CC me I'm not subscribed to the list

Gabriel


Attachments:
(No filename) (7.97 kB)
2.6.16-rc1.mm4.config (54.22 kB)
Download all attachments

2006-01-30 18:10:42

by Adrian Bunk

[permalink] [raw]
Subject: 2.6.16-rc1-mm4: ACX=y, ACX_USB=n compile error

On Mon, Jan 30, 2006 at 01:38:33PM +0100, Gabriel C. wrote:

> Hello,

Hi Gabriel,

> I got this compile error with 2.6.16-rc1-mm4 , config attached.
>
>
> LD .tmp_vmlinux1
> drivers/built-in.o: In function
> `acx_l_transmit_authen1':common.c:(.text+0x6cd62): undefined reference
> to `acxusb_l_alloc_tx' :common.c:(.text+0x6cd74): undefined reference
> to `acxusb_l_get_txbuf' :common.c:(.text+0x6cdeb): undefined reference
> to `acxusb_l_tx_data' drivers/built-in.o: In function
> `acx_s_configure_debug': undefined reference to
> `acxusb_s_issue_cmd_timeo_debug' drivers/built-in.o: In function
> [many more]
>...

Thanks for your report.

@Denis:
The problem seems to be CONFIG_ACX=y, CONFIG_ACX_USB=n.

> Gabriel

cu
Adrian

--

"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed

2006-01-30 18:23:19

by Adrian Bunk

[permalink] [raw]
Subject: [2.6 patch] PCMCIA=m, HOSTAP_CS=y is not a legal configuration

On Mon, Jan 30, 2006 at 01:38:33PM +0100, Gabriel C. wrote:

> Hello,

Hallo Gabriel,

> I got this compile error with 2.6.16-rc1-mm4 , config attached.
>
>
> LD .tmp_vmlinux1
>...
> `sandisk_set_iobase':hostap_cs.c:(.text+0x801ad): undefined reference
> to `pcmcia_access_configuration_register' :hostap_cs.c:(.text+0x801f3):
> undefined reference to `pcmcia_access_configuration_register'
> drivers/built-in.o: In function
> `prism2_pccard_cor_sreset':hostap_cs.c:(.text+0x80254): undefined
> reference to
> `pcmcia_access_configuration_register' :hostap_cs.c:(.text+0x80289):
> undefined reference to
> `pcmcia_access_configuration_register' :hostap_cs.c:(.text+0x80325):
> undefined reference to `pcmcia_access_configuration_register'
> [more errors]
>...

thanks for your report, a patch is below.

> Gabriel

cu
Adrian


<-- snip -->


CONFIG_PCMCIA=m, CONFIG_HOSTAP_CS=y doesn't compile.

Reported by "Gabriel C." <[email protected]>.


Signed-off-by: Adrian Bunk <[email protected]>

--- linux-2.6.16-rc1-mm4/drivers/net/wireless/hostap/Kconfig.old 2006-01-30 19:00:44.000000000 +0100
+++ linux-2.6.16-rc1-mm4/drivers/net/wireless/hostap/Kconfig 2006-01-30 19:01:04.000000000 +0100
@@ -75,7 +75,7 @@

config HOSTAP_CS
tristate "Host AP driver for Prism2/2.5/3 PC Cards"
- depends on PCMCIA!=n && HOSTAP
+ depends on PCMCIA && HOSTAP
---help---
Host AP driver's version for Prism2/2.5/3 PC Cards.


2006-01-30 20:30:58

by Gabriel C.

[permalink] [raw]
Subject: Re: [2.6 patch] PCMCIA=m, HOSTAP_CS=y is not a legal configuration

On Mon, 30 Jan 2006 19:23:17 +0100
Adrian Bunk <[email protected]> wrote:

> On Mon, Jan 30, 2006 at 01:38:33PM +0100, Gabriel C. wrote:
>
> > Hello,
>
> Hallo Gabriel,
>
> > I got this compile error with 2.6.16-rc1-mm4 , config attached.
> >
> >
> > LD .tmp_vmlinux1
> >...
> > `sandisk_set_iobase':hostap_cs.c:(.text+0x801ad): undefined
> > reference to
> > `pcmcia_access_configuration_register' :hostap_cs.c:(.text+0x801f3):
> > undefined reference to `pcmcia_access_configuration_register'
> > drivers/built-in.o: In function
> > `prism2_pccard_cor_sreset':hostap_cs.c:(.text+0x80254): undefined
> > reference to
> > `pcmcia_access_configuration_register' :hostap_cs.c:(.text+0x80289):
> > undefined reference to
> > `pcmcia_access_configuration_register' :hostap_cs.c:(.text+0x80325):
> > undefined reference to `pcmcia_access_configuration_register' [more
> > errors]
> >...
>
> thanks for your report, a patch is below.
> > Gabriel
>
> cu
> Adrian
>
>
> <-- snip -->
>
>
> CONFIG_PCMCIA=m, CONFIG_HOSTAP_CS=y doesn't compile.
>
> Reported by "Gabriel C." <[email protected]>.
>
>
> Signed-off-by: Adrian Bunk <[email protected]>
>
> ---
> linux-2.6.16-rc1-mm4/drivers/net/wireless/hostap/Kconfig.old
> 2006-01-30 19:00:44.000000000 +0100 +++
> linux-2.6.16-rc1-mm4/drivers/net/wireless/hostap/Kconfig
> 2006-01-30 19:01:04.000000000 +0100 @@ -75,7 +75,7 @@ config HOSTAP_CS
> tristate "Host AP driver for Prism2/2.5/3 PC Cards"
> - depends on PCMCIA!=n && HOSTAP
> + depends on PCMCIA && HOSTAP
> ---help---
> Host AP driver's version for Prism2/2.5/3 PC Cards.
>
>

Hi Adrian,

Your patch works fine, thanks :)

Gabriel

2006-01-31 06:11:41

by Denis Vlasenko

[permalink] [raw]
Subject: Re: 2.6.16-rc1-mm4: ACX=y, ACX_USB=n compile error

On Monday 30 January 2006 20:10, Adrian Bunk wrote:
> On Mon, Jan 30, 2006 at 01:38:33PM +0100, Gabriel C. wrote:
>
> > Hello,
>
> Hi Gabriel,
>
> > I got this compile error with 2.6.16-rc1-mm4 , config attached.
> >
> >
> > LD .tmp_vmlinux1
> > drivers/built-in.o: In function
> > `acx_l_transmit_authen1':common.c:(.text+0x6cd62): undefined reference
> > to `acxusb_l_alloc_tx' :common.c:(.text+0x6cd74): undefined reference
> > to `acxusb_l_get_txbuf' :common.c:(.text+0x6cdeb): undefined reference
> > to `acxusb_l_tx_data' drivers/built-in.o: In function
> > `acx_s_configure_debug': undefined reference to
> > `acxusb_s_issue_cmd_timeo_debug' drivers/built-in.o: In function
> > [many more]
> >...
>
> Thanks for your report.
>
> @Denis:
> The problem seems to be CONFIG_ACX=y, CONFIG_ACX_USB=n.

Thanks, will test/fix ASAP.

Gabriel, please send me your .config
--
vda

2006-01-31 09:03:45

by Gabriel C.

[permalink] [raw]
Subject: Re: 2.6.16-rc1-mm4: ACX=y, ACX_USB=n compile error

On Tue, 31 Jan 2006 08:10:32 +0200
Denis Vlasenko <[email protected]> wrote:

> On Monday 30 January 2006 20:10, Adrian Bunk wrote:
> > On Mon, Jan 30, 2006 at 01:38:33PM +0100, Gabriel C. wrote:
> >
> > > Hello,
> >
> > Hi Gabriel,
> >
> > > I got this compile error with 2.6.16-rc1-mm4 , config attached.
> > >
> > >
> > > LD .tmp_vmlinux1
> > > drivers/built-in.o: In function
> > > `acx_l_transmit_authen1':common.c:(.text+0x6cd62): undefined
> > > reference to `acxusb_l_alloc_tx' :common.c:(.text+0x6cd74):
> > > undefined reference to
> > > `acxusb_l_get_txbuf' :common.c:(.text+0x6cdeb): undefined
> > > reference to `acxusb_l_tx_data' drivers/built-in.o: In function
> > > `acx_s_configure_debug': undefined reference to
> > > `acxusb_s_issue_cmd_timeo_debug' drivers/built-in.o: In function
> > > [many more]
> > >...
> >
> > Thanks for your report.
> >
> > @Denis:
> > The problem seems to be CONFIG_ACX=y, CONFIG_ACX_USB=n.
>
> Thanks, will test/fix ASAP.
>
> Gabriel, please send me your .config

Hi Denis,

config is attached.

> --
> vda

Gabriel


Attachments:
(No filename) (1.05 kB)
2.6.16-rc1.mm4.config (54.22 kB)
Download all attachments

2006-01-31 13:13:57

by Denis Vlasenko

[permalink] [raw]
Subject: Re: 2.6.16-rc1-mm4: ACX=y, ACX_USB=n compile error

On Tuesday 31 January 2006 11:03, Gabriel C. wrote:
> > > > I got this compile error with 2.6.16-rc1-mm4 , config attached.
> > > >
> > > >
> > > > LD .tmp_vmlinux1
> > > > drivers/built-in.o: In function
> > > > `acx_l_transmit_authen1':common.c:(.text+0x6cd62): undefined
> > > > reference to `acxusb_l_alloc_tx' :common.c:(.text+0x6cd74):
> > > > undefined reference to
> > > > `acxusb_l_get_txbuf' :common.c:(.text+0x6cdeb): undefined
> > > > reference to `acxusb_l_tx_data' drivers/built-in.o: In function
> > > > `acx_s_configure_debug': undefined reference to
> > > > `acxusb_s_issue_cmd_timeo_debug' drivers/built-in.o: In function
> > > > [many more]
> > > >...
> > >
> > > Thanks for your report.
> > >
> > > @Denis:
> > > The problem seems to be CONFIG_ACX=y, CONFIG_ACX_USB=n.
> >
> > Thanks, will test/fix ASAP.

CONFIG_ACX=y
# CONFIG_ACX_PCI is not set
# CONFIG_ACX_USB is not set

This won't fly. You must select at least one.

Attached patch will check for this and #error out.
Andrew, do not apply to -mm, I'll send you bigger update today.
--
vda


Attachments:
(No filename) (1.05 kB)
acx.patch (660.00 B)
Download all attachments

2006-01-31 14:56:44

by John W. Linville

[permalink] [raw]
Subject: Re: 2.6.16-rc1-mm4: ACX=y, ACX_USB=n compile error

On Tue, Jan 31, 2006 at 02:16:05PM +0200, Denis Vlasenko wrote:

> CONFIG_ACX=y
> # CONFIG_ACX_PCI is not set
> # CONFIG_ACX_USB is not set
>
> This won't fly. You must select at least one.
>
> Attached patch will check for this and #error out.
> Andrew, do not apply to -mm, I'll send you bigger update today.

Is there any way to move this into a Kconfig file? That seems nicer
than having #ifdefs in source code to check for a configuration error.

John

P.S. Please post any patches with formatting according to kernel
conventions:

http://linux.yyz.us/patch-format.html

--
John W. Linville
[email protected]

2006-01-31 16:22:53

by John W. Linville

[permalink] [raw]
Subject: Re: [2.6 patch] PCMCIA=m, HOSTAP_CS=y is not a legal configuration

On Mon, Jan 30, 2006 at 07:23:17PM +0100, Adrian Bunk wrote:

> CONFIG_PCMCIA=m, CONFIG_HOSTAP_CS=y doesn't compile.
>
> Reported by "Gabriel C." <[email protected]>.

Applied to upstream-fixes branch of wireless-2.6.

Thanks,

John
--
John W. Linville
[email protected]

2006-01-31 17:30:20

by Denis Vlasenko

[permalink] [raw]
Subject: Re: 2.6.16-rc1-mm4: ACX=y, ACX_USB=n compile error

On Tuesday 31 January 2006 16:54, John W. Linville wrote:
> On Tue, Jan 31, 2006 at 02:16:05PM +0200, Denis Vlasenko wrote:
>
> > CONFIG_ACX=y
> > # CONFIG_ACX_PCI is not set
> > # CONFIG_ACX_USB is not set
> >
> > This won't fly. You must select at least one.
> >
> > Attached patch will check for this and #error out.
> > Andrew, do not apply to -mm, I'll send you bigger update today.
>
> Is there any way to move this into a Kconfig file? That seems nicer
> than having #ifdefs in source code to check for a configuration error.

Can't think of any at the moment.
--
vda

2006-01-31 18:34:46

by Gabriel C.

[permalink] [raw]
Subject: Re: 2.6.16-rc1-mm4: ACX=y, ACX_USB=n compile error

On Tue, 31 Jan 2006 16:58:09 +0200
Denis Vlasenko <[email protected]> wrote:

> On Tuesday 31 January 2006 16:54, John W. Linville wrote:
> > On Tue, Jan 31, 2006 at 02:16:05PM +0200, Denis Vlasenko wrote:
> >
> > > CONFIG_ACX=y
> > > # CONFIG_ACX_PCI is not set
> > > # CONFIG_ACX_USB is not set
> > >
> > > This won't fly. You must select at least one.
> > >
> > > Attached patch will check for this and #error out.
> > > Andrew, do not apply to -mm, I'll send you bigger update today.
> >
> > Is there any way to move this into a Kconfig file? That seems nicer
> > than having #ifdefs in source code to check for a configuration
> > error.
>
> Can't think of any at the moment.
> --
> vda
>

I'm not a kernel hacker :-) and mabye I'm wrong but why not auto select
ACX_{PCI,USB} ?

Gabriel

2006-01-31 18:59:34

by Carlos Martín Nieto

[permalink] [raw]
Subject: Re: 2.6.16-rc1-mm4: ACX=y, ACX_USB=n compile error

On Tuesday 31 January 2006 19:34, Gabriel C. wrote:
>
> I'm not a kernel hacker :-) and mabye I'm wrong but why not auto select
> ACX_{PCI,USB} ?

They can still be both unselected, and that's where the problem lies.

Would it work if you added '&& (ACX_USB || ACX_PCI)' to the end of the
'depends' line, or would that just make it unselectable?

cmn
--
Carlos Mart?n http://www.cmartin.tk

"Erdbeben? Sicherlich etwas, das mit Erdberen zu tun hat." -- me, paraphrased

2006-01-31 23:08:29

by Andrew Morton

[permalink] [raw]
Subject: Re: 2.6.16-rc1-mm4

Avuton Olrich <[email protected]> wrote:
>
> On 1/29/06, Andrew Morton <[email protected]> wrote:
> >
> > ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.16-rc1/2.6.16-rc1-mm4/
>
> I'm getting a kernel panic on my Libretto L5 on boot, I don't have a
> serial port on this laptop, I don't have time at the moment to setup
> netconsole, and it doesn't get the full information. Hopefully this
> picture helps a bit:
>
> http://68.111.224.150:8080/P1010306.JPG
>
> If it doesn't help I will attempt to get a netconsole on this computer
> on the near future.

jpeg is fine. It helps if you can get 50 rows on the screen - boot with
the appropriate `vga=' option, put SYSFONT="iso08.08" in
/etc/sysconfig/i18n, etc.

It seems that some cpufreq notifier has done a divide-by-zero. But I can't
see any sign of which one it is. You might get a better trace if you set
CONFIG_FRAME_POINTER=n.

If you could do those things and then prepare another photo it would really
help, thanks.

2006-02-01 00:16:44

by Adrian Bunk

[permalink] [raw]
Subject: Re: 2.6.16-rc1-mm4: ACX=y, ACX_USB=n compile error

On Tue, Jan 31, 2006 at 04:58:09PM +0200, Denis Vlasenko wrote:
> On Tuesday 31 January 2006 16:54, John W. Linville wrote:
> > On Tue, Jan 31, 2006 at 02:16:05PM +0200, Denis Vlasenko wrote:
> >
> > > CONFIG_ACX=y
> > > # CONFIG_ACX_PCI is not set
> > > # CONFIG_ACX_USB is not set
> > >
> > > This won't fly. You must select at least one.
> > >
> > > Attached patch will check for this and #error out.
> > > Andrew, do not apply to -mm, I'll send you bigger update today.
> >
> > Is there any way to move this into a Kconfig file? That seems nicer
> > than having #ifdefs in source code to check for a configuration error.
>
> Can't think of any at the moment.

There are two possible solutions ("offer" means "is user visible"):
- only offer ACX and always build ACX_PCI/ACX_USB depending on the
availability of PCI/USB
- only offer ACX_PCI and ACX_USB which select ACX

If you tell me which you prefer I can send a patch.

> vda

cu
Adrian

--

"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed

2006-02-01 00:20:13

by Dave Jones

[permalink] [raw]
Subject: Re: 2.6.16-rc1-mm4

On Tue, Jan 31, 2006 at 02:45:58PM -0800, Avuton Olrich wrote:
> On 1/29/06, Andrew Morton <[email protected]> wrote:
> >
> > ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.16-rc1/2.6.16-rc1-mm4/
>
> I'm getting a kernel panic on my Libretto L5 on boot, I don't have a
> serial port on this laptop, I don't have time at the moment to setup
> netconsole, and it doesn't get the full information. Hopefully this
> picture helps a bit:
>
> http://68.111.224.150:8080/P1010306.JPG
>
> If it doesn't help I will attempt to get a netconsole on this computer
> on the near future.

Thomas recently changed cpufreq_update_policy to call cpufreq_out_of_sync()
to resync when the BIOS changed the frequency behind our back.
The div by 0 trace fingers that code, but I'm puzzled what we're actually
dividing there.

Dave

2006-02-01 00:59:44

by Dave Jones

[permalink] [raw]
Subject: Re: 2.6.16-rc1-mm4

On Tue, Jan 31, 2006 at 07:19:40PM -0500, Dave Jones wrote:
> On Tue, Jan 31, 2006 at 02:45:58PM -0800, Avuton Olrich wrote:
> > On 1/29/06, Andrew Morton <[email protected]> wrote:
> > >
> > > ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.16-rc1/2.6.16-rc1-mm4/
> >
> > I'm getting a kernel panic on my Libretto L5 on boot, I don't have a
> > serial port on this laptop, I don't have time at the moment to setup
> > netconsole, and it doesn't get the full information. Hopefully this
> > picture helps a bit:
> >
> > http://68.111.224.150:8080/P1010306.JPG
> >
> > If it doesn't help I will attempt to get a netconsole on this computer
> > on the near future.
>
> Thomas recently changed cpufreq_update_policy to call cpufreq_out_of_sync()
> to resync when the BIOS changed the frequency behind our back.
> The div by 0 trace fingers that code, but I'm puzzled what we're actually
> dividing there.

it'd be interesting to see the output of cpufreq.debug=7 to see
what adjust_jiffies is getting before we div by 0, though I fear
it'll scroll off the screen before we get a chance to capture it.

Dave

2006-02-01 02:47:45

by Chuck Ebbert

[permalink] [raw]
Subject: Re: 2.6.16-rc1-mm4

In-Reply-To: <[email protected]>

$ perl scripts/reference_init.pl | grep smp_locks
Error: ./arch/i386/kernel/alternative.o .smp_locks refers to 00000008 R_386_32 .init.text
Error: ./arch/i386/kernel/apic.o .smp_locks refers to 00000000 R_386_32 .init.text
Error: ./arch/i386/kernel/apic.o .smp_locks refers to 00000010 R_386_32 .init.text
Error: ./arch/i386/kernel/apic.o .smp_locks refers to 00000014 R_386_32 .init.text
Error: ./arch/i386/kernel/cpu/amd.o .smp_locks refers to 00000000 R_386_32 .init.text
Error: ./arch/i386/kernel/cpu/amd.o .smp_locks refers to 00000004 R_386_32 .init.text
Error: ./arch/i386/kernel/cpu/amd.o .smp_locks refers to 00000008 R_386_32 .init.text
Error: ./arch/i386/kernel/cpu/amd.o .smp_locks refers to 0000000c R_386_32 .init.text
Error: ./arch/i386/kernel/cpu/amd.o .smp_locks refers to 00000010 R_386_32 .init.text
Error: ./arch/i386/kernel/cpu/amd.o .smp_locks refers to 00000014 R_386_32 .init.text
Error: ./arch/i386/kernel/cpu/amd.o .smp_locks refers to 00000018 R_386_32 .init.text
Error: ./arch/i386/kernel/cpu/centaur.o .smp_locks refers to 00000000 R_386_32 .init.text
Error: ./arch/i386/kernel/cpu/centaur.o .smp_locks refers to 00000004 R_386_32 .init.text
...

Caused by x86_smp_alternatives.patch

Does this mean that the SMP lock-switching could write all over discarded
__init code?

--
Chuck

2006-02-01 04:31:24

by Chuck Ebbert

[permalink] [raw]
Subject: Re: 2.6.16-rc1-mm4

In-Reply-To: <[email protected]>

[I forgot to copy linux-kernel]

On Tue, 31 Jan 2006, Chuck Ebbert wrote:

> Does this mean that the SMP lock-switching could write all over discarded
> __init code?
>

Oops, never mind... it uses _text and _etext to bound the address
range it will touch.

That's the problem with these scripts: they produce false positives and
even worse, they miss real problems.

--
Chuck
--
Chuck

2006-02-01 06:57:34

by Denis Vlasenko

[permalink] [raw]
Subject: Re: 2.6.16-rc1-mm4: ACX=y, ACX_USB=n compile error

On Wednesday 01 February 2006 00:16, Adrian Bunk wrote:
> > > > CONFIG_ACX=y
> > > > # CONFIG_ACX_PCI is not set
> > > > # CONFIG_ACX_USB is not set
> > > >
> > > > This won't fly. You must select at least one.
> > > >
> > > > Attached patch will check for this and #error out.
> > > > Andrew, do not apply to -mm, I'll send you bigger update today.
> > >
> > > Is there any way to move this into a Kconfig file? That seems nicer
> > > than having #ifdefs in source code to check for a configuration error.
> >
> > Can't think of any at the moment.
>
> There are two possible solutions ("offer" means "is user visible"):
> - only offer ACX and always build ACX_PCI/ACX_USB depending on the
> availability of PCI/USB
> - only offer ACX_PCI and ACX_USB which select ACX
>
> If you tell me which you prefer I can send a patch.

Second one sounds okay to me.
--
vda

2006-02-01 10:07:21

by Andrew Morton

[permalink] [raw]
Subject: Re: 2.6.16-rc1-mm4

Avuton Olrich <[email protected]> wrote:
>
> On 1/31/06, Andrew Morton <[email protected]> wrote:
> > Avuton Olrich <[email protected]> wrote:
> > > I'm getting a kernel panic on my Libretto L5 on boot, I don't have a
> > > serial port on this laptop, I don't have time at the moment to setup
> > > netconsole, and it doesn't get the full information. Hopefully this
> > > picture helps a bit:
> > >
> > > http://68.111.224.150:8080/P1010306.JPG
> > >
> > > If it doesn't help I will attempt to get a netconsole on this computer
> > > on the near future.
> >
> > jpeg is fine. It helps if you can get 50 rows on the screen - boot with
> > the appropriate `vga=' option, put SYSFONT="iso08.08" in
> > /etc/sysconfig/i18n, etc.
> >
> > It seems that some cpufreq notifier has done a divide-by-zero. But I can't
> > see any sign of which one it is. You might get a better trace if you set
> > CONFIG_FRAME_POINTER=n.
> >
> > If you could do those things and then prepare another photo it would really
> > help, thanks.
>
> Disabled CONFIG_FRAME_POINTER and changed my font to ultra small. It's
> painful to read so use a good image viewing tool with zoom :)
>
> http://68.111.224.150:8080/P1010001.JPG
>
> Also, I tried the cpufreq.debug=7 thing that Dave Jones recommended
> and got no more output than I got without. I may have done something
> wrong, please let me know if it's needed.
>

Ah, better, thanks.

You got the divide-by-zero in time_cpufreq_notifier(). John has been
playing with that in the time patches in -mm, so perhaps he broke it?

At a guess I'd say that there's some new startup ordering thing and
we're now passing zero into cpufreq_scale().

2006-02-01 10:36:11

by Thomas Renninger

[permalink] [raw]
Subject: [PATCH 1/2] Re: 2.6.16-rc1-mm4

On Wednesday 01 February 2006 01:59, Dave Jones wrote:
> On Tue, Jan 31, 2006 at 07:19:40PM -0500, Dave Jones wrote:
> > On Tue, Jan 31, 2006 at 02:45:58PM -0800, Avuton Olrich wrote:
> > > On 1/29/06, Andrew Morton <[email protected]> wrote:
> > > >
> > > > ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.16-rc1/2.6.16-rc1-mm4/
> > >
> > > I'm getting a kernel panic on my Libretto L5 on boot, I don't have a
> > > serial port on this laptop, I don't have time at the moment to setup
> > > netconsole, and it doesn't get the full information. Hopefully this
> > > picture helps a bit:
> > >
> > > http://68.111.224.150:8080/P1010306.JPG
> > >
> > > If it doesn't help I will attempt to get a netconsole on this computer
> > > on the near future.
> >
> > Thomas recently changed cpufreq_update_policy to call cpufreq_out_of_sync()
> > to resync when the BIOS changed the frequency behind our back.
> > The div by 0 trace fingers that code, but I'm puzzled what we're actually
> > dividing there.
>
> it'd be interesting to see the output of cpufreq.debug=7 to see
> what adjust_jiffies is getting before we div by 0, though I fear
> it'll scroll off the screen before we get a chance to capture it.

The driver seem not to initialize policy->cur in it's init function?
The 0 div probably comes from cpufreq_scale() called in time_cpufreq_notifier()
in kernel/arch/i386/timers/timer_tsc.c

This patch checks in update_policy() whether 0 is set as current freq:
(Be careful, Dave adjusted my original patch to mm, this one is on top of my
original one, so it might not patch cleanly on what Dave finally put in, but it should...)
Maybe it's easier if I submit the old one again with these lines added?
compile tested ...
_________________________________________________

Check whether driver init did not initialize current freq

signed-off-by: Thomas Renninger <[email protected]>


Index: linux-2.6.16-rc1-mm3/drivers/cpufreq/cpufreq.c
===================================================================
--- linux-2.6.16-rc1-mm3.orig/drivers/cpufreq/cpufreq.c
+++ linux-2.6.16-rc1-mm3/drivers/cpufreq/cpufreq.c
@@ -1435,8 +1435,14 @@ int cpufreq_update_policy(unsigned int c
*/
if (cpufreq_driver->get){
policy.cur = cpufreq_driver->get(cpu);
- if (data->cur != policy.cur)
- cpufreq_out_of_sync(cpu, data->cur, policy.cur);
+ if (!data->cur){
+ dprintk("Driver did not initialize current freq");
+ data->cur = policy.cur;
+ }
+ else{
+ if (data->cur != policy.cur)
+ cpufreq_out_of_sync(cpu, data->cur, policy.cur);
+ }
}

ret = __cpufreq_set_policy(data, &policy);

2006-02-01 10:38:40

by Thomas Renninger

[permalink] [raw]
Subject: [PATCH 2/2] Re: 2.6.16-rc1-mm4

On Wednesday 01 February 2006 01:59, Dave Jones wrote:
> On Tue, Jan 31, 2006 at 07:19:40PM -0500, Dave Jones wrote:
> > On Tue, Jan 31, 2006 at 02:45:58PM -0800, Avuton Olrich wrote:
> > > On 1/29/06, Andrew Morton <[email protected]> wrote:
> > > >
> > > > ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.16-rc1/2.6.16-rc1-mm4/
> > >
> > > I'm getting a kernel panic on my Libretto L5 on boot, I don't have a
> > > serial port on this laptop, I don't have time at the moment to setup
> > > netconsole, and it doesn't get the full information. Hopefully this
> > > picture helps a bit:
> > >
> > > http://68.111.224.150:8080/P1010306.JPG
> > >
> > > If it doesn't help I will attempt to get a netconsole on this computer
> > > on the near future.
> >
> > Thomas recently changed cpufreq_update_policy to call cpufreq_out_of_sync()
> > to resync when the BIOS changed the frequency behind our back.
> > The div by 0 trace fingers that code, but I'm puzzled what we're actually
> > dividing there.
>
> it'd be interesting to see the output of cpufreq.debug=7 to see
> what adjust_jiffies is getting before we div by 0, though I fear
> it'll scroll off the screen before we get a chance to capture it.
>

Test for old_freq equals 0 to insure not to divide by 0:
______________________________________________

Check for not initialized freq on cpufreq changes

signed-off-by: Thomas Renninger <[email protected]>


Index: linux-2.6.16-rc1-mm3/arch/i386/kernel/timers/timer_tsc.c
===================================================================
--- linux-2.6.16-rc1-mm3.orig/arch/i386/kernel/timers/timer_tsc.c
+++ linux-2.6.16-rc1-mm3/arch/i386/kernel/timers/timer_tsc.c
@@ -272,6 +272,10 @@ time_cpufreq_notifier(struct notifier_bl
if (val != CPUFREQ_RESUMECHANGE)
write_seqlock_irq(&xtime_lock);
if (!ref_freq) {
+ if (!freq->old){
+ ref_freq = freq->new;
+ goto end;
+ }
ref_freq = freq->old;
loops_per_jiffy_ref = cpu_data[freq->cpu].loops_per_jiffy;
#ifndef CONFIG_SMP
@@ -297,6 +301,7 @@ time_cpufreq_notifier(struct notifier_bl
#endif
}

+end:
if (val != CPUFREQ_RESUMECHANGE)
write_sequnlock_irq(&xtime_lock);

2006-02-01 10:59:14

by Thomas Renninger

[permalink] [raw]
Subject: Re: [PATCH 2/2] Re: 2.6.16-rc1-mm4

Avuton Olrich wrote:
>
> Applied those two patches you just put in this list by hand to -mm4.
> Works fine, thanks for the quick resonse.
>
> --
What cpufreq driver are you using?
The driver itself should already have set policy->cur in its
init function.

Thomas

2006-02-01 23:56:34

by Keith Owens

[permalink] [raw]
Subject: Re: 2.6.16-rc1-mm4

Chuck Ebbert (on Tue, 31 Jan 2006 21:44:20 -0500) wrote:
>In-Reply-To: <[email protected]>
>
> $ perl scripts/reference_init.pl | grep smp_locks
> Error: ./arch/i386/kernel/alternative.o .smp_locks refers to 00000008 R_386_32 .init.text
> ...
>
>Caused by x86_smp_alternatives.patch
>
>Does this mean that the SMP lock-switching could write all over discarded
>__init code?

Looking at the patch, it builds tables that can refer to .init.text but
then it excludes table entries that do not fall between _text and
_etext. Which makes the reference from .smp_locks to .init.text a
false positive. Gerd, is that the way that smp_alternatives is meant
to work? If so, I will update reference_*.pl.

+ alternatives_smp_module_add(NULL, "core kernel",
+ __smp_locks, __smp_locks_end,
+ _text, _etext);

2006-02-02 08:58:24

by Gerd Hoffmann

[permalink] [raw]
Subject: Re: 2.6.16-rc1-mm4

Keith Owens wrote:
> Chuck Ebbert (on Tue, 31 Jan 2006 21:44:20 -0500) wrote:
>> Error: ./arch/i386/kernel/alternative.o .smp_locks refers to 00000008 R_386_32 .init.text

> Looking at the patch, it builds tables that can refer to .init.text but
> then it excludes table entries that do not fall between _text and
> _etext.

Yep. The same goes for modules where the patch also keeps track of the
.text section ranges to avoid accessing __init regions which might have
been released meanwhile.

cheers,

Gerd

--
Gerd 'just married' Hoffmann <[email protected]>
I'm the hacker formerly known as Gerd Knorr.
http://www.suse.de/~kraxel/just-married.jpeg

2006-02-05 05:02:35

by Adrian Bunk

[permalink] [raw]
Subject: [-mm patch] let only ACX_PCI/ACX_USB be user-visible and select ACX accordingly

On Wed, Feb 01, 2006 at 08:57:04AM +0200, Denis Vlasenko wrote:
> On Wednesday 01 February 2006 00:16, Adrian Bunk wrote:
> > > > > CONFIG_ACX=y
> > > > > # CONFIG_ACX_PCI is not set
> > > > > # CONFIG_ACX_USB is not set
> > > > >
> > > > > This won't fly. You must select at least one.
> > > > >
> > > > > Attached patch will check for this and #error out.
> > > > > Andrew, do not apply to -mm, I'll send you bigger update today.
> > > >
> > > > Is there any way to move this into a Kconfig file? That seems nicer
> > > > than having #ifdefs in source code to check for a configuration error.
> > >
> > > Can't think of any at the moment.
> >
> > There are two possible solutions ("offer" means "is user visible"):
> > - only offer ACX and always build ACX_PCI/ACX_USB depending on the
> > availability of PCI/USB
> > - only offer ACX_PCI and ACX_USB which select ACX
> >
> > If you tell me which you prefer I can send a patch.
>
> Second one sounds okay to me.

The patch is below.

I've promised a bit too much, there's one small problem in this patch:

If the user says y to one option and m to the other, the driver is built
statically supporting both.

Unfortunately, I don't see any reasonable way to implement this better
(but I do still prefer this solution over the #error).

> vda

cu
Adrian


<-- snip -->


Let only ACX_PCI/ACX_USB be user-visible and select ACX accordingly.


Signed-off-by: Adrian Bunk <[email protected]>

---

drivers/net/wireless/tiacx/Kconfig | 43 +++++++++++++-----------
drivers/net/wireless/tiacx/Makefile | 4 +-
drivers/net/wireless/tiacx/acx_struct.h | 12 ++----
drivers/net/wireless/tiacx/common.c | 8 ++--
4 files changed, 34 insertions(+), 33 deletions(-)


--- linux-2.6.16-rc1-mm5-full/drivers/net/wireless/tiacx/Kconfig.old 2006-02-05 03:48:32.000000000 +0100
+++ linux-2.6.16-rc1-mm5-full/drivers/net/wireless/tiacx/Kconfig 2006-02-05 05:31:54.000000000 +0100
@@ -1,25 +1,18 @@
config ACX
- tristate "TI acx100/acx111 802.11b/g wireless chipsets"
- depends on NET_RADIO && EXPERIMENTAL && (USB || PCI)
+ tristate
select FW_LOADER
+
+config ACX_PCI
+ tristate "TI acx100/acx111 802.11b/g PCI wireless chipsets"
+ depends on NET_RADIO && EXPERIMENTAL && PCI && (USB || ACX_USB=n)
+ select ACX
+ select ACX_PCI_BOOL
---help---
- A driver for 802.11b/g wireless cards based on
- Texas Instruments acx100 and acx111 chipsets.
+ Include support for PCI and CardBus 802.11b/g wireless cards
+ based on Texas Instruments acx100 and acx111 chipsets.

This driver supports Host AP mode that allows
your computer to act as an IEEE 802.11 access point.
- This driver is new and experimental.
-
- Texas Instruments did not take part in development of this driver
- in any way, shape or form.
-
- The driver can be compiled as a module and will be named "acx".
-
-config ACX_PCI
- bool "TI acx100/acx111 802.11b/g PCI"
- depends on ACX && PCI
- ---help---
- Include PCI and CardBus support in acx.

acx chipsets need their firmware loaded at startup.
You will need to provide a firmware image via hotplug.
@@ -44,11 +37,20 @@
Firmware files are not covered by GPL and are not distributed
with this driver for legal reasons.

+config ACX_PCI_BOOL
+ bool
+
config ACX_USB
- bool "TI acx100/acx111 802.11b/g USB"
- depends on ACX && (USB=y || USB=ACX)
+ tristate "TI acx100/acx111 802.11b/g USB wireless chipsets"
+ depends on NET_RADIO && EXPERIMENTAL && USB
+ select ACX
+ select ACX_USB_BOOL
---help---
- Include USB support in acx.
+ Include support for USB 802.11b/g wireless cards
+ based on Texas Instruments acx100 and acx111 chipsets.
+
+ This driver supports Host AP mode that allows
+ your computer to act as an IEEE 802.11 access point.

There is only one currently known device in this category,
D-Link DWL-120+, but newer devices seem to be on the horizon.
@@ -61,3 +63,6 @@

Firmware files are not covered by GPL and are not distributed
with this driver for legal reasons.
+
+config ACX_USB_BOOL
+ bool
--- linux-2.6.16-rc1-mm5-full/drivers/net/wireless/tiacx/Makefile.old 2006-02-05 05:25:03.000000000 +0100
+++ linux-2.6.16-rc1-mm5-full/drivers/net/wireless/tiacx/Makefile 2006-02-05 05:25:17.000000000 +0100
@@ -1,6 +1,6 @@
obj-$(CONFIG_ACX) += acx.o

-acx-obj-$(CONFIG_ACX_PCI) += pci.o
-acx-obj-$(CONFIG_ACX_USB) += usb.o
+acx-obj-$(CONFIG_ACX_PCI_BOOL) += pci.o
+acx-obj-$(CONFIG_ACX_USB_BOOL) += usb.o

acx-objs := wlan.o conv.o ioctl.o common.o $(acx-obj-y)
--- linux-2.6.16-rc1-mm5-full/drivers/net/wireless/tiacx/acx_struct.h.old 2006-02-05 05:37:13.000000000 +0100
+++ linux-2.6.16-rc1-mm5-full/drivers/net/wireless/tiacx/acx_struct.h 2006-02-05 05:37:35.000000000 +0100
@@ -105,12 +105,8 @@
#define DEVTYPE_PCI 0
#define DEVTYPE_USB 1

-#if !defined(CONFIG_ACX_PCI) && !defined(CONFIG_ACX_USB)
-#error Driver must include PCI and/or USB support. You selected neither.
-#endif
-
-#if defined(CONFIG_ACX_PCI)
- #if !defined(CONFIG_ACX_USB)
+#if defined(CONFIG_ACX_PCI_BOOL)
+ #if !defined(CONFIG_ACX_USB_BOOL)
#define IS_PCI(adev) 1
#else
#define IS_PCI(adev) ((adev)->dev_type == DEVTYPE_PCI)
@@ -119,8 +115,8 @@
#define IS_PCI(adev) 0
#endif

-#if defined(CONFIG_ACX_USB)
- #if !defined(CONFIG_ACX_PCI)
+#if defined(CONFIG_ACX_USB_BOOL)
+ #if !defined(CONFIG_ACX_PCI_BOOL)
#define IS_USB(adev) 1
#else
#define IS_USB(adev) ((adev)->dev_type == DEVTYPE_USB)
--- linux-2.6.16-rc1-mm5-full/drivers/net/wireless/tiacx/common.c.old 2006-02-05 05:37:44.000000000 +0100
+++ linux-2.6.16-rc1-mm5-full/drivers/net/wireless/tiacx/common.c 2006-02-05 05:38:58.000000000 +0100
@@ -6853,12 +6853,12 @@
"recommended, visit http://acx100.sf.net in case "
"of further questions/discussion\n");

-#if defined(CONFIG_ACX_PCI)
+#if defined(CONFIG_ACX_PCI_BOOL)
r1 = acxpci_e_init_module();
#else
r1 = -EINVAL;
#endif
-#if defined(CONFIG_ACX_USB)
+#if defined(CONFIG_ACX_USB_BOOL)
r2 = acxusb_e_init_module();
#else
r2 = -EINVAL;
@@ -6872,10 +6872,10 @@
static void __exit
acx_e_cleanup_module(void)
{
-#if defined(CONFIG_ACX_PCI)
+#if defined(CONFIG_ACX_PCI_BOOL)
acxpci_e_cleanup_module();
#endif
-#if defined(CONFIG_ACX_USB)
+#if defined(CONFIG_ACX_USB_BOOL)
acxusb_e_cleanup_module();
#endif
}