* Early ACPI lockup (was Re: 2.6.20-rc4-mm1)
2007-01-12 6:26 2.6.20-rc4-mm1 Andrew Morton
@ 2007-01-12 10:20 ` Frederik Deweerdt
2007-01-12 22:53 ` Len Brown
2007-01-12 10:25 ` 2.6.20-rc4-mm1 Mariusz Kozlowski
` (17 subsequent siblings)
18 siblings, 1 reply; 93+ messages in thread
From: Frederik Deweerdt @ 2007-01-12 10:20 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel, len.brown
On Thu, Jan 11, 2007 at 10:26:27PM -0800, Andrew Morton wrote:
>
> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.20-rc3/2.6.20-rc4-mm1/
>
Hi,
The git-acpi.patch replaces earlier "if(!handler) return -EINVAL" by
"BUG_ON(!handler)". This locks my machine early at boot with a message
along the lines of (It's hand copied):
Int 6: cr2: 00000000 eip: c0570e05 flags: 00010046 cs: 60
stack: c054ffac c011db2b c04936d0 c054ff68 c054ffc0 c054fff4 c057da2c
Reverting the change as follows, allows booting:
Any ideas to debug this further?
Regards,
Frederik
diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c
index db0c5f6..fba018c 100644
--- a/drivers/acpi/tables.c
+++ b/drivers/acpi/tables.c
@@ -414,7 +414,9 @@ int __init acpi_table_parse(enum acpi_ta
unsigned int index;
unsigned int count = 0;
- BUG_ON(!handler);
+ if (!handler)
+ return -EINVAL;
+ /*BUG_ON(!handler);*/
for (i = 0; i < sdt_count; i++) {
if (sdt_entry[i].id != id)
^ permalink raw reply related [flat|nested] 93+ messages in thread* Re: Early ACPI lockup (was Re: 2.6.20-rc4-mm1)
2007-01-12 10:20 ` Early ACPI lockup (was Re: 2.6.20-rc4-mm1) Frederik Deweerdt
@ 2007-01-12 22:53 ` Len Brown
2007-01-12 23:10 ` Frederik Deweerdt
0 siblings, 1 reply; 93+ messages in thread
From: Len Brown @ 2007-01-12 22:53 UTC (permalink / raw)
To: Frederik Deweerdt; +Cc: Andrew Morton, linux-kernel, rui.zhang
On Friday 12 January 2007 05:20, Frederik Deweerdt wrote:
> On Thu, Jan 11, 2007 at 10:26:27PM -0800, Andrew Morton wrote:
> >
> > ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.20-rc3/2.6.20-rc4-mm1/
> >
> Hi,
>
> The git-acpi.patch replaces earlier "if(!handler) return -EINVAL" by
> "BUG_ON(!handler)". This locks my machine early at boot with a message
> along the lines of (It's hand copied):
> Int 6: cr2: 00000000 eip: c0570e05 flags: 00010046 cs: 60
> stack: c054ffac c011db2b c04936d0 c054ff68 c054ffc0 c054fff4 c057da2c
>
> Reverting the change as follows, allows booting:
> Any ideas to debug this further?
> diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c
> index db0c5f6..fba018c 100644
> --- a/drivers/acpi/tables.c
> +++ b/drivers/acpi/tables.c
> @@ -414,7 +414,9 @@ int __init acpi_table_parse(enum acpi_ta
> unsigned int index;
> unsigned int count = 0;
>
> - BUG_ON(!handler);
> + if (!handler)
> + return -EINVAL;
> + /*BUG_ON(!handler);*/
>
> for (i = 0; i < sdt_count; i++) {
> if (sdt_entry[i].id != id)
What do you see if on failure you also print out the params, like below?
thanks,
-Len
diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c
index 3fce3db..e2d08a5 100644
--- a/drivers/acpi/tables.c
+++ b/drivers/acpi/tables.c
@@ -415,7 +415,12 @@ int __init acpi_table_parse(enum acpi_table_id id, acpi_table_handler handler)
unsigned int index = 0;
unsigned int count = 0;
- BUG_ON(!handler);
+ if (!handler) {
+ printk(KERN_WARNING PREFIX
+ "acpi_table_parse(%d, %p) %s NULL handler!\n",
+ id, handler, acpi_table_signatures[id]);
+ return -EINVAL;
+ }
for (i = 0; i < sdt_count; i++) {
if (sdt_entry[i].id != id)
^ permalink raw reply related [flat|nested] 93+ messages in thread* Re: Early ACPI lockup (was Re: 2.6.20-rc4-mm1)
2007-01-12 22:53 ` Len Brown
@ 2007-01-12 23:10 ` Frederik Deweerdt
2007-01-12 23:36 ` Jiri Slaby
0 siblings, 1 reply; 93+ messages in thread
From: Frederik Deweerdt @ 2007-01-12 23:10 UTC (permalink / raw)
To: Len Brown; +Cc: Andrew Morton, linux-kernel, rui.zhang, michal.k.k.piotrowski
On Fri, Jan 12, 2007 at 05:53:08PM -0500, Len Brown wrote:
> On Friday 12 January 2007 05:20, Frederik Deweerdt wrote:
> > On Thu, Jan 11, 2007 at 10:26:27PM -0800, Andrew Morton wrote:
> > >
> > > ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.20-rc3/2.6.20-rc4-mm1/
> > >
> > Hi,
> >
> > The git-acpi.patch replaces earlier "if(!handler) return -EINVAL" by
> > "BUG_ON(!handler)". This locks my machine early at boot with a message
> > along the lines of (It's hand copied):
> > Int 6: cr2: 00000000 eip: c0570e05 flags: 00010046 cs: 60
> > stack: c054ffac c011db2b c04936d0 c054ff68 c054ffc0 c054fff4 c057da2c
> >
> > Reverting the change as follows, allows booting:
> > Any ideas to debug this further?
>
>
> > diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c
> > index db0c5f6..fba018c 100644
> > --- a/drivers/acpi/tables.c
> > +++ b/drivers/acpi/tables.c
> > @@ -414,7 +414,9 @@ int __init acpi_table_parse(enum acpi_ta
> > unsigned int index;
> > unsigned int count = 0;
> >
> > - BUG_ON(!handler);
> > + if (!handler)
> > + return -EINVAL;
> > + /*BUG_ON(!handler);*/
> >
> > for (i = 0; i < sdt_count; i++) {
> > if (sdt_entry[i].id != id)
>
> What do you see if on failure you also print out the params, like below?
>
I'm sorry, I might not be able to try it until monday. Michal reported
a similar problem though, adding him to CC list.
Regards,
Frederik
> thanks,
> -Len
>
> diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c
> index 3fce3db..e2d08a5 100644
> --- a/drivers/acpi/tables.c
> +++ b/drivers/acpi/tables.c
> @@ -415,7 +415,12 @@ int __init acpi_table_parse(enum acpi_table_id id, acpi_table_handler handler)
> unsigned int index = 0;
> unsigned int count = 0;
>
> - BUG_ON(!handler);
> + if (!handler) {
> + printk(KERN_WARNING PREFIX
> + "acpi_table_parse(%d, %p) %s NULL handler!\n",
> + id, handler, acpi_table_signatures[id]);
> + return -EINVAL;
> + }
>
> for (i = 0; i < sdt_count; i++) {
> if (sdt_entry[i].id != id)
>
>
>
^ permalink raw reply [flat|nested] 93+ messages in thread* Re: Early ACPI lockup (was Re: 2.6.20-rc4-mm1)
2007-01-12 23:10 ` Frederik Deweerdt
@ 2007-01-12 23:36 ` Jiri Slaby
2007-01-13 0:08 ` Michal Piotrowski
2007-01-13 0:43 ` Jiri Slaby
0 siblings, 2 replies; 93+ messages in thread
From: Jiri Slaby @ 2007-01-12 23:36 UTC (permalink / raw)
To: Frederik Deweerdt
Cc: Len Brown, Andrew Morton, linux-kernel, rui.zhang, michal.k.k.piotrowski
Frederik Deweerdt wrote:
> On Fri, Jan 12, 2007 at 05:53:08PM -0500, Len Brown wrote:
>> On Friday 12 January 2007 05:20, Frederik Deweerdt wrote:
>>> On Thu, Jan 11, 2007 at 10:26:27PM -0800, Andrew Morton wrote:
>>>> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.20-rc3/2.6.20-rc4-mm1/
>>>>
>>> Hi,
>>>
>>> The git-acpi.patch replaces earlier "if(!handler) return -EINVAL" by
>>> "BUG_ON(!handler)". This locks my machine early at boot with a message
>>> along the lines of (It's hand copied):
>>> Int 6: cr2: 00000000 eip: c0570e05 flags: 00010046 cs: 60
>>> stack: c054ffac c011db2b c04936d0 c054ff68 c054ffc0 c054fff4 c057da2c
>>>
>>> Reverting the change as follows, allows booting:
>>> Any ideas to debug this further?
>>
>>> diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c
>>> index db0c5f6..fba018c 100644
>>> --- a/drivers/acpi/tables.c
>>> +++ b/drivers/acpi/tables.c
>>> @@ -414,7 +414,9 @@ int __init acpi_table_parse(enum acpi_ta
>>> unsigned int index;
>>> unsigned int count = 0;
>>>
>>> - BUG_ON(!handler);
>>> + if (!handler)
>>> + return -EINVAL;
>>> + /*BUG_ON(!handler);*/
>>>
>>> for (i = 0; i < sdt_count; i++) {
>>> if (sdt_entry[i].id != id)
>> What do you see if on failure you also print out the params, like below?
I get this:
ACPI: RSDP (v000 GBT ) @ 0x000f6e80
ACPI: RSDT (v001 GBT AWRDACPI 0x42302e31 AWRD 0x01010101) @ 0x3fff3000
ACPI: FADT (v001 GBT AWRDACPI 0x42302e31 AWRD 0x01010101) @ 0x3fff3040
ACPI: MADT (v001 GBT AWRDACPI 0x42302e31 AWRD 0x01010101) @ 0x3fff7100
ACPI: DSDT (v001 GBT AWRDACPI 0x00001000 MSFT 0x0100000c) @ 0x00000000
ACPI: PM-Timer IO Port: 0x1008
ACPI: Local APIC address 0xfee00000
ACPI: LAPIC (acpi_id[0x00] lapic_id[0x00] enabled)
Processor #0 15:2 APIC version 20
ACPI: LAPIC (acpi_id[0x01] lapic_id[0x01] enabled)
Processor #1 15:2 APIC version 20
ACPI: LAPIC_NMI (acpi_id[0x00] dfl dfl lint[0x1])
ACPI: LAPIC_NMI (acpi_id[0x01] dfl dfl lint[0x1])
ACPI: IOAPIC (id[0x02] address[0xfec00000] gsi_base[0])
IOAPIC[0]: apic_id 2, version 32, address 0xfec00000, GSI 0-23
ACPI: INT_SRC_OVR (bus 0 bus_irq 0 global_irq 2 dfl dfl)
ACPI: INT_SRC_OVR (bus 0 bus_irq 9 global_irq 9 high level)
ACPI: IRQ0 used by override.
ACPI: IRQ2 used by override.
ACPI: IRQ9 used by override.
Enabling APIC mode: Flat. Using 1 I/O APICs
ACPI: acpi_table_parse(17, 00000000) HPET NULL handler!
Using ACPI (MADT) for SMP configuration information
reagrds,
--
http://www.fi.muni.cz/~xslaby/ Jiri Slaby
faculty of informatics, masaryk university, brno, cz
e-mail: jirislaby gmail com, gpg pubkey fingerprint:
B674 9967 0407 CE62 ACC8 22A0 32CC 55C3 39D4 7A7E
^ permalink raw reply [flat|nested] 93+ messages in thread* Re: Early ACPI lockup (was Re: 2.6.20-rc4-mm1)
2007-01-12 23:36 ` Jiri Slaby
@ 2007-01-13 0:08 ` Michal Piotrowski
2007-01-13 0:45 ` Frederik Deweerdt
2007-01-13 0:43 ` Jiri Slaby
1 sibling, 1 reply; 93+ messages in thread
From: Michal Piotrowski @ 2007-01-13 0:08 UTC (permalink / raw)
To: Jiri Slaby
Cc: Frederik Deweerdt, Len Brown, Andrew Morton, linux-kernel,
rui.zhang, michal.k.k.piotrowski
Jiri Slaby napisał(a):
> Frederik Deweerdt wrote:
>> On Fri, Jan 12, 2007 at 05:53:08PM -0500, Len Brown wrote:
>>> On Friday 12 January 2007 05:20, Frederik Deweerdt wrote:
>>>> On Thu, Jan 11, 2007 at 10:26:27PM -0800, Andrew Morton wrote:
>>>>> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.20-rc3/2.6.20-rc4-mm1/
>>>>>
>>>> Hi,
>>>>
>>>> The git-acpi.patch replaces earlier "if(!handler) return -EINVAL" by
>>>> "BUG_ON(!handler)". This locks my machine early at boot with a message
>>>> along the lines of (It's hand copied):
>>>> Int 6: cr2: 00000000 eip: c0570e05 flags: 00010046 cs: 60
>>>> stack: c054ffac c011db2b c04936d0 c054ff68 c054ffc0 c054fff4 c057da2c
>>>>
>>>> Reverting the change as follows, allows booting:
>>>> Any ideas to debug this further?
>>>> diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c
>>>> index db0c5f6..fba018c 100644
>>>> --- a/drivers/acpi/tables.c
>>>> +++ b/drivers/acpi/tables.c
>>>> @@ -414,7 +414,9 @@ int __init acpi_table_parse(enum acpi_ta
>>>> unsigned int index;
>>>> unsigned int count = 0;
>>>>
>>>> - BUG_ON(!handler);
>>>> + if (!handler)
>>>> + return -EINVAL;
>>>> + /*BUG_ON(!handler);*/
>>>>
>>>> for (i = 0; i < sdt_count; i++) {
>>>> if (sdt_entry[i].id != id)
>>> What do you see if on failure you also print out the params, like below?
>
> I get this:
>
> ACPI: RSDP (v000 GBT ) @ 0x000f6e80
> ACPI: RSDT (v001 GBT AWRDACPI 0x42302e31 AWRD 0x01010101) @ 0x3fff3000
> ACPI: FADT (v001 GBT AWRDACPI 0x42302e31 AWRD 0x01010101) @ 0x3fff3040
> ACPI: MADT (v001 GBT AWRDACPI 0x42302e31 AWRD 0x01010101) @ 0x3fff7100
> ACPI: DSDT (v001 GBT AWRDACPI 0x00001000 MSFT 0x0100000c) @ 0x00000000
> ACPI: PM-Timer IO Port: 0x1008
> ACPI: Local APIC address 0xfee00000
> ACPI: LAPIC (acpi_id[0x00] lapic_id[0x00] enabled)
> Processor #0 15:2 APIC version 20
> ACPI: LAPIC (acpi_id[0x01] lapic_id[0x01] enabled)
> Processor #1 15:2 APIC version 20
> ACPI: LAPIC_NMI (acpi_id[0x00] dfl dfl lint[0x1])
> ACPI: LAPIC_NMI (acpi_id[0x01] dfl dfl lint[0x1])
> ACPI: IOAPIC (id[0x02] address[0xfec00000] gsi_base[0])
> IOAPIC[0]: apic_id 2, version 32, address 0xfec00000, GSI 0-23
> ACPI: INT_SRC_OVR (bus 0 bus_irq 0 global_irq 2 dfl dfl)
> ACPI: INT_SRC_OVR (bus 0 bus_irq 9 global_irq 9 high level)
> ACPI: IRQ0 used by override.
> ACPI: IRQ2 used by override.
> ACPI: IRQ9 used by override.
> Enabling APIC mode: Flat. Using 1 I/O APICs
> ACPI: acpi_table_parse(17, 00000000) HPET NULL handler!
> Using ACPI (MADT) for SMP configuration information
>
ACPI: RSDP (v000 ACPIAM ) @ 0x000f9e30
ACPI: RSDT (v001 A M I OEMRSDT 0x10000414 MSFT 0x00000097) @ 0x7ff30000
ACPI: FADT (v002 A M I OEMFACP 0x10000414 MSFT 0x00000097) @ 0x7ff30200
ACPI: MADT (v001 A M I OEMAPIC 0x10000414 MSFT 0x00000097) @ 0x7ff30390
ACPI: OEMB (v001 A M I OEMBIOS 0x10000414 MSFT 0x00000097) @ 0x7ff40040
ACPI: DSDT (v001 P4P81 P4P81104 0x00000104 INTL 0x02002026) @ 0x00000000
ACPI: PM-Timer IO Port: 0x808
ACPI: Local APIC address 0xfee00000
ACPI: LAPIC (acpi_id[0x01] lapic_id[0x00] enabled)
Processor #0 15:2 APIC version 20
ACPI: LAPIC (acpi_id[0x02] lapic_id[0x01] enabled)
Processor #1 15:2 APIC version 20
ACPI: IOAPIC (id[0x02] address[0xfec00000] gsi_base[0])
IOAPIC[0]: apic_id 2, version 32, address 0xfec00000, GSI 0-23
ACPI: INT_SRC_OVR (bus 0 bus_irq 0 global_irq 2 dfl dfl)
ACPI: INT_SRC_OVR (bus 0 bus_irq 9 global_irq 9 high level)
ACPI: IRQ0 used by override.
ACPI: IRQ2 used by override.
ACPI: IRQ9 used by override.
Enabling APIC mode: Flat. Using 1 I/O APICs
ACPI: acpi_table_parse(17, 00000000) HPET NULL handler!
Using ACPI (MADT) for SMP configuration information
Regards,
Michal
--
Michal K. K. Piotrowski
LTG - Linux Testers Group
(http://www.stardust.webpages.pl/ltg/)
^ permalink raw reply [flat|nested] 93+ messages in thread* Re: Early ACPI lockup (was Re: 2.6.20-rc4-mm1)
2007-01-13 0:08 ` Michal Piotrowski
@ 2007-01-13 0:45 ` Frederik Deweerdt
0 siblings, 0 replies; 93+ messages in thread
From: Frederik Deweerdt @ 2007-01-13 0:45 UTC (permalink / raw)
To: Len Brown
Cc: Jiri Slaby, Andrew Morton, linux-kernel, rui.zhang, Michal Piotrowski
On Sat, Jan 13, 2007 at 01:08:46AM +0100, Michal Piotrowski wrote:
> Jiri Slaby napisał(a):
> > Frederik Deweerdt wrote:
> >> On Fri, Jan 12, 2007 at 05:53:08PM -0500, Len Brown wrote:
> >>> On Friday 12 January 2007 05:20, Frederik Deweerdt wrote:
> >>>> On Thu, Jan 11, 2007 at 10:26:27PM -0800, Andrew Morton wrote:
> >>>>> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.20-rc3/2.6.20-rc4-mm1/
> >>>>>
> >>>> Hi,
> >>>>
> >>>> The git-acpi.patch replaces earlier "if(!handler) return -EINVAL" by
> >>>> "BUG_ON(!handler)". This locks my machine early at boot with a message
> >>>> along the lines of (It's hand copied):
> >>>> Int 6: cr2: 00000000 eip: c0570e05 flags: 00010046 cs: 60
> >>>> stack: c054ffac c011db2b c04936d0 c054ff68 c054ffc0 c054fff4 c057da2c
> >>>>
> >>>> Reverting the change as follows, allows booting:
> >>>> Any ideas to debug this further?
> >>>> diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c
> >>>> index db0c5f6..fba018c 100644
> >>>> --- a/drivers/acpi/tables.c
> >>>> +++ b/drivers/acpi/tables.c
> >>>> @@ -414,7 +414,9 @@ int __init acpi_table_parse(enum acpi_ta
> >>>> unsigned int index;
> >>>> unsigned int count = 0;
> >>>>
> >>>> - BUG_ON(!handler);
> >>>> + if (!handler)
> >>>> + return -EINVAL;
> >>>> + /*BUG_ON(!handler);*/
> >>>>
> >>>> for (i = 0; i < sdt_count; i++) {
> >>>> if (sdt_entry[i].id != id)
> >>> What do you see if on failure you also print out the params, like below?
> >
> > I get this:
> >
> > ACPI: RSDP (v000 GBT ) @ 0x000f6e80
> > ACPI: RSDT (v001 GBT AWRDACPI 0x42302e31 AWRD 0x01010101) @ 0x3fff3000
> > ACPI: FADT (v001 GBT AWRDACPI 0x42302e31 AWRD 0x01010101) @ 0x3fff3040
> > ACPI: MADT (v001 GBT AWRDACPI 0x42302e31 AWRD 0x01010101) @ 0x3fff7100
> > ACPI: DSDT (v001 GBT AWRDACPI 0x00001000 MSFT 0x0100000c) @ 0x00000000
> > ACPI: PM-Timer IO Port: 0x1008
> > ACPI: Local APIC address 0xfee00000
> > ACPI: LAPIC (acpi_id[0x00] lapic_id[0x00] enabled)
> > Processor #0 15:2 APIC version 20
> > ACPI: LAPIC (acpi_id[0x01] lapic_id[0x01] enabled)
> > Processor #1 15:2 APIC version 20
> > ACPI: LAPIC_NMI (acpi_id[0x00] dfl dfl lint[0x1])
> > ACPI: LAPIC_NMI (acpi_id[0x01] dfl dfl lint[0x1])
> > ACPI: IOAPIC (id[0x02] address[0xfec00000] gsi_base[0])
> > IOAPIC[0]: apic_id 2, version 32, address 0xfec00000, GSI 0-23
> > ACPI: INT_SRC_OVR (bus 0 bus_irq 0 global_irq 2 dfl dfl)
> > ACPI: INT_SRC_OVR (bus 0 bus_irq 9 global_irq 9 high level)
> > ACPI: IRQ0 used by override.
> > ACPI: IRQ2 used by override.
> > ACPI: IRQ9 used by override.
> > Enabling APIC mode: Flat. Using 1 I/O APICs
> > ACPI: acpi_table_parse(17, 00000000) HPET NULL handler!
> > Using ACPI (MADT) for SMP configuration information
> >
>
> ACPI: acpi_table_parse(17, 00000000) HPET NULL handler!
So the BUG_ON is triggered by CONFIG_HPET_TIMER not being defined,
causing acpi_parse_hpet to be NULL.
Should the acpi_table_parse() called be ifdef'ed of is the previous
behaviour (returning -EINVAL) just OK?
Regards,
Frederik
^ permalink raw reply [flat|nested] 93+ messages in thread
* Re: Early ACPI lockup (was Re: 2.6.20-rc4-mm1)
2007-01-12 23:36 ` Jiri Slaby
2007-01-13 0:08 ` Michal Piotrowski
@ 2007-01-13 0:43 ` Jiri Slaby
1 sibling, 0 replies; 93+ messages in thread
From: Jiri Slaby @ 2007-01-13 0:43 UTC (permalink / raw)
To: Jiri Slaby
Cc: Frederik Deweerdt, Len Brown, Andrew Morton, linux-kernel,
rui.zhang, michal.k.k.piotrowski
Jiri Slaby wrote:
>> On Fri, Jan 12, 2007 at 05:53:08PM -0500, Len Brown wrote:
>>> What do you see if on failure you also print out the params, like below?
[...]
> ACPI: acpi_table_parse(17, 00000000) HPET NULL handler!
After re-enabling HPET, it disappeared.
regards,
--
http://www.fi.muni.cz/~xslaby/ Jiri Slaby
faculty of informatics, masaryk university, brno, cz
e-mail: jirislaby gmail com, gpg pubkey fingerprint:
B674 9967 0407 CE62 ACC8 22A0 32CC 55C3 39D4 7A7E
^ permalink raw reply [flat|nested] 93+ messages in thread
* Re: 2.6.20-rc4-mm1
2007-01-12 6:26 2.6.20-rc4-mm1 Andrew Morton
2007-01-12 10:20 ` Early ACPI lockup (was Re: 2.6.20-rc4-mm1) Frederik Deweerdt
@ 2007-01-12 10:25 ` Mariusz Kozlowski
2007-01-12 13:18 ` 2.6.20-rc4-mm1 Frederik Deweerdt
2007-01-12 10:52 ` 'struct task_struct' has no member named 'mems_allowed' (was: Re: 2.6.20-rc4-mm1) Sander
` (16 subsequent siblings)
18 siblings, 1 reply; 93+ messages in thread
From: Mariusz Kozlowski @ 2007-01-12 10:25 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel
[-- Attachment #1: Type: text/plain, Size: 1751 bytes --]
Hello,
Doesn't build on my laptop.
drivers/mmc/mmc.c: In function 'mmc_lock_unlock':
drivers/mmc/mmc.c:1527: error: dereferencing pointer to incomplete type
drivers/mmc/mmc.c:1527: warning: type defaults to 'int' in declaration of '_________p1'
drivers/mmc/mmc.c:1527: error: dereferencing pointer to incomplete type
drivers/mmc/mmc.c:1527: warning: assignment makes pointer from integer without a cast
make[2]: *** [drivers/mmc/mmc.o] Error 1
make[1]: *** [drivers/mmc] Error 2
make: *** [drivers] Error 2
processor : 0
vendor_id : GenuineIntel
cpu family : 15
model : 2
model name : Intel(R) Pentium(R) 4 CPU 2.40GHz
stepping : 9
cpu MHz : 2392.320
cache size : 512 KB
fdiv_bug : no
hlt_bug : no
f00f_bug : no
coma_bug : no
fpu : yes
fpu_exception : yes
cpuid level : 2
wp : yes
flags : fpu vme de pse tsc msr pae mce cx8 sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe cid xtpr
bogomips : 4787.56
clflush size : 64
Gnu C 4.1.1
Gnu make 3.81
binutils 2.17
util-linux 2.12r
mount 2.12r
module-init-tools 3.2.2
e2fsprogs 1.39
pcmciautils 014
pcmcia-cs 3.2.9
nfs-utils 1.0.6
Linux C Library > libc.2.4
Dynamic linker (ldd) 2.4
Procps 3.2.6
Net-tools 1.60
Kbd 1.12
Sh-utils 6.4
udev 103
wireless-tools 29
Modules Loaded orinoco_cs orinoco hermes pcmcia firmware_class 8139too yenta_socket rsrc_nonstatic pcmcia_core
--
Regards,
Mariusz Kozlowski
[-- Attachment #2: .config --]
[-- Type: text/plain, Size: 39433 bytes --]
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.20-rc4-mm1
# Fri Jan 12 11:07:58 2007
#
CONFIG_X86_32=y
CONFIG_GENERIC_TIME=y
CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
CONFIG_LOCKDEP_SUPPORT=y
CONFIG_STACKTRACE_SUPPORT=y
CONFIG_SEMAPHORE_SLEEPERS=y
CONFIG_X86=y
CONFIG_MMU=y
CONFIG_ZONE_DMA=y
CONFIG_GENERIC_ISA_DMA=y
CONFIG_GENERIC_IOMAP=y
CONFIG_GENERIC_BUG=y
CONFIG_GENERIC_HWEIGHT=y
CONFIG_ARCH_MAY_HAVE_PC_FDC=y
CONFIG_DMI=y
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
#
# Code maturity level options
#
CONFIG_EXPERIMENTAL=y
CONFIG_BROKEN_ON_SMP=y
CONFIG_LOCK_KERNEL=y
CONFIG_INIT_ENV_ARG_LIMIT=32
#
# General setup
#
CONFIG_LOCALVERSION=""
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_SWAP=y
CONFIG_SWAP_PREFETCH=y
CONFIG_SYSVIPC=y
# CONFIG_IPC_NS is not set
CONFIG_POSIX_MQUEUE=y
CONFIG_BSD_PROCESS_ACCT=y
# CONFIG_BSD_PROCESS_ACCT_V3 is not set
# CONFIG_TASKSTATS is not set
# CONFIG_UTS_NS is not set
CONFIG_USER_NS=y
CONFIG_AUDIT=y
CONFIG_AUDITSYSCALL=y
CONFIG_IKCONFIG=y
CONFIG_IKCONFIG_PROC=y
CONFIG_SYSFS_DEPRECATED=y
# CONFIG_RELAY is not set
CONFIG_INITRAMFS_SOURCE=""
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
CONFIG_SYSCTL=y
# CONFIG_EMBEDDED is not set
CONFIG_UID16=y
CONFIG_SYSCTL_SYSCALL=y
CONFIG_KALLSYMS=y
CONFIG_KALLSYMS_ALL=y
# CONFIG_KALLSYMS_EXTRA_PASS is not set
CONFIG_HOTPLUG=y
CONFIG_PRINTK=y
CONFIG_BUG=y
CONFIG_ELF_CORE=y
CONFIG_BASE_FULL=y
CONFIG_FUTEX=y
CONFIG_EPOLL=y
CONFIG_SHMEM=y
CONFIG_SLAB=y
CONFIG_VM_EVENT_COUNTERS=y
CONFIG_RT_MUTEXES=y
# CONFIG_TINY_SHMEM is not set
CONFIG_BASE_SMALL=0
# CONFIG_SLOB is not set
#
# Loadable module support
#
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
# CONFIG_MODULE_FORCE_UNLOAD is not set
# CONFIG_MODVERSIONS is not set
# CONFIG_MODULE_SRCVERSION_ALL is not set
CONFIG_KMOD=y
#
# Block layer
#
CONFIG_BLOCK=y
# CONFIG_LBD is not set
# CONFIG_BLK_DEV_IO_TRACE is not set
# CONFIG_LSF is not set
#
# IO Schedulers
#
CONFIG_IOSCHED_NOOP=y
CONFIG_IOSCHED_AS=y
CONFIG_IOSCHED_DEADLINE=y
CONFIG_IOSCHED_CFQ=y
# CONFIG_DEFAULT_AS is not set
# CONFIG_DEFAULT_DEADLINE is not set
CONFIG_DEFAULT_CFQ=y
# CONFIG_DEFAULT_NOOP is not set
CONFIG_DEFAULT_IOSCHED="cfq"
#
# Processor type and features
#
# CONFIG_HIGH_RES_TIMERS is not set
# CONFIG_SMP is not set
CONFIG_X86_PC=y
# CONFIG_X86_ELAN is not set
# CONFIG_X86_VOYAGER is not set
# CONFIG_X86_NUMAQ is not set
# CONFIG_X86_SUMMIT is not set
# CONFIG_X86_BIGSMP is not set
# CONFIG_X86_VISWS is not set
# CONFIG_X86_GENERICARCH is not set
# CONFIG_X86_ES7000 is not set
# CONFIG_PARAVIRT is not set
# CONFIG_M386 is not set
# CONFIG_M486 is not set
# CONFIG_M586 is not set
# CONFIG_M586TSC is not set
# CONFIG_M586MMX is not set
# CONFIG_M686 is not set
# CONFIG_MPENTIUMII is not set
# CONFIG_MPENTIUMIII is not set
# CONFIG_MPENTIUMM is not set
# CONFIG_MCORE2 is not set
CONFIG_MPENTIUM4=y
# CONFIG_MK6 is not set
# CONFIG_MK7 is not set
# CONFIG_MK8 is not set
# CONFIG_MCRUSOE is not set
# CONFIG_MEFFICEON is not set
# CONFIG_MWINCHIPC6 is not set
# CONFIG_MWINCHIP2 is not set
# CONFIG_MWINCHIP3D is not set
# CONFIG_MGEODEGX1 is not set
# CONFIG_MGEODE_LX is not set
# CONFIG_MCYRIXIII is not set
# CONFIG_MVIAC3_2 is not set
# CONFIG_X86_GENERIC is not set
CONFIG_X86_CMPXCHG=y
CONFIG_X86_XADD=y
CONFIG_X86_L1_CACHE_SHIFT=7
CONFIG_RWSEM_XCHGADD_ALGORITHM=y
# CONFIG_ARCH_HAS_ILOG2_U32 is not set
# CONFIG_ARCH_HAS_ILOG2_U64 is not set
CONFIG_GENERIC_CALIBRATE_DELAY=y
CONFIG_X86_WP_WORKS_OK=y
CONFIG_X86_INVLPG=y
CONFIG_X86_BSWAP=y
CONFIG_X86_POPAD_OK=y
CONFIG_X86_CMPXCHG64=y
CONFIG_X86_GOOD_APIC=y
CONFIG_X86_INTEL_USERCOPY=y
CONFIG_X86_USE_PPRO_CHECKSUM=y
CONFIG_X86_TSC=y
# CONFIG_HPET_TIMER is not set
# CONFIG_PREEMPT_NONE is not set
# CONFIG_PREEMPT_VOLUNTARY is not set
CONFIG_PREEMPT=y
CONFIG_PREEMPT_BKL=y
# CONFIG_X86_UP_APIC is not set
CONFIG_X86_MCE=y
CONFIG_X86_MCE_NONFATAL=y
CONFIG_VM86=y
# CONFIG_TOSHIBA is not set
# CONFIG_I8K is not set
# CONFIG_X86_REBOOTFIXUPS is not set
# CONFIG_MICROCODE is not set
# CONFIG_X86_MSR is not set
# CONFIG_X86_CPUID is not set
#
# Firmware Drivers
#
# CONFIG_EDD is not set
# CONFIG_DELL_RBU is not set
# CONFIG_DCDBAS is not set
CONFIG_NOHIGHMEM=y
# CONFIG_HIGHMEM4G is not set
# CONFIG_HIGHMEM64G is not set
CONFIG_PAGE_OFFSET=0xC0000000
CONFIG_ARCH_FLATMEM_ENABLE=y
CONFIG_ARCH_SPARSEMEM_ENABLE=y
CONFIG_ARCH_SELECT_MEMORY_MODEL=y
CONFIG_ARCH_POPULATES_NODE_MAP=y
CONFIG_SELECT_MEMORY_MODEL=y
CONFIG_FLATMEM_MANUAL=y
# CONFIG_DISCONTIGMEM_MANUAL is not set
# CONFIG_SPARSEMEM_MANUAL is not set
CONFIG_FLATMEM=y
CONFIG_FLAT_NODE_MEM_MAP=y
CONFIG_SPARSEMEM_STATIC=y
CONFIG_SPLIT_PTLOCK_CPUS=4
# CONFIG_RESOURCES_64BIT is not set
CONFIG_ZONE_DMA_FLAG=1
CONFIG_ADAPTIVE_READAHEAD=y
# CONFIG_DEBUG_READAHEAD is not set
# CONFIG_MATH_EMULATION is not set
CONFIG_MTRR=y
# CONFIG_EFI is not set
CONFIG_SECCOMP=y
# CONFIG_HZ_100 is not set
# CONFIG_HZ_250 is not set
# CONFIG_HZ_300 is not set
CONFIG_HZ_1000=y
CONFIG_HZ=1000
# CONFIG_KEXEC is not set
CONFIG_PHYSICAL_START=0x100000
# CONFIG_RELOCATABLE is not set
CONFIG_PHYSICAL_ALIGN=0x100000
CONFIG_COMPAT_VDSO=y
#
# Power management options (ACPI, APM)
#
CONFIG_PM=y
CONFIG_PM_LEGACY=y
# CONFIG_PM_DEBUG is not set
# CONFIG_PM_SYSFS_DEPRECATED is not set
CONFIG_SOFTWARE_SUSPEND=y
CONFIG_PM_STD_PARTITION="/dev/hda2"
#
# ACPI (Advanced Configuration and Power Interface) Support
#
CONFIG_ACPI=y
CONFIG_ACPI_SLEEP=y
CONFIG_ACPI_SLEEP_PROC_FS=y
# CONFIG_ACPI_SLEEP_PROC_SLEEP is not set
CONFIG_ACPI_AC=y
CONFIG_ACPI_BATTERY=y
CONFIG_ACPI_BUTTON=y
CONFIG_ACPI_VIDEO=m
CONFIG_ACPI_FAN=y
# CONFIG_ACPI_DOCK is not set
CONFIG_ACPI_PROCESSOR=y
CONFIG_ACPI_THERMAL=y
# CONFIG_ACPI_ASUS is not set
# CONFIG_ACPI_IBM is not set
# CONFIG_ACPI_TOSHIBA is not set
CONFIG_ACPI_SONY=m
CONFIG_ACPI_BLACKLIST_YEAR=0
# CONFIG_ACPI_DEBUG is not set
CONFIG_ACPI_EC=y
CONFIG_ACPI_POWER=y
CONFIG_ACPI_SYSTEM=y
CONFIG_X86_PM_TIMER=y
# CONFIG_ACPI_CONTAINER is not set
#
# APM (Advanced Power Management) BIOS Support
#
# CONFIG_APM is not set
#
# CPU Frequency scaling
#
# CONFIG_CPU_FREQ is not set
#
# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
#
CONFIG_PCI=y
# CONFIG_PCI_GOBIOS is not set
# CONFIG_PCI_GOMMCONFIG is not set
# CONFIG_PCI_GODIRECT is not set
CONFIG_PCI_GOANY=y
CONFIG_PCI_BIOS=y
CONFIG_PCI_DIRECT=y
CONFIG_PCI_MMCONFIG=y
# CONFIG_PCIEPORTBUS is not set
# CONFIG_PCI_DEBUG is not set
CONFIG_ISA_DMA_API=y
CONFIG_ISA=y
# CONFIG_EISA is not set
# CONFIG_MCA is not set
# CONFIG_SCx200 is not set
#
# PCCARD (PCMCIA/CardBus) support
#
CONFIG_PCCARD=m
# CONFIG_PCMCIA_DEBUG is not set
CONFIG_PCMCIA=m
CONFIG_PCMCIA_LOAD_CIS=y
CONFIG_PCMCIA_IOCTL=y
CONFIG_CARDBUS=y
#
# PC-card bridges
#
CONFIG_YENTA=m
CONFIG_YENTA_O2=y
CONFIG_YENTA_RICOH=y
CONFIG_YENTA_TI=y
CONFIG_YENTA_ENE_TUNE=y
CONFIG_YENTA_TOSHIBA=y
CONFIG_PD6729=m
CONFIG_I82092=m
CONFIG_I82365=m
CONFIG_TCIC=m
CONFIG_PCMCIA_PROBE=y
CONFIG_PCCARD_NONSTATIC=m
#
# PCI Hotplug Support
#
# CONFIG_HOTPLUG_PCI is not set
#
# Executable file formats
#
CONFIG_BINFMT_ELF=y
CONFIG_BINFMT_AOUT=y
CONFIG_BINFMT_MISC=y
#
# Networking
#
CONFIG_NET=y
#
# Networking options
#
# CONFIG_NETDEBUG is not set
CONFIG_PACKET=y
# CONFIG_PACKET_MMAP is not set
CONFIG_UNIX=y
CONFIG_XFRM=y
# CONFIG_XFRM_USER is not set
# CONFIG_XFRM_SUB_POLICY is not set
# CONFIG_NET_KEY is not set
CONFIG_INET=y
CONFIG_IP_MULTICAST=y
# CONFIG_IP_ADVANCED_ROUTER is not set
CONFIG_IP_FIB_HASH=y
# CONFIG_IP_PNP is not set
# CONFIG_NET_IPIP is not set
# CONFIG_NET_IPGRE is not set
# CONFIG_IP_MROUTE is not set
# CONFIG_ARPD is not set
# CONFIG_SYN_COOKIES is not set
# CONFIG_INET_AH is not set
# CONFIG_INET_ESP is not set
# CONFIG_INET_IPCOMP is not set
# CONFIG_INET_XFRM_TUNNEL is not set
# CONFIG_INET_TUNNEL is not set
CONFIG_INET_XFRM_MODE_TRANSPORT=y
CONFIG_INET_XFRM_MODE_TUNNEL=y
CONFIG_INET_XFRM_MODE_BEET=y
CONFIG_INET_DIAG=y
CONFIG_INET_TCP_DIAG=y
# CONFIG_TCP_CONG_ADVANCED is not set
CONFIG_TCP_CONG_CUBIC=y
CONFIG_DEFAULT_TCP_CONG="cubic"
# CONFIG_TCP_MD5SIG is not set
#
# IP: Virtual Server Configuration
#
# CONFIG_IP_VS is not set
# CONFIG_IPV6 is not set
# CONFIG_INET6_XFRM_TUNNEL is not set
# CONFIG_INET6_TUNNEL is not set
# CONFIG_NETWORK_SECMARK is not set
CONFIG_NETFILTER=y
# CONFIG_NETFILTER_DEBUG is not set
#
# Core Netfilter Configuration
#
# CONFIG_NETFILTER_NETLINK is not set
# CONFIG_NF_CONNTRACK_ENABLED is not set
# CONFIG_NETFILTER_XTABLES is not set
#
# IP: Netfilter Configuration
#
# CONFIG_IP_NF_QUEUE is not set
#
# DCCP Configuration (EXPERIMENTAL)
#
# CONFIG_IP_DCCP is not set
#
# SCTP Configuration (EXPERIMENTAL)
#
# CONFIG_IP_SCTP is not set
#
# TIPC Configuration (EXPERIMENTAL)
#
# CONFIG_TIPC is not set
# CONFIG_ATM is not set
# CONFIG_BRIDGE is not set
# CONFIG_VLAN_8021Q is not set
# CONFIG_DECNET is not set
# CONFIG_LLC2 is not set
# CONFIG_IPX is not set
# CONFIG_ATALK is not set
# CONFIG_X25 is not set
# CONFIG_LAPB is not set
# CONFIG_ECONET is not set
# CONFIG_WAN_ROUTER is not set
#
# QoS and/or fair queueing
#
# CONFIG_NET_SCHED is not set
#
# Network testing
#
# CONFIG_NET_PKTGEN is not set
# CONFIG_HAMRADIO is not set
# CONFIG_IRDA is not set
# CONFIG_BT is not set
# CONFIG_IEEE80211 is not set
CONFIG_WIRELESS_EXT=y
#
# Device Drivers
#
#
# Generic Driver Options
#
CONFIG_STANDALONE=y
CONFIG_PREVENT_FIRMWARE_BUILD=y
CONFIG_FW_LOADER=m
# CONFIG_DEBUG_DRIVER is not set
# CONFIG_SYS_HYPERVISOR is not set
#
# Connector - unified userspace <-> kernelspace linker
#
# CONFIG_CONNECTOR is not set
#
# Memory Technology Devices (MTD)
#
# CONFIG_MTD is not set
#
# Parallel port support
#
CONFIG_PARPORT=y
CONFIG_PARPORT_PC=y
# CONFIG_PARPORT_PC_FIFO is not set
# CONFIG_PARPORT_PC_SUPERIO is not set
# CONFIG_PARPORT_PC_PCMCIA is not set
# CONFIG_PARPORT_GSC is not set
# CONFIG_PARPORT_AX88796 is not set
# CONFIG_PARPORT_1284 is not set
#
# Plug and Play support
#
CONFIG_PNP=y
# CONFIG_PNP_DEBUG is not set
#
# Protocols
#
# CONFIG_ISAPNP is not set
# CONFIG_PNPBIOS is not set
CONFIG_PNPACPI=y
#
# Block devices
#
CONFIG_BLK_DEV_FD=y
# CONFIG_BLK_DEV_XD is not set
# CONFIG_PARIDE is not set
# CONFIG_BLK_CPQ_DA is not set
# CONFIG_BLK_CPQ_CISS_DA is not set
# CONFIG_BLK_DEV_DAC960 is not set
# CONFIG_BLK_DEV_UMEM is not set
# CONFIG_BLK_DEV_COW_COMMON is not set
# CONFIG_BLK_DEV_LOOP is not set
# CONFIG_BLK_DEV_NBD is not set
# CONFIG_BLK_DEV_SX8 is not set
# CONFIG_BLK_DEV_UB is not set
# CONFIG_BLK_DEV_RAM is not set
CONFIG_BLK_DEV_INITRD=y
# CONFIG_CDROM_PKTCDVD is not set
# CONFIG_ATA_OVER_ETH is not set
#
# Misc devices
#
# CONFIG_IBM_ASM is not set
# CONFIG_SGI_IOC4 is not set
# CONFIG_TIFM_CORE is not set
# CONFIG_MSI_LAPTOP is not set
#
# ATA/ATAPI/MFM/RLL support
#
CONFIG_IDE=y
CONFIG_BLK_DEV_IDE=y
#
# Please see Documentation/ide.txt for help/info on IDE drives
#
# CONFIG_BLK_DEV_IDE_SATA is not set
# CONFIG_BLK_DEV_HD_IDE is not set
CONFIG_BLK_DEV_IDEDISK=y
CONFIG_IDEDISK_MULTI_MODE=y
# CONFIG_BLK_DEV_IDECS is not set
CONFIG_BLK_DEV_IDECD=y
# CONFIG_BLK_DEV_IDETAPE is not set
# CONFIG_BLK_DEV_IDEFLOPPY is not set
CONFIG_BLK_DEV_IDESCSI=m
# CONFIG_IDE_TASK_IOCTL is not set
#
# IDE chipset support/bugfixes
#
# CONFIG_IDE_GENERIC is not set
# CONFIG_BLK_DEV_CMD640 is not set
# CONFIG_BLK_DEV_IDEPNP is not set
CONFIG_BLK_DEV_IDEPCI=y
CONFIG_IDEPCI_SHARE_IRQ=y
# CONFIG_BLK_DEV_OFFBOARD is not set
# CONFIG_BLK_DEV_GENERIC is not set
# CONFIG_BLK_DEV_OPTI621 is not set
# CONFIG_BLK_DEV_RZ1000 is not set
CONFIG_BLK_DEV_IDEDMA_PCI=y
# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
CONFIG_IDEDMA_PCI_AUTO=y
# CONFIG_IDEDMA_ONLYDISK is not set
# CONFIG_BLK_DEV_AEC62XX is not set
CONFIG_BLK_DEV_ALI15X3=y
# CONFIG_WDC_ALI15X3 is not set
# CONFIG_BLK_DEV_AMD74XX is not set
# CONFIG_BLK_DEV_ATIIXP is not set
# CONFIG_BLK_DEV_CMD64X is not set
# CONFIG_BLK_DEV_TRIFLEX is not set
# CONFIG_BLK_DEV_CY82C693 is not set
# CONFIG_BLK_DEV_CS5520 is not set
# CONFIG_BLK_DEV_CS5530 is not set
# CONFIG_BLK_DEV_CS5535 is not set
# CONFIG_BLK_DEV_HPT34X is not set
# CONFIG_BLK_DEV_HPT366 is not set
# CONFIG_BLK_DEV_JMICRON is not set
# CONFIG_BLK_DEV_SC1200 is not set
# CONFIG_BLK_DEV_PIIX is not set
# CONFIG_BLK_DEV_IT821X is not set
# CONFIG_BLK_DEV_NS87415 is not set
# CONFIG_BLK_DEV_PDC202XX_OLD is not set
# CONFIG_BLK_DEV_PDC202XX_NEW is not set
# CONFIG_BLK_DEV_SVWKS is not set
# CONFIG_BLK_DEV_SIIMAGE is not set
# CONFIG_BLK_DEV_SIS5513 is not set
# CONFIG_BLK_DEV_SLC90E66 is not set
# CONFIG_BLK_DEV_TRM290 is not set
# CONFIG_BLK_DEV_VIA82CXXX is not set
# CONFIG_BLK_DEV_TC86C001 is not set
# CONFIG_IDE_ARM is not set
# CONFIG_IDE_CHIPSETS is not set
CONFIG_BLK_DEV_IDEDMA=y
# CONFIG_IDEDMA_IVB is not set
CONFIG_IDEDMA_AUTO=y
# CONFIG_BLK_DEV_HD is not set
#
# SCSI device support
#
# CONFIG_RAID_ATTRS is not set
CONFIG_SCSI=y
# CONFIG_SCSI_TGT is not set
# CONFIG_SCSI_NETLINK is not set
CONFIG_SCSI_PROC_FS=y
#
# SCSI support type (disk, tape, CD-ROM)
#
CONFIG_BLK_DEV_SD=y
# CONFIG_CHR_DEV_ST is not set
# CONFIG_CHR_DEV_OSST is not set
# CONFIG_BLK_DEV_SR is not set
CONFIG_CHR_DEV_SG=y
# CONFIG_CHR_DEV_SCH is not set
#
# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
#
# CONFIG_SCSI_MULTI_LUN is not set
# CONFIG_SCSI_CONSTANTS is not set
# CONFIG_SCSI_LOGGING is not set
# CONFIG_SCSI_SCAN_ASYNC is not set
#
# SCSI Transports
#
# CONFIG_SCSI_SPI_ATTRS is not set
# CONFIG_SCSI_FC_ATTRS is not set
# CONFIG_SCSI_ISCSI_ATTRS is not set
# CONFIG_SCSI_SAS_ATTRS is not set
#
# SCSI low-level drivers
#
# CONFIG_ISCSI_TCP is not set
# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
# CONFIG_SCSI_3W_9XXX is not set
# CONFIG_SCSI_7000FASST is not set
# CONFIG_SCSI_ACARD is not set
# CONFIG_SCSI_AHA152X is not set
# CONFIG_SCSI_AHA1542 is not set
# CONFIG_SCSI_AACRAID is not set
# CONFIG_SCSI_AIC7XXX is not set
# CONFIG_SCSI_AIC7XXX_OLD is not set
# CONFIG_SCSI_AIC79XX is not set
# CONFIG_SCSI_AIC94XX is not set
# CONFIG_SCSI_DPT_I2O is not set
# CONFIG_SCSI_ADVANSYS is not set
# CONFIG_SCSI_IN2000 is not set
# CONFIG_SCSI_ARCMSR is not set
# CONFIG_MEGARAID_NEWGEN is not set
# CONFIG_MEGARAID_LEGACY is not set
# CONFIG_MEGARAID_SAS is not set
# CONFIG_SCSI_HPTIOP is not set
# CONFIG_SCSI_BUSLOGIC is not set
# CONFIG_SCSI_DMX3191D is not set
# CONFIG_SCSI_DTC3280 is not set
# CONFIG_SCSI_EATA is not set
# CONFIG_SCSI_FUTURE_DOMAIN is not set
# CONFIG_SCSI_GDTH is not set
# CONFIG_SCSI_GENERIC_NCR5380 is not set
# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
# CONFIG_SCSI_IPS is not set
# CONFIG_SCSI_INITIO is not set
# CONFIG_SCSI_INIA100 is not set
# CONFIG_SCSI_PPA is not set
# CONFIG_SCSI_IMM is not set
# CONFIG_SCSI_NCR53C406A is not set
# CONFIG_SCSI_STEX is not set
# CONFIG_SCSI_SYM53C8XX_2 is not set
# CONFIG_SCSI_PAS16 is not set
# CONFIG_SCSI_PSI240I is not set
# CONFIG_SCSI_QLOGIC_FAS is not set
# CONFIG_SCSI_QLOGIC_1280 is not set
# CONFIG_SCSI_QLA_FC is not set
# CONFIG_SCSI_QLA_ISCSI is not set
# CONFIG_SCSI_LPFC is not set
# CONFIG_SCSI_SEAGATE is not set
# CONFIG_SCSI_SYM53C416 is not set
# CONFIG_SCSI_DC395x is not set
# CONFIG_SCSI_DC390T is not set
# CONFIG_SCSI_T128 is not set
# CONFIG_SCSI_U14_34F is not set
# CONFIG_SCSI_ULTRASTOR is not set
# CONFIG_SCSI_NSP32 is not set
# CONFIG_SCSI_DEBUG is not set
# CONFIG_SCSI_SRP is not set
#
# PCMCIA SCSI adapter support
#
# CONFIG_PCMCIA_AHA152X is not set
# CONFIG_PCMCIA_FDOMAIN is not set
# CONFIG_PCMCIA_NINJA_SCSI is not set
# CONFIG_PCMCIA_QLOGIC is not set
# CONFIG_PCMCIA_SYM53C500 is not set
#
# Serial ATA (prod) and Parallel ATA (experimental) drivers
#
# CONFIG_ATA is not set
#
# Old CD-ROM drivers (not SCSI, not IDE)
#
# CONFIG_CD_NO_IDESCSI is not set
#
# Multi-device support (RAID and LVM)
#
# CONFIG_MD is not set
#
# Fusion MPT device support
#
# CONFIG_FUSION is not set
# CONFIG_FUSION_SPI is not set
# CONFIG_FUSION_FC is not set
# CONFIG_FUSION_SAS is not set
#
# IEEE 1394 (FireWire) support (JUJU alternative stack)
#
# CONFIG_FW is not set
#
# IEEE 1394 (FireWire) support
#
CONFIG_IEEE1394=y
#
# Subsystem Options
#
# CONFIG_IEEE1394_VERBOSEDEBUG is not set
# CONFIG_IEEE1394_EXTRA_CONFIG_ROMS is not set
#
# Device Drivers
#
#
# Texas Instruments PCILynx requires I2C
#
CONFIG_IEEE1394_OHCI1394=y
#
# Protocol Drivers
#
# CONFIG_IEEE1394_VIDEO1394 is not set
# CONFIG_IEEE1394_SBP2 is not set
# CONFIG_IEEE1394_ETH1394 is not set
# CONFIG_IEEE1394_DV1394 is not set
CONFIG_IEEE1394_RAWIO=y
#
# I2O device support
#
# CONFIG_I2O is not set
#
# Network device support
#
CONFIG_NETDEVICES=y
CONFIG_DUMMY=m
# CONFIG_BONDING is not set
# CONFIG_EQUALIZER is not set
# CONFIG_TUN is not set
# CONFIG_NET_SB1000 is not set
#
# ARCnet devices
#
# CONFIG_ARCNET is not set
#
# PHY device support
#
# CONFIG_PHYLIB is not set
#
# Ethernet (10 or 100Mbit)
#
CONFIG_NET_ETHERNET=y
CONFIG_MII=y
# CONFIG_HAPPYMEAL is not set
# CONFIG_SUNGEM is not set
# CONFIG_CASSINI is not set
# CONFIG_NET_VENDOR_3COM is not set
# CONFIG_LANCE is not set
# CONFIG_NET_VENDOR_SMC is not set
# CONFIG_NET_VENDOR_RACAL is not set
#
# Tulip family network device support
#
# CONFIG_NET_TULIP is not set
# CONFIG_AT1700 is not set
# CONFIG_DEPCA is not set
# CONFIG_HP100 is not set
# CONFIG_NET_ISA is not set
CONFIG_NET_PCI=y
# CONFIG_PCNET32 is not set
# CONFIG_AMD8111_ETH is not set
# CONFIG_ADAPTEC_STARFIRE is not set
# CONFIG_AC3200 is not set
# CONFIG_APRICOT is not set
# CONFIG_B44 is not set
# CONFIG_FORCEDETH is not set
# CONFIG_CS89x0 is not set
# CONFIG_DGRS is not set
# CONFIG_EEPRO100 is not set
# CONFIG_E100 is not set
# CONFIG_FEALNX is not set
# CONFIG_NATSEMI is not set
# CONFIG_NE2K_PCI is not set
# CONFIG_8139CP is not set
CONFIG_8139TOO=m
CONFIG_8139TOO_PIO=y
# CONFIG_8139TOO_TUNE_TWISTER is not set
# CONFIG_8139TOO_8129 is not set
# CONFIG_8139_OLD_RX_RESET is not set
# CONFIG_SIS900 is not set
# CONFIG_EPIC100 is not set
# CONFIG_SUNDANCE is not set
# CONFIG_TLAN is not set
# CONFIG_VIA_RHINE is not set
# CONFIG_SC92031 is not set
# CONFIG_NET_POCKET is not set
#
# Ethernet (1000 Mbit)
#
# CONFIG_ACENIC is not set
# CONFIG_DL2K is not set
# CONFIG_E1000 is not set
# CONFIG_NS83820 is not set
# CONFIG_HAMACHI is not set
# CONFIG_YELLOWFIN is not set
# CONFIG_R8169 is not set
# CONFIG_SIS190 is not set
# CONFIG_SKGE is not set
# CONFIG_SKY2 is not set
# CONFIG_SK98LIN is not set
# CONFIG_VIA_VELOCITY is not set
# CONFIG_TIGON3 is not set
# CONFIG_BNX2 is not set
# CONFIG_QLA3XXX is not set
#
# Ethernet (10000 Mbit)
#
# CONFIG_CHELSIO_T1 is not set
# CONFIG_CHELSIO_T3 is not set
# CONFIG_IXGB is not set
# CONFIG_S2IO is not set
# CONFIG_MYRI10GE is not set
# CONFIG_NETXEN_NIC is not set
#
# Token Ring devices
#
# CONFIG_TR is not set
#
# Wireless LAN (non-hamradio)
#
CONFIG_NET_RADIO=y
# CONFIG_NET_WIRELESS_RTNETLINK is not set
#
# Obsolete Wireless cards support (pre-802.11)
#
# CONFIG_STRIP is not set
# CONFIG_ARLAN is not set
# CONFIG_WAVELAN is not set
# CONFIG_PCMCIA_WAVELAN is not set
# CONFIG_PCMCIA_NETWAVE is not set
#
# Wireless 802.11 Frequency Hopping cards support
#
# CONFIG_PCMCIA_RAYCS is not set
#
# Wireless 802.11b ISA/PCI cards support
#
# CONFIG_IPW2100 is not set
# CONFIG_IPW2200 is not set
# CONFIG_AIRO is not set
CONFIG_HERMES=m
# CONFIG_PLX_HERMES is not set
# CONFIG_TMD_HERMES is not set
# CONFIG_NORTEL_HERMES is not set
# CONFIG_PCI_HERMES is not set
# CONFIG_ATMEL is not set
#
# Wireless 802.11b Pcmcia/Cardbus cards support
#
CONFIG_PCMCIA_HERMES=m
# CONFIG_PCMCIA_SPECTRUM is not set
# CONFIG_AIRO_CS is not set
# CONFIG_PCMCIA_WL3501 is not set
#
# Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support
#
# CONFIG_PRISM54 is not set
# CONFIG_USB_ZD1201 is not set
# CONFIG_HOSTAP is not set
CONFIG_NET_WIRELESS=y
#
# PCMCIA network device support
#
# CONFIG_NET_PCMCIA is not set
#
# Wan interfaces
#
# CONFIG_WAN is not set
# CONFIG_FDDI is not set
# CONFIG_HIPPI is not set
# CONFIG_PLIP is not set
# CONFIG_PPP is not set
# CONFIG_SLIP is not set
# CONFIG_NET_FC is not set
# CONFIG_SHAPER is not set
# CONFIG_NETCONSOLE is not set
# CONFIG_NETPOLL is not set
# CONFIG_NET_POLL_CONTROLLER is not set
#
# ISDN subsystem
#
# CONFIG_ISDN is not set
#
# Telephony Support
#
# CONFIG_PHONE is not set
#
# Input device support
#
CONFIG_INPUT=y
# CONFIG_INPUT_FF_MEMLESS is not set
#
# Userland interfaces
#
CONFIG_INPUT_MOUSEDEV=y
CONFIG_INPUT_MOUSEDEV_PSAUX=y
CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
# CONFIG_INPUT_JOYDEV is not set
# CONFIG_INPUT_TSDEV is not set
# CONFIG_INPUT_EVDEV is not set
# CONFIG_INPUT_EVBUG is not set
#
# Input Device Drivers
#
CONFIG_INPUT_KEYBOARD=y
CONFIG_KEYBOARD_ATKBD=y
# CONFIG_KEYBOARD_SUNKBD is not set
# CONFIG_KEYBOARD_LKKBD is not set
# CONFIG_KEYBOARD_XTKBD is not set
# CONFIG_KEYBOARD_NEWTON is not set
# CONFIG_KEYBOARD_STOWAWAY is not set
CONFIG_INPUT_MOUSE=y
CONFIG_MOUSE_PS2=y
# CONFIG_MOUSE_SERIAL is not set
# CONFIG_MOUSE_INPORT is not set
# CONFIG_MOUSE_LOGIBM is not set
# CONFIG_MOUSE_PC110PAD is not set
# CONFIG_MOUSE_VSXXXAA is not set
# CONFIG_INPUT_JOYSTICK is not set
# CONFIG_INPUT_TOUCHSCREEN is not set
# CONFIG_INPUT_MISC is not set
#
# Hardware I/O ports
#
CONFIG_SERIO=y
CONFIG_SERIO_I8042=y
# CONFIG_SERIO_SERPORT is not set
# CONFIG_SERIO_CT82C710 is not set
# CONFIG_SERIO_PARKBD is not set
# CONFIG_SERIO_PCIPS2 is not set
CONFIG_SERIO_LIBPS2=y
# CONFIG_SERIO_RAW is not set
# CONFIG_GAMEPORT is not set
#
# Character devices
#
CONFIG_VT=y
CONFIG_VT_CONSOLE=y
CONFIG_HW_CONSOLE=y
# CONFIG_VT_HW_CONSOLE_BINDING is not set
# CONFIG_SERIAL_NONSTANDARD is not set
# CONFIG_NOZOMI is not set
#
# Serial drivers
#
# CONFIG_SERIAL_8250 is not set
#
# Non-8250 serial port support
#
# CONFIG_SERIAL_JSM is not set
CONFIG_UNIX98_PTYS=y
CONFIG_LEGACY_PTYS=y
CONFIG_LEGACY_PTY_COUNT=256
CONFIG_PRINTER=y
# CONFIG_LP_CONSOLE is not set
# CONFIG_PPDEV is not set
# CONFIG_TIPAR is not set
#
# IPMI
#
# CONFIG_IPMI_HANDLER is not set
#
# Watchdog Cards
#
# CONFIG_WATCHDOG is not set
# CONFIG_HW_RANDOM is not set
# CONFIG_NVRAM is not set
# CONFIG_RTC is not set
# CONFIG_GEN_RTC is not set
# CONFIG_DTLK is not set
# CONFIG_R3964 is not set
# CONFIG_APPLICOM is not set
CONFIG_SONYPI=m
CONFIG_AGP=y
# CONFIG_AGP_ALI is not set
CONFIG_AGP_ATI=y
# CONFIG_AGP_AMD is not set
# CONFIG_AGP_AMD64 is not set
# CONFIG_AGP_INTEL is not set
# CONFIG_AGP_NVIDIA is not set
# CONFIG_AGP_SIS is not set
# CONFIG_AGP_SWORKS is not set
# CONFIG_AGP_VIA is not set
# CONFIG_AGP_EFFICEON is not set
CONFIG_DRM=y
# CONFIG_DRM_TDFX is not set
# CONFIG_DRM_R128 is not set
CONFIG_DRM_RADEON=y
# CONFIG_DRM_MGA is not set
# CONFIG_DRM_SIS is not set
# CONFIG_DRM_VIA is not set
# CONFIG_DRM_SAVAGE is not set
#
# PCMCIA character devices
#
# CONFIG_SYNCLINK_CS is not set
# CONFIG_CARDMAN_4000 is not set
# CONFIG_CARDMAN_4040 is not set
# CONFIG_MWAVE is not set
# CONFIG_PC8736x_GPIO is not set
# CONFIG_NSC_GPIO is not set
# CONFIG_CS5535_GPIO is not set
# CONFIG_RAW_DRIVER is not set
# CONFIG_HPET is not set
# CONFIG_HANGCHECK_TIMER is not set
#
# TPM devices
#
# CONFIG_TCG_TPM is not set
# CONFIG_TELCLOCK is not set
#
# I2C support
#
# CONFIG_I2C is not set
#
# SPI support
#
CONFIG_SPI=y
# CONFIG_SPI_DEBUG is not set
CONFIG_SPI_MASTER=y
#
# SPI Master Controller Drivers
#
# CONFIG_SPI_BITBANG is not set
# CONFIG_SPI_BUTTERFLY is not set
#
# SPI Protocol Masters
#
#
# Dallas's 1-wire bus
#
# CONFIG_W1 is not set
#
# Hardware Monitoring support
#
CONFIG_HWMON=y
# CONFIG_HWMON_VID is not set
# CONFIG_SENSORS_ABITUGURU is not set
# CONFIG_SENSORS_K8TEMP is not set
# CONFIG_SENSORS_F71805F is not set
# CONFIG_SENSORS_LM70 is not set
# CONFIG_SENSORS_PC87427 is not set
# CONFIG_SENSORS_VT1211 is not set
# CONFIG_SENSORS_HDAPS is not set
# CONFIG_HWMON_DEBUG_CHIP is not set
#
# Multimedia devices
#
# CONFIG_VIDEO_DEV is not set
#
# Digital Video Broadcasting Devices
#
# CONFIG_DVB is not set
# CONFIG_USB_DABUSB is not set
#
# Graphics support
#
# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
CONFIG_BACKLIGHT_CLASS_DEVICE=m
CONFIG_BACKLIGHT_DEVICE=y
CONFIG_FB=y
CONFIG_FIRMWARE_EDID=y
# CONFIG_FB_DDC is not set
CONFIG_FB_CFB_FILLRECT=y
CONFIG_FB_CFB_COPYAREA=y
CONFIG_FB_CFB_IMAGEBLIT=y
# CONFIG_FB_SVGALIB is not set
# CONFIG_FB_MACMODES is not set
# CONFIG_FB_BACKLIGHT is not set
# CONFIG_FB_MODE_HELPERS is not set
# CONFIG_FB_TILEBLITTING is not set
#
# Frambuffer hardware drivers
#
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_PM2 is not set
# CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_ARC is not set
# CONFIG_FB_ASILIANT is not set
# CONFIG_FB_IMSTT is not set
# CONFIG_FB_VGA16 is not set
CONFIG_FB_VESA=y
# CONFIG_FB_HGA is not set
# CONFIG_FB_S1D13XXX is not set
# CONFIG_FB_NVIDIA is not set
# CONFIG_FB_RIVA is not set
# CONFIG_FB_I810 is not set
# CONFIG_FB_INTEL is not set
# CONFIG_FB_MATROX is not set
# CONFIG_FB_RADEON is not set
# CONFIG_FB_ATY128 is not set
# CONFIG_FB_ATY is not set
# CONFIG_FB_S3 is not set
# CONFIG_FB_SAVAGE is not set
# CONFIG_FB_SIS is not set
# CONFIG_FB_NEOMAGIC is not set
# CONFIG_FB_KYRO is not set
# CONFIG_FB_3DFX is not set
# CONFIG_FB_VOODOO1 is not set
# CONFIG_FB_CYBLA is not set
# CONFIG_FB_TRIDENT is not set
# CONFIG_FB_GEODE is not set
# CONFIG_FB_VIRTUAL is not set
#
# Console display driver support
#
CONFIG_VGA_CONSOLE=y
CONFIG_VGACON_SOFT_SCROLLBACK=y
CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64
CONFIG_VIDEO_SELECT=y
# CONFIG_MDA_CONSOLE is not set
CONFIG_DUMMY_CONSOLE=y
CONFIG_FRAMEBUFFER_CONSOLE=y
# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
# CONFIG_FONTS is not set
CONFIG_FONT_8x8=y
CONFIG_FONT_8x16=y
#
# Logo configuration
#
CONFIG_LOGO=y
CONFIG_LOGO_LINUX_MONO=y
CONFIG_LOGO_LINUX_VGA16=y
CONFIG_LOGO_LINUX_CLUT224=y
#
# Sound
#
CONFIG_SOUND=y
#
# Advanced Linux Sound Architecture
#
CONFIG_SND=y
CONFIG_SND_TIMER=y
CONFIG_SND_PCM=y
CONFIG_SND_RAWMIDI=y
CONFIG_SND_SEQUENCER=y
# CONFIG_SND_SEQ_DUMMY is not set
CONFIG_SND_OSSEMUL=y
CONFIG_SND_MIXER_OSS=y
CONFIG_SND_PCM_OSS=y
CONFIG_SND_PCM_OSS_PLUGINS=y
CONFIG_SND_SEQUENCER_OSS=y
# CONFIG_SND_DYNAMIC_MINORS is not set
CONFIG_SND_SUPPORT_OLD_API=y
CONFIG_SND_VERBOSE_PROCFS=y
# CONFIG_SND_VERBOSE_PRINTK is not set
# CONFIG_SND_DEBUG is not set
#
# Generic devices
#
CONFIG_SND_MPU401_UART=y
CONFIG_SND_AC97_CODEC=y
# CONFIG_SND_DUMMY is not set
# CONFIG_SND_VIRMIDI is not set
# CONFIG_SND_MTPAV is not set
# CONFIG_SND_MTS64 is not set
# CONFIG_SND_SERIAL_U16550 is not set
# CONFIG_SND_MPU401 is not set
#
# ISA devices
#
# CONFIG_SND_ADLIB is not set
# CONFIG_SND_AD1816A is not set
# CONFIG_SND_AD1848 is not set
# CONFIG_SND_ALS100 is not set
# CONFIG_SND_AZT2320 is not set
# CONFIG_SND_CMI8330 is not set
# CONFIG_SND_CS4231 is not set
# CONFIG_SND_CS4232 is not set
# CONFIG_SND_CS4236 is not set
# CONFIG_SND_DT019X is not set
# CONFIG_SND_ES968 is not set
# CONFIG_SND_ES1688 is not set
# CONFIG_SND_ES18XX is not set
# CONFIG_SND_GUSCLASSIC is not set
# CONFIG_SND_GUSEXTREME is not set
# CONFIG_SND_GUSMAX is not set
# CONFIG_SND_INTERWAVE is not set
# CONFIG_SND_INTERWAVE_STB is not set
# CONFIG_SND_OPL3SA2 is not set
# CONFIG_SND_OPTI92X_AD1848 is not set
# CONFIG_SND_OPTI92X_CS4231 is not set
# CONFIG_SND_OPTI93X is not set
# CONFIG_SND_MIRO is not set
# CONFIG_SND_SB8 is not set
# CONFIG_SND_SB16 is not set
# CONFIG_SND_SBAWE is not set
# CONFIG_SND_SGALAXY is not set
# CONFIG_SND_SSCAPE is not set
# CONFIG_SND_WAVEFRONT is not set
#
# PCI devices
#
# CONFIG_SND_AD1889 is not set
# CONFIG_SND_ALS300 is not set
# CONFIG_SND_ALS4000 is not set
CONFIG_SND_ALI5451=y
# CONFIG_SND_ATIIXP is not set
# CONFIG_SND_ATIIXP_MODEM is not set
# CONFIG_SND_AU8810 is not set
# CONFIG_SND_AU8820 is not set
# CONFIG_SND_AU8830 is not set
# CONFIG_SND_AZT3328 is not set
# CONFIG_SND_BT87X is not set
# CONFIG_SND_CA0106 is not set
# CONFIG_SND_CMIPCI is not set
# CONFIG_SND_CS4281 is not set
# CONFIG_SND_CS46XX is not set
# CONFIG_SND_CS5535AUDIO is not set
# CONFIG_SND_DARLA20 is not set
# CONFIG_SND_GINA20 is not set
# CONFIG_SND_LAYLA20 is not set
# CONFIG_SND_DARLA24 is not set
# CONFIG_SND_GINA24 is not set
# CONFIG_SND_LAYLA24 is not set
# CONFIG_SND_MONA is not set
# CONFIG_SND_MIA is not set
# CONFIG_SND_ECHO3G is not set
# CONFIG_SND_INDIGO is not set
# CONFIG_SND_INDIGOIO is not set
# CONFIG_SND_INDIGODJ is not set
# CONFIG_SND_EMU10K1 is not set
# CONFIG_SND_EMU10K1X is not set
# CONFIG_SND_ENS1370 is not set
# CONFIG_SND_ENS1371 is not set
# CONFIG_SND_ES1938 is not set
# CONFIG_SND_ES1968 is not set
# CONFIG_SND_FM801 is not set
# CONFIG_SND_HDA_INTEL is not set
# CONFIG_SND_HDSP is not set
# CONFIG_SND_HDSPM is not set
# CONFIG_SND_ICE1712 is not set
# CONFIG_SND_ICE1724 is not set
# CONFIG_SND_INTEL8X0 is not set
# CONFIG_SND_INTEL8X0M is not set
# CONFIG_SND_KORG1212 is not set
# CONFIG_SND_MAESTRO3 is not set
# CONFIG_SND_MIXART is not set
# CONFIG_SND_NM256 is not set
# CONFIG_SND_PCXHR is not set
# CONFIG_SND_RIPTIDE is not set
# CONFIG_SND_RME32 is not set
# CONFIG_SND_RME96 is not set
# CONFIG_SND_RME9652 is not set
# CONFIG_SND_SONICVIBES is not set
# CONFIG_SND_TRIDENT is not set
# CONFIG_SND_VIA82XX is not set
# CONFIG_SND_VIA82XX_MODEM is not set
# CONFIG_SND_VX222 is not set
# CONFIG_SND_YMFPCI is not set
# CONFIG_SND_AC97_POWER_SAVE is not set
#
# USB devices
#
# CONFIG_SND_USB_AUDIO is not set
# CONFIG_SND_USB_USX2Y is not set
#
# PCMCIA devices
#
# CONFIG_SND_VXPOCKET is not set
# CONFIG_SND_PDAUDIOCF is not set
#
# SoC audio support
#
# CONFIG_SND_SOC is not set
#
# Open Sound System
#
# CONFIG_SOUND_PRIME is not set
CONFIG_AC97_BUS=y
#
# HID Devices
#
CONFIG_HID=y
#
# USB support
#
CONFIG_USB_ARCH_HAS_HCD=y
CONFIG_USB_ARCH_HAS_OHCI=y
CONFIG_USB_ARCH_HAS_EHCI=y
CONFIG_USB=y
# CONFIG_USB_DEBUG is not set
#
# Miscellaneous USB options
#
CONFIG_USB_DEVICEFS=y
# CONFIG_USB_BANDWIDTH is not set
# CONFIG_USB_DYNAMIC_MINORS is not set
# CONFIG_USB_SUSPEND is not set
# CONFIG_USB_MULTITHREAD_PROBE is not set
# CONFIG_USB_OTG is not set
#
# USB Host Controller Drivers
#
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_SPLIT_ISO=y
# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
CONFIG_USB_EHCI_TT_NEWSCHED=y
# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
# CONFIG_USB_ISP116X_HCD is not set
# CONFIG_USB_OHCI_HCD is not set
CONFIG_USB_UHCI_HCD=y
# CONFIG_USB_SL811_HCD is not set
#
# USB Device Class drivers
#
# CONFIG_USB_ACM is not set
CONFIG_USB_PRINTER=y
#
# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
#
#
# may also be needed; see USB_STORAGE Help for more information
#
CONFIG_USB_STORAGE=y
# CONFIG_USB_STORAGE_DEBUG is not set
CONFIG_USB_STORAGE_DATAFAB=y
CONFIG_USB_STORAGE_FREECOM=y
CONFIG_USB_STORAGE_ISD200=y
CONFIG_USB_STORAGE_DPCM=y
CONFIG_USB_STORAGE_USBAT=y
CONFIG_USB_STORAGE_SDDR09=y
CONFIG_USB_STORAGE_SDDR55=y
CONFIG_USB_STORAGE_JUMPSHOT=y
# CONFIG_USB_STORAGE_ALAUDA is not set
# CONFIG_USB_STORAGE_KARMA is not set
# CONFIG_USB_LIBUSUAL is not set
#
# USB Input Devices
#
CONFIG_USB_HID=y
# CONFIG_USB_HIDINPUT_POWERBOOK is not set
# CONFIG_HID_FF is not set
# CONFIG_USB_HIDDEV is not set
# CONFIG_USB_AIPTEK is not set
# CONFIG_USB_WACOM is not set
# CONFIG_USB_ACECAD is not set
# CONFIG_USB_KBTAB is not set
# CONFIG_USB_POWERMATE is not set
# CONFIG_USB_TOUCHSCREEN is not set
# CONFIG_USB_YEALINK is not set
# CONFIG_USB_XPAD is not set
# CONFIG_USB_ATI_REMOTE is not set
# CONFIG_USB_ATI_REMOTE2 is not set
# CONFIG_USB_KEYSPAN_REMOTE is not set
# CONFIG_USB_APPLETOUCH is not set
#
# USB Imaging devices
#
# CONFIG_USB_MDC800 is not set
# CONFIG_USB_MICROTEK is not set
#
# USB Network Adapters
#
# CONFIG_USB_CATC is not set
# CONFIG_USB_KAWETH is not set
# CONFIG_USB_PEGASUS is not set
# CONFIG_USB_RTL8150 is not set
# CONFIG_USB_USBNET_MII is not set
# CONFIG_USB_USBNET is not set
CONFIG_USB_MON=y
#
# USB port drivers
#
# CONFIG_USB_USS720 is not set
#
# USB Serial Converter support
#
# CONFIG_USB_SERIAL is not set
#
# USB Miscellaneous drivers
#
# CONFIG_USB_EMI62 is not set
# CONFIG_USB_EMI26 is not set
# CONFIG_USB_ADUTUX is not set
# CONFIG_USB_AUERSWALD is not set
# CONFIG_USB_RIO500 is not set
# CONFIG_USB_LEGOTOWER is not set
# CONFIG_USB_LCD is not set
# CONFIG_USB_LED is not set
# CONFIG_USB_CYPRESS_CY7C63 is not set
# CONFIG_USB_CYTHERM is not set
# CONFIG_USB_PHIDGET is not set
# CONFIG_USB_IDMOUSE is not set
# CONFIG_USB_FTDI_ELAN is not set
# CONFIG_USB_APPLEDISPLAY is not set
# CONFIG_USB_SISUSBVGA is not set
# CONFIG_USB_LD is not set
# CONFIG_USB_TRANCEVIBRATOR is not set
# CONFIG_USB_TEST is not set
# CONFIG_USB_GOTEMP is not set
#
# USB DSL modem support
#
#
# USB Gadget Support
#
# CONFIG_USB_GADGET is not set
#
# MMC/SD Card support
#
CONFIG_MMC=m
# CONFIG_MMC_DEBUG is not set
# CONFIG_MMC_PASSWORDS is not set
CONFIG_MMC_BLOCK=m
CONFIG_MMC_SDHCI=m
CONFIG_MMC_WBSD=m
# CONFIG_MMC_TIFM_SD is not set
#
# LED devices
#
# CONFIG_NEW_LEDS is not set
#
# LED drivers
#
#
# LED Triggers
#
#
# InfiniBand support
#
# CONFIG_INFINIBAND is not set
#
# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
#
CONFIG_EDAC=y
#
# Reporting subsystems
#
# CONFIG_EDAC_DEBUG is not set
CONFIG_EDAC_MM_EDAC=y
# CONFIG_EDAC_AMD76X is not set
# CONFIG_EDAC_E7XXX is not set
# CONFIG_EDAC_E752X is not set
# CONFIG_EDAC_I82875P is not set
# CONFIG_EDAC_I82860 is not set
# CONFIG_EDAC_K8 is not set
# CONFIG_EDAC_R82600 is not set
CONFIG_EDAC_POLL=y
#
# Real Time Clock
#
# CONFIG_RTC_CLASS is not set
#
# DMA Engine support
#
# CONFIG_DMA_ENGINE is not set
#
# DMA Clients
#
#
# DMA Devices
#
#
# Auxiliary Display support
#
# CONFIG_KS0108 is not set
#
# Virtualization
#
# CONFIG_KVM is not set
#
# Userspace I/O
#
# CONFIG_UIO is not set
#
# File systems
#
CONFIG_EXT2_FS=y
# CONFIG_EXT2_FS_XATTR is not set
# CONFIG_EXT2_FS_XIP is not set
CONFIG_EXT3_FS=y
CONFIG_EXT3_FS_XATTR=y
# CONFIG_EXT3_FS_POSIX_ACL is not set
# CONFIG_EXT3_FS_SECURITY is not set
# CONFIG_EXT4DEV_FS is not set
CONFIG_JBD=y
# CONFIG_JBD_DEBUG is not set
CONFIG_FS_MBCACHE=y
# CONFIG_REISER4_FS is not set
# CONFIG_REISERFS_FS is not set
# CONFIG_JFS_FS is not set
# CONFIG_FS_POSIX_ACL is not set
# CONFIG_XFS_FS is not set
# CONFIG_GFS2_FS is not set
# CONFIG_OCFS2_FS is not set
# CONFIG_MINIX_FS is not set
# CONFIG_ROMFS_FS is not set
CONFIG_INOTIFY=y
CONFIG_INOTIFY_USER=y
# CONFIG_QUOTA is not set
CONFIG_DNOTIFY=y
# CONFIG_AUTOFS_FS is not set
CONFIG_AUTOFS4_FS=y
# CONFIG_FUSE_FS is not set
#
# CD-ROM/DVD Filesystems
#
CONFIG_ISO9660_FS=y
CONFIG_JOLIET=y
# CONFIG_ZISOFS is not set
CONFIG_UDF_FS=y
CONFIG_UDF_NLS=y
#
# DOS/FAT/NT Filesystems
#
CONFIG_FAT_FS=y
CONFIG_MSDOS_FS=y
CONFIG_VFAT_FS=y
CONFIG_FAT_DEFAULT_CODEPAGE=1250
CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-2"
CONFIG_NTFS_FS=y
# CONFIG_NTFS_DEBUG is not set
CONFIG_NTFS_RW=y
#
# Pseudo filesystems
#
CONFIG_PROC_FS=y
CONFIG_PROC_KCORE=y
CONFIG_PROC_SYSCTL=y
CONFIG_SYSFS=y
CONFIG_TMPFS=y
# CONFIG_TMPFS_POSIX_ACL is not set
# CONFIG_HUGETLBFS is not set
# CONFIG_HUGETLB_PAGE is not set
CONFIG_RAMFS=y
# CONFIG_CONFIGFS_FS is not set
#
# Miscellaneous filesystems
#
# CONFIG_ADFS_FS is not set
# CONFIG_AFFS_FS is not set
# CONFIG_HFS_FS is not set
# CONFIG_HFSPLUS_FS is not set
# CONFIG_BEFS_FS is not set
# CONFIG_BFS_FS is not set
# CONFIG_EFS_FS is not set
# CONFIG_CRAMFS is not set
# CONFIG_VXFS_FS is not set
# CONFIG_HPFS_FS is not set
# CONFIG_QNX4FS_FS is not set
# CONFIG_SYSV_FS is not set
# CONFIG_UFS_FS is not set
# CONFIG_UNION_FS is not set
#
# Network File Systems
#
CONFIG_NFS_FS=y
CONFIG_NFS_V3=y
# CONFIG_NFS_V3_ACL is not set
# CONFIG_NFS_V4 is not set
# CONFIG_NFS_DIRECTIO is not set
CONFIG_NFSD=y
CONFIG_NFSD_V3=y
# CONFIG_NFSD_V3_ACL is not set
# CONFIG_NFSD_V4 is not set
CONFIG_NFSD_TCP=y
CONFIG_LOCKD=y
CONFIG_LOCKD_V4=y
CONFIG_EXPORTFS=y
CONFIG_NFS_COMMON=y
CONFIG_SUNRPC=y
# CONFIG_RPCSEC_GSS_KRB5 is not set
# CONFIG_RPCSEC_GSS_SPKM3 is not set
CONFIG_SMB_FS=y
CONFIG_SMB_NLS_DEFAULT=y
CONFIG_SMB_NLS_REMOTE="cp1250"
# CONFIG_CIFS is not set
# CONFIG_NCP_FS is not set
# CONFIG_CODA_FS is not set
# CONFIG_AFS_FS is not set
# CONFIG_9P_FS is not set
#
# Partition Types
#
# CONFIG_PARTITION_ADVANCED is not set
CONFIG_MSDOS_PARTITION=y
#
# Native Language Support
#
CONFIG_NLS=y
CONFIG_NLS_DEFAULT="iso8859-2"
CONFIG_NLS_CODEPAGE_437=m
# CONFIG_NLS_CODEPAGE_737 is not set
# CONFIG_NLS_CODEPAGE_775 is not set
# CONFIG_NLS_CODEPAGE_850 is not set
CONFIG_NLS_CODEPAGE_852=y
# CONFIG_NLS_CODEPAGE_855 is not set
# CONFIG_NLS_CODEPAGE_857 is not set
# CONFIG_NLS_CODEPAGE_860 is not set
# CONFIG_NLS_CODEPAGE_861 is not set
# CONFIG_NLS_CODEPAGE_862 is not set
# CONFIG_NLS_CODEPAGE_863 is not set
# CONFIG_NLS_CODEPAGE_864 is not set
# CONFIG_NLS_CODEPAGE_865 is not set
# CONFIG_NLS_CODEPAGE_866 is not set
# CONFIG_NLS_CODEPAGE_869 is not set
# CONFIG_NLS_CODEPAGE_936 is not set
# CONFIG_NLS_CODEPAGE_950 is not set
# CONFIG_NLS_CODEPAGE_932 is not set
# CONFIG_NLS_CODEPAGE_949 is not set
# CONFIG_NLS_CODEPAGE_874 is not set
# CONFIG_NLS_ISO8859_8 is not set
CONFIG_NLS_CODEPAGE_1250=m
# CONFIG_NLS_CODEPAGE_1251 is not set
# CONFIG_NLS_ASCII is not set
CONFIG_NLS_ISO8859_1=m
CONFIG_NLS_ISO8859_2=y
# CONFIG_NLS_ISO8859_3 is not set
# CONFIG_NLS_ISO8859_4 is not set
# CONFIG_NLS_ISO8859_5 is not set
# CONFIG_NLS_ISO8859_6 is not set
# CONFIG_NLS_ISO8859_7 is not set
# CONFIG_NLS_ISO8859_9 is not set
# CONFIG_NLS_ISO8859_13 is not set
# CONFIG_NLS_ISO8859_14 is not set
# CONFIG_NLS_ISO8859_15 is not set
# CONFIG_NLS_KOI8_R is not set
# CONFIG_NLS_KOI8_U is not set
# CONFIG_NLS_UTF8 is not set
#
# Distributed Lock Manager
#
# CONFIG_DLM is not set
#
# Instrumentation Support
#
# CONFIG_PROFILING is not set
# CONFIG_KPROBES is not set
#
# Kernel hacking
#
CONFIG_TRACE_IRQFLAGS_SUPPORT=y
# CONFIG_PRINTK_TIME is not set
CONFIG_ENABLE_MUST_CHECK=y
CONFIG_MAGIC_SYSRQ=y
# CONFIG_UNUSED_SYMBOLS is not set
# CONFIG_PAGE_OWNER is not set
CONFIG_DEBUG_FS=y
CONFIG_HEADERS_CHECK=y
CONFIG_DEBUG_KERNEL=y
CONFIG_DEBUG_SHIRQ=y
CONFIG_LOG_BUF_SHIFT=17
CONFIG_DETECT_SOFTLOCKUP=y
CONFIG_SCHEDSTATS=y
CONFIG_TIMER_STATS=y
CONFIG_DEBUG_SLAB=y
CONFIG_DEBUG_SLAB_LEAK=y
CONFIG_DEBUG_PREEMPT=y
CONFIG_DEBUG_RT_MUTEXES=y
CONFIG_DEBUG_PI_LIST=y
CONFIG_RT_MUTEX_TESTER=y
CONFIG_DEBUG_SPINLOCK=y
CONFIG_DEBUG_MUTEXES=y
CONFIG_DEBUG_RWSEMS=y
CONFIG_DEBUG_LOCK_ALLOC=y
CONFIG_PROVE_LOCKING=y
CONFIG_LOCKDEP=y
CONFIG_DEBUG_LOCKDEP=y
CONFIG_TRACE_IRQFLAGS=y
CONFIG_DEBUG_SPINLOCK_SLEEP=y
CONFIG_DEBUG_LOCKING_API_SELFTESTS=y
CONFIG_STACKTRACE=y
# CONFIG_DEBUG_KOBJECT is not set
CONFIG_DEBUG_BUGVERBOSE=y
CONFIG_DEBUG_INFO=y
CONFIG_DEBUG_VM=y
CONFIG_DEBUG_LIST=y
CONFIG_FRAME_POINTER=y
# CONFIG_PROFILE_LIKELY is not set
CONFIG_FORCED_INLINING=y
# CONFIG_DEBUG_SYNCHRO_TEST is not set
# CONFIG_RCU_TORTURE_TEST is not set
# CONFIG_FAULT_INJECTION is not set
CONFIG_EARLY_PRINTK=y
# CONFIG_DEBUG_STACKOVERFLOW is not set
# CONFIG_DEBUG_STACK_USAGE is not set
#
# Page alloc debug is incompatible with Software Suspend on i386
#
# CONFIG_DEBUG_RODATA is not set
CONFIG_DOUBLEFAULT=y
#
# Security options
#
# CONFIG_KEYS is not set
# CONFIG_INTEGRITY is not set
# CONFIG_SECURITY is not set
# CONFIG_SECURITY_FS_CAPABILITIES is not set
#
# Cryptographic options
#
# CONFIG_CRYPTO is not set
#
# Library routines
#
CONFIG_BITREVERSE=y
CONFIG_CRC_CCITT=m
# CONFIG_CRC16 is not set
CONFIG_CRC32=y
CONFIG_LIBCRC32C=m
CONFIG_AUDIT_GENERIC=y
CONFIG_PLIST=y
CONFIG_IOMAP_COPY=y
CONFIG_GENERIC_HARDIRQS=y
CONFIG_GENERIC_IRQ_PROBE=y
CONFIG_X86_BIOS_REBOOT=y
CONFIG_KTIME_SCALAR=y
^ permalink raw reply [flat|nested] 93+ messages in thread* Re: 2.6.20-rc4-mm1
2007-01-12 10:25 ` 2.6.20-rc4-mm1 Mariusz Kozlowski
@ 2007-01-12 13:18 ` Frederik Deweerdt
2007-01-12 15:13 ` 2.6.20-rc4-mm1 Mariusz Kozlowski
0 siblings, 1 reply; 93+ messages in thread
From: Frederik Deweerdt @ 2007-01-12 13:18 UTC (permalink / raw)
To: Mariusz Kozlowski; +Cc: Andrew Morton, linux-kernel, drzeus
On Fri, Jan 12, 2007 at 11:25:58AM +0100, Mariusz Kozlowski wrote:
> Hello,
>
> Doesn't build on my laptop.
>
> drivers/mmc/mmc.c: In function 'mmc_lock_unlock':
> drivers/mmc/mmc.c:1527: error: dereferencing pointer to incomplete type
> drivers/mmc/mmc.c:1527: warning: type defaults to 'int' in declaration of '_________p1'
> drivers/mmc/mmc.c:1527: error: dereferencing pointer to incomplete type
> drivers/mmc/mmc.c:1527: warning: assignment makes pointer from integer without a cast
> make[2]: *** [drivers/mmc/mmc.o] Error 1
> make[1]: *** [drivers/mmc] Error 2
> make: *** [drivers] Error 2
>
Hi,
That's because mmc_lock_unlock should depend on CONFIG_KEYS, it uses struct key.
Could you try the following patch (compile tested)?
Regards,
Frederik
Signed-off-by: Frederik Deweerdt <frederik.deweerdt@gmail.com>
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index 3956023..c1fe01d 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -1503,6 +1503,8 @@ static void mmc_setup(struct mmc_host *h
mmc_process_ext_csds(host);
}
+#ifdef CONFIG_MMC_PASSWORDS
+
/**
* mmc_lock_unlock - send LOCK_UNLOCK command to a specific card.
* @card: card to which the LOCK_UNLOCK command should be sent
@@ -1617,6 +1619,8 @@ out:
return err;
}
+#endif /* CONFIG_MMC_PASSWORDS */
+
/**
* mmc_detect_change - process change of state on a MMC socket
* @host: host which changed state.
^ permalink raw reply related [flat|nested] 93+ messages in thread
* Re: 2.6.20-rc4-mm1
2007-01-12 13:18 ` 2.6.20-rc4-mm1 Frederik Deweerdt
@ 2007-01-12 15:13 ` Mariusz Kozlowski
2007-01-12 15:16 ` 2.6.20-rc4-mm1 Michal Piotrowski
0 siblings, 1 reply; 93+ messages in thread
From: Mariusz Kozlowski @ 2007-01-12 15:13 UTC (permalink / raw)
To: Frederik Deweerdt; +Cc: Andrew Morton, linux-kernel, drzeus
Hello,
> That's because mmc_lock_unlock should depend on CONFIG_KEYS, it uses struct key.
> Could you try the following patch (compile tested)?
Thanks. Compiles ok but now I run into another problem and the laptop doesn't boot.
The last thing I see is grub. So no way to test it now. Time to dig some more ;-)
--
Regards,
Mariusz Kozlowski
^ permalink raw reply [flat|nested] 93+ messages in thread
* 'struct task_struct' has no member named 'mems_allowed' (was: Re: 2.6.20-rc4-mm1)
2007-01-12 6:26 2.6.20-rc4-mm1 Andrew Morton
2007-01-12 10:20 ` Early ACPI lockup (was Re: 2.6.20-rc4-mm1) Frederik Deweerdt
2007-01-12 10:25 ` 2.6.20-rc4-mm1 Mariusz Kozlowski
@ 2007-01-12 10:52 ` Sander
2007-01-12 11:28 ` Paul Jackson
2007-01-12 11:55 ` spurious sparse warnings from linux/aio.h (was: 2.6.20-rc4-mm1) Tilman Schmidt
` (15 subsequent siblings)
18 siblings, 1 reply; 93+ messages in thread
From: Sander @ 2007-01-12 10:52 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel
Andrew Morton wrote (ao):
> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.20-rc3/2.6.20-rc4-mm1/
> x86/x86_64 things
> +mbind-restrict-nodes-to-the-currently-allowed-cpuset.patch
I had to revert this patch because of:
===
mm/mempolicy.c: In function 'sys_mbind':
mm/mempolicy.c:885: error: 'struct task_struct' has no member named 'mems_allowed'
make[1]: *** [mm/mempolicy.o] Error 1
make: *** [mm] Error 2
===
===
http://lkml.org/lkml/2007/1/9/375
Date Tue, 9 Jan 2007 20:15:07 -0800 (PST)
From Christoph Lameter <>
Subject mbind: Restrict nodes to the currently allowed cpuset
Digg This
Currently one can specify an arbitrary node mask to mbind that includes nodes
not allowed. If that is done with an interleave policy then we will go around
all the nodes. Those outside of the currently allowed cpuset will be redirected
to the border nodes. Interleave will then create imbalances at the borders
of the cpuset.
This patch restricts the nodes to the currently allowed cpuset.
The RFC for this patch was discussed at
http://marc.theaimsgroup.com/?t=116793842100004&r=1&w=2
Signed-off-by: Christoph Lameter <clameter@sgi.com>
Index: linux-2.6.19-mm1/mm/mempolicy.c
===================================================================
--- linux-2.6.19-mm1.orig/mm/mempolicy.c 2006-12-11 19:00:38.224610647 -0800
+++ linux-2.6.19-mm1/mm/mempolicy.c 2006-12-13 11:13:10.175294067 -0800
@@ -882,6 +882,7 @@ asmlinkage long sys_mbind(unsigned long
int err;
err = get_nodes(&nodes, nmask, maxnode);
+ nodes_and(nodes, nodes, current->mems_allowed);
if (err)
return err;
return do_mbind(start, len, mode, &nodes, flags);
===
With kind regards, Sander
--
Humilis IT Services and Solutions
http://www.humilis.net
^ permalink raw reply [flat|nested] 93+ messages in thread* Re: 'struct task_struct' has no member named 'mems_allowed' (was: Re: 2.6.20-rc4-mm1)
2007-01-12 10:52 ` 'struct task_struct' has no member named 'mems_allowed' (was: Re: 2.6.20-rc4-mm1) Sander
@ 2007-01-12 11:28 ` Paul Jackson
2007-01-12 19:25 ` Christoph Lameter
0 siblings, 1 reply; 93+ messages in thread
From: Paul Jackson @ 2007-01-12 11:28 UTC (permalink / raw)
To: sander; +Cc: akpm, linux-kernel, clameter
Sander wrote:
> > +mbind-restrict-nodes-to-the-currently-allowed-cpuset.patch
>
> I had to revert this patch because of:
>
> ===
> mm/mempolicy.c: In function 'sys_mbind':
> mm/mempolicy.c:885: error: 'struct task_struct' has no member named 'mems_allowed'
You're right - this patch won't build if CONFIG_NUMA is on, and
CONFIG_CPUSETS off.
The line added in the patch:
+ nodes_and(nodes, nodes, current->mems_allowed);
needs to be macro'ized, using another cpuset.h routine, to a no-op, in
the case that CONFIG_CPUSET is disabled.
I'll leave the honors to Christoph (added to CC), since this is his patch.
--
I won't rest till it's the best ...
Programmer, Linux Scalability
Paul Jackson <pj@sgi.com> 1.925.600.0401
^ permalink raw reply [flat|nested] 93+ messages in thread* Re: 'struct task_struct' has no member named 'mems_allowed' (was: Re: 2.6.20-rc4-mm1)
2007-01-12 11:28 ` Paul Jackson
@ 2007-01-12 19:25 ` Christoph Lameter
2007-01-12 21:20 ` Paul Jackson
0 siblings, 1 reply; 93+ messages in thread
From: Christoph Lameter @ 2007-01-12 19:25 UTC (permalink / raw)
To: akpm; +Cc: Paul Jackson, sander, linux-kernel
On Fri, 12 Jan 2007, Paul Jackson wrote:
> I'll leave the honors to Christoph (added to CC), since this is his patch.
Ok. Here it is
mems_allowed only exists if CONFIG_CPUSETS is set. So put an #ifdef around
it. Also move the masking of the nodes behind the error check (looks
better) and add a comment.
Signed-off-by: Christoph Lameter <clameter@sgi.com>
Index: linux-2.6.20-rc4-mm1/mm/mempolicy.c
===================================================================
--- linux-2.6.20-rc4-mm1.orig/mm/mempolicy.c 2007-01-12 13:20:17.000000000 -0600
+++ linux-2.6.20-rc4-mm1/mm/mempolicy.c 2007-01-12 13:21:30.220968608 -0600
@@ -882,9 +882,12 @@ asmlinkage long sys_mbind(unsigned long
int err;
err = get_nodes(&nodes, nmask, maxnode);
- nodes_and(nodes, nodes, current->mems_allowed);
if (err)
return err;
+#ifdef CONFIG_CPUSETS
+ /* Restrict the nodes to the allowed nodes in the cpuset */
+ nodes_and(nodes, nodes, current->mems_allowed);
+#endif
return do_mbind(start, len, mode, &nodes, flags);
}
^ permalink raw reply [flat|nested] 93+ messages in thread
* Re: 'struct task_struct' has no member named 'mems_allowed' (was: Re: 2.6.20-rc4-mm1)
2007-01-12 19:25 ` Christoph Lameter
@ 2007-01-12 21:20 ` Paul Jackson
2007-01-12 21:28 ` Christoph Lameter
0 siblings, 1 reply; 93+ messages in thread
From: Paul Jackson @ 2007-01-12 21:20 UTC (permalink / raw)
To: Christoph Lameter; +Cc: akpm, sander, linux-kernel
Christoph wrote:
> +++ linux-2.6.20-rc4-mm1/mm/mempolicy.c 2007-01-12 13:21:30.220968608 -0600
> ...
> +#ifdef CONFIG_CPUSETS
Argh - minor detail, but this is the first (outside of fs/proc/base.c)
"#ifdef CONFIG_CPUSETS" in a kernel *.c file. I prefer to avoid that.
How about doing this as I suggested in my previous message, like the
other cpuset hooks, with a cpuset_* macro in include/linux/cpuset.h?
This macro would either be the 'nodes_and(...)' code if CPUSETS are
configured, else a no-op. Say something like ...
cpuset_restrict_to_current_mems_allowed(nodes);
--
I won't rest till it's the best ...
Programmer, Linux Scalability
Paul Jackson <pj@sgi.com> 1.925.600.0401
^ permalink raw reply [flat|nested] 93+ messages in thread* Re: 'struct task_struct' has no member named 'mems_allowed' (was: Re: 2.6.20-rc4-mm1)
2007-01-12 21:20 ` Paul Jackson
@ 2007-01-12 21:28 ` Christoph Lameter
2007-01-12 21:58 ` Paul Jackson
0 siblings, 1 reply; 93+ messages in thread
From: Christoph Lameter @ 2007-01-12 21:28 UTC (permalink / raw)
To: Paul Jackson; +Cc: akpm, sander, linux-kernel
On Fri, 12 Jan 2007, Paul Jackson wrote:
> Argh - minor detail, but this is the first (outside of fs/proc/base.c)
> "#ifdef CONFIG_CPUSETS" in a kernel *.c file. I prefer to avoid that.
Sorry but there will be number of those once we get the dirty writeback
for cpusets fixed. Did you review that patchset (only internally mailed
so far).
I do not think it makes much sense to do these macros for the single
occurrence here and otherwise. Having the #ifdef here is much clearer.
Also the #ifdef is in already NUMA specific code.
^ permalink raw reply [flat|nested] 93+ messages in thread
* Re: 'struct task_struct' has no member named 'mems_allowed' (was: Re: 2.6.20-rc4-mm1)
2007-01-12 21:28 ` Christoph Lameter
@ 2007-01-12 21:58 ` Paul Jackson
2007-01-12 22:00 ` Christoph Lameter
0 siblings, 1 reply; 93+ messages in thread
From: Paul Jackson @ 2007-01-12 21:58 UTC (permalink / raw)
To: Christoph Lameter; +Cc: akpm, sander, linux-kernel
> Sorry but there will be number of those once we get the dirty writeback
> for cpusets fixed. Did you review that patchset (only internally mailed
> so far).
I haven't reviewed it - sorry. Too much stuff; too little time.
If only I had Alan's bots, which are apparently on loan now to Andrew.
> I do not think it makes much sense to do these macros for the single
> occurrence here and otherwise.
I disagree. If just one thing, like cpusets, does the ifdef's, it might
be easier to read. But if several things do them in nearby code, that
code gets ugly and fries my limited brain circuits.
Even just one of them looks ugly to me -- changing what could be a
single indented line "cpuset_...(..);" line into three lines, two of
them violating the indentation.
It might look clearer to someone who is focused on that particular
change, but it adds unnecessary noise for the other 90% of the readers
of that code who are not concerned with cpusets at that point in time.
--
I won't rest till it's the best ...
Programmer, Linux Scalability
Paul Jackson <pj@sgi.com> 1.925.600.0401
^ permalink raw reply [flat|nested] 93+ messages in thread* Re: 'struct task_struct' has no member named 'mems_allowed' (was: Re: 2.6.20-rc4-mm1)
2007-01-12 21:58 ` Paul Jackson
@ 2007-01-12 22:00 ` Christoph Lameter
2007-01-12 22:10 ` Paul Jackson
2007-01-12 22:11 ` Andrew Morton
0 siblings, 2 replies; 93+ messages in thread
From: Christoph Lameter @ 2007-01-12 22:00 UTC (permalink / raw)
To: Paul Jackson; +Cc: akpm, sander, linux-kernel
On Fri, 12 Jan 2007, Paul Jackson wrote:
> It might look clearer to someone who is focused on that particular
> change, but it adds unnecessary noise for the other 90% of the readers
> of that code who are not concerned with cpusets at that point in time.
This is in NUMA specific code. And they should be concerned about cpusets
since cpusets may affect the node masks they can set. If this is hidden in
a macro then it may be overlooked.
^ permalink raw reply [flat|nested] 93+ messages in thread
* Re: 'struct task_struct' has no member named 'mems_allowed' (was: Re: 2.6.20-rc4-mm1)
2007-01-12 22:00 ` Christoph Lameter
@ 2007-01-12 22:10 ` Paul Jackson
2007-01-12 22:11 ` Andrew Morton
1 sibling, 0 replies; 93+ messages in thread
From: Paul Jackson @ 2007-01-12 22:10 UTC (permalink / raw)
To: Christoph Lameter; +Cc: akpm, sander, linux-kernel
Christoph wrote:
> If this is hidden in a macro then it may be overlooked.
Sooner or later, every line of code is important.
Shouting any one of them in #ifdef brackets creates
a noisier environment, increasing the chance of missing
another.
And besides ... the other umpteen cpuset hooks all use the
cpuset_*() style macros (except for fs/proc/base.c, which
has its own style ...).
Consistency in style is important in these matters.
--
I won't rest till it's the best ...
Programmer, Linux Scalability
Paul Jackson <pj@sgi.com> 1.925.600.0401
^ permalink raw reply [flat|nested] 93+ messages in thread* Re: 'struct task_struct' has no member named 'mems_allowed' (was: Re: 2.6.20-rc4-mm1)
2007-01-12 22:00 ` Christoph Lameter
2007-01-12 22:10 ` Paul Jackson
@ 2007-01-12 22:11 ` Andrew Morton
1 sibling, 0 replies; 93+ messages in thread
From: Andrew Morton @ 2007-01-12 22:11 UTC (permalink / raw)
To: Christoph Lameter; +Cc: Paul Jackson, sander, linux-kernel
On Fri, 12 Jan 2007 14:00:16 -0800 (PST)
Christoph Lameter <clameter@sgi.com> wrote:
> On Fri, 12 Jan 2007, Paul Jackson wrote:
>
> > It might look clearer to someone who is focused on that particular
> > change, but it adds unnecessary noise for the other 90% of the readers
> > of that code who are not concerned with cpusets at that point in time.
>
> This is in NUMA specific code. And they should be concerned about cpusets
> since cpusets may affect the node masks they can set. If this is hidden in
> a macro then it may be overlooked.
bah. No ifdefs!
^ permalink raw reply [flat|nested] 93+ messages in thread
* spurious sparse warnings from linux/aio.h (was: 2.6.20-rc4-mm1)
2007-01-12 6:26 2.6.20-rc4-mm1 Andrew Morton
` (2 preceding siblings ...)
2007-01-12 10:52 ` 'struct task_struct' has no member named 'mems_allowed' (was: Re: 2.6.20-rc4-mm1) Sander
@ 2007-01-12 11:55 ` Tilman Schmidt
2007-01-12 13:11 ` Suparna Bhattacharya
2007-01-12 13:33 ` [-mm patch] remove tcp header from tcp_v4_check Frederik Deweerdt
` (14 subsequent siblings)
18 siblings, 1 reply; 93+ messages in thread
From: Tilman Schmidt @ 2007-01-12 11:55 UTC (permalink / raw)
To: Andrew Morton, linux-kernel, Suparna Bhattacharya
[-- Attachment #1: Type: text/plain, Size: 1173 bytes --]
Andrew Morton schrieb:
> - Merged the "filesystem AIO patches".
This construct:
> --- linux-2.6.20-rc4/include/linux/aio.h 2007-01-06 23:34:08.000000000 -0800
> +++ devel/include/linux/aio.h 2007-01-11 21:36:16.000000000 -0800
> @@ -237,7 +243,8 @@ do { \
> } \
> } while (0)
>
> -#define io_wait_to_kiocb(wait) container_of(wait, struct kiocb, ki_wait)
> +#define io_wait_to_kiocb(io_wait) container_of(container_of(io_wait, \
> + struct wait_bit_queue, wait), struct kiocb, ki_wait)
>
> #include <linux/aio_abi.h>
>
causes a sparse warning:
> include/linux/sched.h:1313:29: warning: symbol '__mptr' shadows an earlier one
> include/linux/sched.h:1313:29: originally declared here
for every source file referencing <linux/sched.h>.
Could that be avoided please?
Thanks
Tilman
--
Tilman Schmidt E-Mail: tilman@imap.cc
Bonn, Germany
Diese Nachricht besteht zu 100% aus wiederverwerteten Bits.
Ungeöffnet mindestens haltbar bis: (siehe Rückseite)
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 250 bytes --]
^ permalink raw reply [flat|nested] 93+ messages in thread* Re: spurious sparse warnings from linux/aio.h (was: 2.6.20-rc4-mm1)
2007-01-12 11:55 ` spurious sparse warnings from linux/aio.h (was: 2.6.20-rc4-mm1) Tilman Schmidt
@ 2007-01-12 13:11 ` Suparna Bhattacharya
2007-01-12 17:46 ` spurious sparse warnings from linux/aio.h Tilman Schmidt
0 siblings, 1 reply; 93+ messages in thread
From: Suparna Bhattacharya @ 2007-01-12 13:11 UTC (permalink / raw)
To: Tilman Schmidt; +Cc: Andrew Morton, linux-kernel
On Fri, Jan 12, 2007 at 12:55:18PM +0100, Tilman Schmidt wrote:
> Andrew Morton schrieb:
> > - Merged the "filesystem AIO patches".
>
> This construct:
>
> > --- linux-2.6.20-rc4/include/linux/aio.h 2007-01-06 23:34:08.000000000 -0800
> > +++ devel/include/linux/aio.h 2007-01-11 21:36:16.000000000 -0800
>
> > @@ -237,7 +243,8 @@ do { \
> > } \
> > } while (0)
> >
> > -#define io_wait_to_kiocb(wait) container_of(wait, struct kiocb, ki_wait)
> > +#define io_wait_to_kiocb(io_wait) container_of(container_of(io_wait, \
> > + struct wait_bit_queue, wait), struct kiocb, ki_wait)
> >
> > #include <linux/aio_abi.h>
> >
>
> causes a sparse warning:
>
> > include/linux/sched.h:1313:29: warning: symbol '__mptr' shadows an earlier one
> > include/linux/sched.h:1313:29: originally declared here
>
> for every source file referencing <linux/sched.h>.
> Could that be avoided please?
So ... the nested container_of() is a problem ? I guess changing
io_wait_to_kiocb() to be an inline function instead of a macro could help ?
Regards
Suparna
>
> Thanks
> Tilman
>
> --
> Tilman Schmidt E-Mail: tilman@imap.cc
> Bonn, Germany
> Diese Nachricht besteht zu 100% aus wiederverwerteten Bits.
> Ungeöffnet mindestens haltbar bis: (siehe Rückseite)
>
--
Suparna Bhattacharya (suparna@in.ibm.com)
Linux Technology Center
IBM Software Lab, India
^ permalink raw reply [flat|nested] 93+ messages in thread* Re: spurious sparse warnings from linux/aio.h
2007-01-12 13:11 ` Suparna Bhattacharya
@ 2007-01-12 17:46 ` Tilman Schmidt
0 siblings, 0 replies; 93+ messages in thread
From: Tilman Schmidt @ 2007-01-12 17:46 UTC (permalink / raw)
To: suparna; +Cc: Andrew Morton, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 1465 bytes --]
Suparna Bhattacharya schrieb:
> On Fri, Jan 12, 2007 at 12:55:18PM +0100, Tilman Schmidt wrote:
[...]
>> causes a sparse warning:
>>
>> > include/linux/sched.h:1313:29: warning: symbol '__mptr' shadows an earlier one
>> > include/linux/sched.h:1313:29: originally declared here
>>
>> for every source file referencing <linux/sched.h>.
>> Could that be avoided please?
>
> So ... the nested container_of() is a problem ? I guess changing
> io_wait_to_kiocb() to be an inline function instead of a macro could help ?
So it would seem. The following experimental patch indeed makes
the warnings disappear:
--- linux-2.6.20-rc4-mm1-orig/include/linux/aio.h 2007-01-12 10:33:12.000000000 +0100
+++ linux-2.6.20-rc4-mm1-work/include/linux/aio.h 2007-01-12 18:31:16.000000000 +0100
@@ -243,8 +243,12 @@
-#define io_wait_to_kiocb(io_wait) container_of(container_of(io_wait, \
- struct wait_bit_queue, wait), struct kiocb, ki_wait)
+static inline struct kiocb *io_wait_to_kiocb(wait_queue_t *io_wait)
+{
+ struct wait_bit_queue *wbqptr =
+ container_of(io_wait, struct wait_bit_queue, wait);
+ return container_of(wbqptr, struct kiocb, ki_wait);
+}
#include <linux/aio_abi.h>
Compile checked only - please review.
Thanks
Tilman
--
Tilman Schmidt E-Mail: tilman@imap.cc
Bonn, Germany
Diese Nachricht besteht zu 100% aus wiederverwerteten Bits.
Ungeöffnet mindestens haltbar bis: (siehe Rückseite)
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 250 bytes --]
^ permalink raw reply [flat|nested] 93+ messages in thread
* [-mm patch] remove tcp header from tcp_v4_check
2007-01-12 6:26 2.6.20-rc4-mm1 Andrew Morton
` (3 preceding siblings ...)
2007-01-12 11:55 ` spurious sparse warnings from linux/aio.h (was: 2.6.20-rc4-mm1) Tilman Schmidt
@ 2007-01-12 13:33 ` Frederik Deweerdt
2007-01-12 13:55 ` [-mm patch] remove tcp header from tcp_v4_check (take #2) Frederik Deweerdt
2007-01-13 7:27 ` 2.6.20-rc4-mm1: status of sn9c102_pas202bca? Adrian Bunk
` (13 subsequent siblings)
18 siblings, 1 reply; 93+ messages in thread
From: Frederik Deweerdt @ 2007-01-12 13:33 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel, davem
On Thu, Jan 11, 2007 at 10:26:27PM -0800, Andrew Morton wrote:
>
> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.20-rc3/2.6.20-rc4-mm1/
>
Hi,
The tcphdr struct passed to tcp_v4_check is not used, the following
patch removes it from the parameter list.
(This adds the netfilter modifications missing in the patch I sent
for rc3-mm1)
Regards,
Frederik
Index: 2.6.20-rc4-mm1/include/net/tcp.h
===================================================================
--- 2.6.20-rc4-mm1.orig/include/net/tcp.h 2007-01-12 11:19:16.000000000 +0100
+++ 2.6.20-rc4-mm1/include/net/tcp.h 2007-01-12 11:21:43.000000000 +0100
@@ -802,9 +802,8 @@
/*
* Calculate(/check) TCP checksum
*/
-static inline __sum16 tcp_v4_check(struct tcphdr *th, int len,
- __be32 saddr, __be32 daddr,
- __wsum base)
+static inline __sum16 tcp_v4_check(int len, __be32 saddr,
+ __be32 daddr, __wsum base)
{
return csum_tcpudp_magic(saddr,daddr,len,IPPROTO_TCP,base);
}
Index: 2.6.20-rc4-mm1/net/ipv4/netfilter/ipt_REJECT.c
===================================================================
--- 2.6.20-rc4-mm1.orig/net/ipv4/netfilter/ipt_REJECT.c 2007-01-12 11:19:16.000000000 +0100
+++ 2.6.20-rc4-mm1/net/ipv4/netfilter/ipt_REJECT.c 2007-01-12 11:21:43.000000000 +0100
@@ -116,11 +116,11 @@
/* Adjust TCP checksum */
tcph->check = 0;
- tcph->check = tcp_v4_check(tcph, sizeof(struct tcphdr),
+ tcph->check = tcp_v4_check(sizeof(struct tcphdr),
nskb->nh.iph->saddr,
nskb->nh.iph->daddr,
csum_partial((char *)tcph,
- sizeof(struct tcphdr), 0));
+ sizeof(struct tcphdr), 0));
/* Set DF, id = 0 */
nskb->nh.iph->frag_off = htons(IP_DF);
Index: 2.6.20-rc4-mm1/net/ipv4/tcp_ipv4.c
===================================================================
--- 2.6.20-rc4-mm1.orig/net/ipv4/tcp_ipv4.c 2007-01-12 11:19:16.000000000 +0100
+++ 2.6.20-rc4-mm1/net/ipv4/tcp_ipv4.c 2007-01-12 11:21:43.000000000 +0100
@@ -502,11 +502,11 @@
struct tcphdr *th = skb->h.th;
if (skb->ip_summed == CHECKSUM_PARTIAL) {
- th->check = ~tcp_v4_check(th, len,
- inet->saddr, inet->daddr, 0);
+ th->check = ~tcp_v4_check(len, inet->saddr,
+ inet->daddr, 0);
skb->csum_offset = offsetof(struct tcphdr, check);
} else {
- th->check = tcp_v4_check(th, len, inet->saddr, inet->daddr,
+ th->check = tcp_v4_check(len, inet->saddr, inet->daddr,
csum_partial((char *)th,
th->doff << 2,
skb->csum));
@@ -525,7 +525,7 @@
th = skb->h.th;
th->check = 0;
- th->check = ~tcp_v4_check(th, skb->len, iph->saddr, iph->daddr, 0);
+ th->check = ~tcp_v4_check(skb->len, iph->saddr, iph->daddr, 0);
skb->csum_offset = offsetof(struct tcphdr, check);
skb->ip_summed = CHECKSUM_PARTIAL;
return 0;
@@ -747,7 +747,7 @@
if (skb) {
struct tcphdr *th = skb->h.th;
- th->check = tcp_v4_check(th, skb->len,
+ th->check = tcp_v4_check(skb->len,
ireq->loc_addr,
ireq->rmt_addr,
csum_partial((char *)th, skb->len,
@@ -1514,7 +1514,7 @@
static __sum16 tcp_v4_checksum_init(struct sk_buff *skb)
{
if (skb->ip_summed == CHECKSUM_COMPLETE) {
- if (!tcp_v4_check(skb->h.th, skb->len, skb->nh.iph->saddr,
+ if (!tcp_v4_check(skb->len, skb->nh.iph->saddr,
skb->nh.iph->daddr, skb->csum)) {
skb->ip_summed = CHECKSUM_UNNECESSARY;
return 0;
Index: 2.6.20-rc4-mm1/net/ipv4/netfilter/ip_nat_helper.c
===================================================================
--- 2.6.20-rc4-mm1.orig/net/ipv4/netfilter/ip_nat_helper.c 2007-01-12 11:19:56.000000000 +0100
+++ 2.6.20-rc4-mm1/net/ipv4/netfilter/ip_nat_helper.c 2007-01-12 11:21:43.000000000 +0100
@@ -183,7 +183,7 @@
datalen = (*pskb)->len - iph->ihl*4;
if ((*pskb)->ip_summed != CHECKSUM_PARTIAL) {
tcph->check = 0;
- tcph->check = tcp_v4_check(tcph, datalen,
+ tcph->check = tcp_v4_check(datalen,
iph->saddr, iph->daddr,
csum_partial((char *)tcph,
datalen, 0));
Index: 2.6.20-rc4-mm1/net/ipv4/netfilter/nf_nat_helper.c
===================================================================
--- 2.6.20-rc4-mm1.orig/net/ipv4/netfilter/nf_nat_helper.c 2007-01-12 11:20:50.000000000 +0100
+++ 2.6.20-rc4-mm1/net/ipv4/netfilter/nf_nat_helper.c 2007-01-12 11:21:43.000000000 +0100
@@ -176,7 +176,7 @@
datalen = (*pskb)->len - iph->ihl*4;
if ((*pskb)->ip_summed != CHECKSUM_PARTIAL) {
tcph->check = 0;
- tcph->check = tcp_v4_check(tcph, datalen,
+ tcph->check = tcp_v4_check(datalen,
iph->saddr, iph->daddr,
csum_partial((char *)tcph,
datalen, 0));
^ permalink raw reply [flat|nested] 93+ messages in thread* [-mm patch] remove tcp header from tcp_v4_check (take #2)
2007-01-12 13:33 ` [-mm patch] remove tcp header from tcp_v4_check Frederik Deweerdt
@ 2007-01-12 13:55 ` Frederik Deweerdt
2007-02-05 0:44 ` David Miller
0 siblings, 1 reply; 93+ messages in thread
From: Frederik Deweerdt @ 2007-01-12 13:55 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel, davem
On Fri, Jan 12, 2007 at 01:33:09PM +0000, Frederik Deweerdt wrote:
> On Thu, Jan 11, 2007 at 10:26:27PM -0800, Andrew Morton wrote:
> >
> > ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.20-rc3/2.6.20-rc4-mm1/
> >
Hi,
Sorry for the resend, I forgot the Signed-off-by line, and noticed a
whitespace breakage in ipt_REJECT.
The tcphdr struct passed to tcp_v4_check is not used, the following
patch removes it from the parameter list.
This adds the netfilter modifications missing in the patch I sent
for rc3-mm1.
Regards,
Frederik
Signed-off-by: Frederik Deweerdt <frederik.deweerdt@gmail.com>
Index: 2.6.20-rc4-mm1-tcp/include/net/tcp.h
===================================================================
--- 2.6.20-rc4-mm1-tcp.orig/include/net/tcp.h 2007-01-12 11:55:05.000000000 +0100
+++ 2.6.20-rc4-mm1-tcp/include/net/tcp.h 2007-01-12 11:56:47.000000000 +0100
@@ -802,9 +802,8 @@
/*
* Calculate(/check) TCP checksum
*/
-static inline __sum16 tcp_v4_check(struct tcphdr *th, int len,
- __be32 saddr, __be32 daddr,
- __wsum base)
+static inline __sum16 tcp_v4_check(int len, __be32 saddr,
+ __be32 daddr, __wsum base)
{
return csum_tcpudp_magic(saddr,daddr,len,IPPROTO_TCP,base);
}
Index: 2.6.20-rc4-mm1-tcp/net/ipv4/netfilter/ipt_REJECT.c
===================================================================
--- 2.6.20-rc4-mm1-tcp.orig/net/ipv4/netfilter/ipt_REJECT.c 2007-01-12 11:55:05.000000000 +0100
+++ 2.6.20-rc4-mm1-tcp/net/ipv4/netfilter/ipt_REJECT.c 2007-01-12 14:47:07.000000000 +0100
@@ -116,7 +116,7 @@
/* Adjust TCP checksum */
tcph->check = 0;
- tcph->check = tcp_v4_check(tcph, sizeof(struct tcphdr),
+ tcph->check = tcp_v4_check(sizeof(struct tcphdr),
nskb->nh.iph->saddr,
nskb->nh.iph->daddr,
csum_partial((char *)tcph,
Index: 2.6.20-rc4-mm1-tcp/net/ipv4/tcp_ipv4.c
===================================================================
--- 2.6.20-rc4-mm1-tcp.orig/net/ipv4/tcp_ipv4.c 2007-01-12 11:55:19.000000000 +0100
+++ 2.6.20-rc4-mm1-tcp/net/ipv4/tcp_ipv4.c 2007-01-12 11:56:47.000000000 +0100
@@ -502,11 +502,11 @@
struct tcphdr *th = skb->h.th;
if (skb->ip_summed == CHECKSUM_PARTIAL) {
- th->check = ~tcp_v4_check(th, len,
- inet->saddr, inet->daddr, 0);
+ th->check = ~tcp_v4_check(len, inet->saddr,
+ inet->daddr, 0);
skb->csum_offset = offsetof(struct tcphdr, check);
} else {
- th->check = tcp_v4_check(th, len, inet->saddr, inet->daddr,
+ th->check = tcp_v4_check(len, inet->saddr, inet->daddr,
csum_partial((char *)th,
th->doff << 2,
skb->csum));
@@ -525,7 +525,7 @@
th = skb->h.th;
th->check = 0;
- th->check = ~tcp_v4_check(th, skb->len, iph->saddr, iph->daddr, 0);
+ th->check = ~tcp_v4_check(skb->len, iph->saddr, iph->daddr, 0);
skb->csum_offset = offsetof(struct tcphdr, check);
skb->ip_summed = CHECKSUM_PARTIAL;
return 0;
@@ -747,7 +747,7 @@
if (skb) {
struct tcphdr *th = skb->h.th;
- th->check = tcp_v4_check(th, skb->len,
+ th->check = tcp_v4_check(skb->len,
ireq->loc_addr,
ireq->rmt_addr,
csum_partial((char *)th, skb->len,
@@ -1514,7 +1514,7 @@
static __sum16 tcp_v4_checksum_init(struct sk_buff *skb)
{
if (skb->ip_summed == CHECKSUM_COMPLETE) {
- if (!tcp_v4_check(skb->h.th, skb->len, skb->nh.iph->saddr,
+ if (!tcp_v4_check(skb->len, skb->nh.iph->saddr,
skb->nh.iph->daddr, skb->csum)) {
skb->ip_summed = CHECKSUM_UNNECESSARY;
return 0;
Index: 2.6.20-rc4-mm1-tcp/net/ipv4/netfilter/ip_nat_helper.c
===================================================================
--- 2.6.20-rc4-mm1-tcp.orig/net/ipv4/netfilter/ip_nat_helper.c 2007-01-12 11:55:05.000000000 +0100
+++ 2.6.20-rc4-mm1-tcp/net/ipv4/netfilter/ip_nat_helper.c 2007-01-12 11:56:47.000000000 +0100
@@ -183,7 +183,7 @@
datalen = (*pskb)->len - iph->ihl*4;
if ((*pskb)->ip_summed != CHECKSUM_PARTIAL) {
tcph->check = 0;
- tcph->check = tcp_v4_check(tcph, datalen,
+ tcph->check = tcp_v4_check(datalen,
iph->saddr, iph->daddr,
csum_partial((char *)tcph,
datalen, 0));
Index: 2.6.20-rc4-mm1-tcp/net/ipv4/netfilter/nf_nat_helper.c
===================================================================
--- 2.6.20-rc4-mm1-tcp.orig/net/ipv4/netfilter/nf_nat_helper.c 2007-01-12 11:55:05.000000000 +0100
+++ 2.6.20-rc4-mm1-tcp/net/ipv4/netfilter/nf_nat_helper.c 2007-01-12 11:56:47.000000000 +0100
@@ -176,7 +176,7 @@
datalen = (*pskb)->len - iph->ihl*4;
if ((*pskb)->ip_summed != CHECKSUM_PARTIAL) {
tcph->check = 0;
- tcph->check = tcp_v4_check(tcph, datalen,
+ tcph->check = tcp_v4_check(datalen,
iph->saddr, iph->daddr,
csum_partial((char *)tcph,
datalen, 0));
^ permalink raw reply [flat|nested] 93+ messages in thread* Re: [-mm patch] remove tcp header from tcp_v4_check (take #2)
2007-01-12 13:55 ` [-mm patch] remove tcp header from tcp_v4_check (take #2) Frederik Deweerdt
@ 2007-02-05 0:44 ` David Miller
0 siblings, 0 replies; 93+ messages in thread
From: David Miller @ 2007-02-05 0:44 UTC (permalink / raw)
To: deweerdt; +Cc: akpm, linux-kernel
From: Frederik Deweerdt <deweerdt@free.fr>
Date: Fri, 12 Jan 2007 13:55:14 +0000
> On Fri, Jan 12, 2007 at 01:33:09PM +0000, Frederik Deweerdt wrote:
> > On Thu, Jan 11, 2007 at 10:26:27PM -0800, Andrew Morton wrote:
> > >
> > > ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.20-rc3/2.6.20-rc4-mm1/
> > >
> Hi,
>
> Sorry for the resend, I forgot the Signed-off-by line, and noticed a
> whitespace breakage in ipt_REJECT.
> The tcphdr struct passed to tcp_v4_check is not used, the following
> patch removes it from the parameter list.
> This adds the netfilter modifications missing in the patch I sent
> for rc3-mm1.
>
> Regards,
> Frederik
>
> Signed-off-by: Frederik Deweerdt <frederik.deweerdt@gmail.com>
Applied, thanks Frederik.
^ permalink raw reply [flat|nested] 93+ messages in thread
* 2.6.20-rc4-mm1: status of sn9c102_pas202bca?
2007-01-12 6:26 2.6.20-rc4-mm1 Andrew Morton
` (4 preceding siblings ...)
2007-01-12 13:33 ` [-mm patch] remove tcp header from tcp_v4_check Frederik Deweerdt
@ 2007-01-13 7:27 ` Adrian Bunk
2007-01-15 11:34 ` Mauro Carvalho Chehab
2007-01-13 9:56 ` [-mm patch] make mmc_sysfs.c:mmc_key_type static Adrian Bunk
` (12 subsequent siblings)
18 siblings, 1 reply; 93+ messages in thread
From: Adrian Bunk @ 2007-01-13 7:27 UTC (permalink / raw)
To: Andrew Morton, mchehab; +Cc: linux-kernel, v4l-dvb-maintainer
On Thu, Jan 11, 2007 at 10:26:27PM -0800, Andrew Morton wrote:
>...
> Changes since 2.6.20-rc3-mm1:
>...
> git-dvb.patch
>...
> git trees
>...
drivers/media/video/sn9c102/sn9c102_pas202bca.c is no longer used or
built but still shipped.
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
^ permalink raw reply [flat|nested] 93+ messages in thread* Re: 2.6.20-rc4-mm1: status of sn9c102_pas202bca?
2007-01-13 7:27 ` 2.6.20-rc4-mm1: status of sn9c102_pas202bca? Adrian Bunk
@ 2007-01-15 11:34 ` Mauro Carvalho Chehab
0 siblings, 0 replies; 93+ messages in thread
From: Mauro Carvalho Chehab @ 2007-01-15 11:34 UTC (permalink / raw)
To: Adrian Bunk; +Cc: Andrew Morton, linux-kernel, v4l-dvb-maintainer
Hi Adrian,
Em Sáb, 2007-01-13 às 08:27 +0100, Adrian Bunk escreveu:
> On Thu, Jan 11, 2007 at 10:26:27PM -0800, Andrew Morton wrote:
> >...
> > Changes since 2.6.20-rc3-mm1:
> >...
> > git-dvb.patch
> >...
> > git trees
> >...
>
> drivers/media/video/sn9c102/sn9c102_pas202bca.c is no longer used or
> built but still shipped.
Ok, fixed and folded at the original patch. It should be at the next
git-dvb.patch, after Andrew updates it from my tree.
> cu
> Adrian
>
^ permalink raw reply [flat|nested] 93+ messages in thread
* [-mm patch] make mmc_sysfs.c:mmc_key_type static
2007-01-12 6:26 2.6.20-rc4-mm1 Andrew Morton
` (5 preceding siblings ...)
2007-01-13 7:27 ` 2.6.20-rc4-mm1: status of sn9c102_pas202bca? Adrian Bunk
@ 2007-01-13 9:56 ` Adrian Bunk
2007-01-13 22:38 ` Pierre Ossman
2007-01-13 9:56 ` [Cluster-devel] " Adrian Bunk
` (11 subsequent siblings)
18 siblings, 1 reply; 93+ messages in thread
From: Adrian Bunk @ 2007-01-13 9:56 UTC (permalink / raw)
To: Andrew Morton, Anderson Briglia, Pierre Ossman; +Cc: linux-kernel
On Thu, Jan 11, 2007 at 10:26:27PM -0800, Andrew Morton wrote:
>...
> Changes since 2.6.20-rc3-mm1:
>...
> git-mmc.patch
>...
> git trees
>...
This patch makes the needlessly global struct mmc_key_type static.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
drivers/mmc/mmc.h | 1 -
drivers/mmc/mmc_sysfs.c | 4 +++-
2 files changed, 3 insertions(+), 2 deletions(-)
--- linux-2.6.20-rc4-mm1/drivers/mmc/mmc.h.old 2007-01-13 08:28:31.000000000 +0100
+++ linux-2.6.20-rc4-mm1/drivers/mmc/mmc.h 2007-01-13 08:28:38.000000000 +0100
@@ -20,7 +20,6 @@
void mmc_free_host_sysfs(struct mmc_host *host);
/* core-internal data */
-extern struct key_type mmc_key_type;
struct mmc_key_payload {
struct rcu_head rcu; /* RCU destructor */
unsigned short datalen; /* length of this data */
--- linux-2.6.20-rc4-mm1/drivers/mmc/mmc_sysfs.c.old 2007-01-13 08:28:44.000000000 +0100
+++ linux-2.6.20-rc4-mm1/drivers/mmc/mmc_sysfs.c 2007-01-13 08:29:21.000000000 +0100
@@ -66,6 +66,8 @@
static struct device_attribute mmc_dev_attr_scr = MMC_ATTR_RO(scr);
+static struct key_type mmc_key_type;
+
#ifdef CONFIG_MMC_PASSWORDS
static ssize_t
@@ -432,7 +434,7 @@
kfree(mpayload);
}
-struct key_type mmc_key_type = {
+static struct key_type mmc_key_type = {
.name = "mmc",
.def_datalen = MMC_KEYLEN_MAXBYTES,
.instantiate = mmc_key_instantiate,
^ permalink raw reply [flat|nested] 93+ messages in thread* [-mm patch] make gfs2_change_nlink_i() static
2007-01-12 6:26 2.6.20-rc4-mm1 Andrew Morton
@ 2007-01-13 9:56 ` Adrian Bunk
2007-01-12 10:25 ` 2.6.20-rc4-mm1 Mariusz Kozlowski
` (17 subsequent siblings)
18 siblings, 0 replies; 93+ messages in thread
From: Adrian Bunk @ 2007-01-13 9:56 UTC (permalink / raw)
To: Andrew Morton, swhiteho; +Cc: linux-kernel, cluster-devel
On Thu, Jan 11, 2007 at 10:26:27PM -0800, Andrew Morton wrote:
>...
> Changes since 2.6.20-rc3-mm1:
>...
> git-gfs2-nmw.patch
>...
> git trees
>...
This patch makes the needlessly globlal gfs2_change_nlink_i() static.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
fs/gfs2/inode.c | 88 ++++++++++++++++++++++++------------------------
fs/gfs2/inode.h | 1
2 files changed, 44 insertions(+), 45 deletions(-)
--- linux-2.6.20-rc4-mm1/fs/gfs2/inode.h.old 2007-01-13 08:56:24.000000000 +0100
+++ linux-2.6.20-rc4-mm1/fs/gfs2/inode.h 2007-01-13 08:56:30.000000000 +0100
@@ -40,7 +40,6 @@
int gfs2_dinode_dealloc(struct gfs2_inode *inode);
int gfs2_change_nlink(struct gfs2_inode *ip, int diff);
-int gfs2_change_nlink_i(struct gfs2_inode *ip);
struct inode *gfs2_lookupi(struct inode *dir, const struct qstr *name,
int is_root, struct nameidata *nd);
struct inode *gfs2_createi(struct gfs2_holder *ghs, const struct qstr *name,
--- linux-2.6.20-rc4-mm1/fs/gfs2/inode.c.old 2007-01-13 08:56:37.000000000 +0100
+++ linux-2.6.20-rc4-mm1/fs/gfs2/inode.c 2007-01-13 08:57:21.000000000 +0100
@@ -280,6 +280,50 @@
return error;
}
+static int gfs2_change_nlink_i(struct gfs2_inode *ip)
+{
+ struct gfs2_sbd *sdp = ip->i_inode.i_sb->s_fs_info;
+ struct gfs2_inode *rindex = GFS2_I(sdp->sd_rindex);
+ struct gfs2_glock *ri_gl = rindex->i_gl;
+ struct gfs2_rgrpd *rgd;
+ struct gfs2_holder ri_gh, rg_gh;
+ int existing, error;
+
+ /* if we come from rename path, we could have the lock already */
+ existing = gfs2_glock_is_locked_by_me(ri_gl);
+ if (!existing) {
+ error = gfs2_rindex_hold(sdp, &ri_gh);
+ if (error)
+ goto out;
+ }
+
+ /* find the matching rgd */
+ error = -EIO;
+ rgd = gfs2_blk2rgrpd(sdp, ip->i_num.no_addr);
+ if (!rgd)
+ goto out_norgrp;
+
+ /*
+ * Eventually we may want to move rgd(s) to a linked list
+ * and piggyback the free logic into one of gfs2 daemons
+ * to gain some performance.
+ */
+ if (!rgd->rd_gl || !gfs2_glock_is_locked_by_me(rgd->rd_gl)) {
+ error = gfs2_glock_nq_init(rgd->rd_gl, LM_ST_EXCLUSIVE, 0, &rg_gh);
+ if (error)
+ goto out_norgrp;
+
+ gfs2_unlink_di(&ip->i_inode); /* mark inode unlinked */
+ gfs2_glock_dq_uninit(&rg_gh);
+ }
+
+out_norgrp:
+ if (!existing)
+ gfs2_glock_dq_uninit(&ri_gh);
+out:
+ return error;
+}
+
/**
* gfs2_change_nlink - Change nlink count on inode
* @ip: The GFS2 inode
@@ -326,50 +370,6 @@
return error;
}
-int gfs2_change_nlink_i(struct gfs2_inode *ip)
-{
- struct gfs2_sbd *sdp = ip->i_inode.i_sb->s_fs_info;
- struct gfs2_inode *rindex = GFS2_I(sdp->sd_rindex);
- struct gfs2_glock *ri_gl = rindex->i_gl;
- struct gfs2_rgrpd *rgd;
- struct gfs2_holder ri_gh, rg_gh;
- int existing, error;
-
- /* if we come from rename path, we could have the lock already */
- existing = gfs2_glock_is_locked_by_me(ri_gl);
- if (!existing) {
- error = gfs2_rindex_hold(sdp, &ri_gh);
- if (error)
- goto out;
- }
-
- /* find the matching rgd */
- error = -EIO;
- rgd = gfs2_blk2rgrpd(sdp, ip->i_num.no_addr);
- if (!rgd)
- goto out_norgrp;
-
- /*
- * Eventually we may want to move rgd(s) to a linked list
- * and piggyback the free logic into one of gfs2 daemons
- * to gain some performance.
- */
- if (!rgd->rd_gl || !gfs2_glock_is_locked_by_me(rgd->rd_gl)) {
- error = gfs2_glock_nq_init(rgd->rd_gl, LM_ST_EXCLUSIVE, 0, &rg_gh);
- if (error)
- goto out_norgrp;
-
- gfs2_unlink_di(&ip->i_inode); /* mark inode unlinked */
- gfs2_glock_dq_uninit(&rg_gh);
- }
-
-out_norgrp:
- if (!existing)
- gfs2_glock_dq_uninit(&ri_gh);
-out:
- return error;
-}
-
struct inode *gfs2_lookup_simple(struct inode *dip, const char *name)
{
struct qstr qstr;
^ permalink raw reply [flat|nested] 93+ messages in thread* [Cluster-devel] [-mm patch] make gfs2_change_nlink_i() static
@ 2007-01-13 9:56 ` Adrian Bunk
0 siblings, 0 replies; 93+ messages in thread
From: Adrian Bunk @ 2007-01-13 9:56 UTC (permalink / raw)
To: cluster-devel.redhat.com
On Thu, Jan 11, 2007 at 10:26:27PM -0800, Andrew Morton wrote:
>...
> Changes since 2.6.20-rc3-mm1:
>...
> git-gfs2-nmw.patch
>...
> git trees
>...
This patch makes the needlessly globlal gfs2_change_nlink_i() static.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
fs/gfs2/inode.c | 88 ++++++++++++++++++++++++------------------------
fs/gfs2/inode.h | 1
2 files changed, 44 insertions(+), 45 deletions(-)
--- linux-2.6.20-rc4-mm1/fs/gfs2/inode.h.old 2007-01-13 08:56:24.000000000 +0100
+++ linux-2.6.20-rc4-mm1/fs/gfs2/inode.h 2007-01-13 08:56:30.000000000 +0100
@@ -40,7 +40,6 @@
int gfs2_dinode_dealloc(struct gfs2_inode *inode);
int gfs2_change_nlink(struct gfs2_inode *ip, int diff);
-int gfs2_change_nlink_i(struct gfs2_inode *ip);
struct inode *gfs2_lookupi(struct inode *dir, const struct qstr *name,
int is_root, struct nameidata *nd);
struct inode *gfs2_createi(struct gfs2_holder *ghs, const struct qstr *name,
--- linux-2.6.20-rc4-mm1/fs/gfs2/inode.c.old 2007-01-13 08:56:37.000000000 +0100
+++ linux-2.6.20-rc4-mm1/fs/gfs2/inode.c 2007-01-13 08:57:21.000000000 +0100
@@ -280,6 +280,50 @@
return error;
}
+static int gfs2_change_nlink_i(struct gfs2_inode *ip)
+{
+ struct gfs2_sbd *sdp = ip->i_inode.i_sb->s_fs_info;
+ struct gfs2_inode *rindex = GFS2_I(sdp->sd_rindex);
+ struct gfs2_glock *ri_gl = rindex->i_gl;
+ struct gfs2_rgrpd *rgd;
+ struct gfs2_holder ri_gh, rg_gh;
+ int existing, error;
+
+ /* if we come from rename path, we could have the lock already */
+ existing = gfs2_glock_is_locked_by_me(ri_gl);
+ if (!existing) {
+ error = gfs2_rindex_hold(sdp, &ri_gh);
+ if (error)
+ goto out;
+ }
+
+ /* find the matching rgd */
+ error = -EIO;
+ rgd = gfs2_blk2rgrpd(sdp, ip->i_num.no_addr);
+ if (!rgd)
+ goto out_norgrp;
+
+ /*
+ * Eventually we may want to move rgd(s) to a linked list
+ * and piggyback the free logic into one of gfs2 daemons
+ * to gain some performance.
+ */
+ if (!rgd->rd_gl || !gfs2_glock_is_locked_by_me(rgd->rd_gl)) {
+ error = gfs2_glock_nq_init(rgd->rd_gl, LM_ST_EXCLUSIVE, 0, &rg_gh);
+ if (error)
+ goto out_norgrp;
+
+ gfs2_unlink_di(&ip->i_inode); /* mark inode unlinked */
+ gfs2_glock_dq_uninit(&rg_gh);
+ }
+
+out_norgrp:
+ if (!existing)
+ gfs2_glock_dq_uninit(&ri_gh);
+out:
+ return error;
+}
+
/**
* gfs2_change_nlink - Change nlink count on inode
* @ip: The GFS2 inode
@@ -326,50 +370,6 @@
return error;
}
-int gfs2_change_nlink_i(struct gfs2_inode *ip)
-{
- struct gfs2_sbd *sdp = ip->i_inode.i_sb->s_fs_info;
- struct gfs2_inode *rindex = GFS2_I(sdp->sd_rindex);
- struct gfs2_glock *ri_gl = rindex->i_gl;
- struct gfs2_rgrpd *rgd;
- struct gfs2_holder ri_gh, rg_gh;
- int existing, error;
-
- /* if we come from rename path, we could have the lock already */
- existing = gfs2_glock_is_locked_by_me(ri_gl);
- if (!existing) {
- error = gfs2_rindex_hold(sdp, &ri_gh);
- if (error)
- goto out;
- }
-
- /* find the matching rgd */
- error = -EIO;
- rgd = gfs2_blk2rgrpd(sdp, ip->i_num.no_addr);
- if (!rgd)
- goto out_norgrp;
-
- /*
- * Eventually we may want to move rgd(s) to a linked list
- * and piggyback the free logic into one of gfs2 daemons
- * to gain some performance.
- */
- if (!rgd->rd_gl || !gfs2_glock_is_locked_by_me(rgd->rd_gl)) {
- error = gfs2_glock_nq_init(rgd->rd_gl, LM_ST_EXCLUSIVE, 0, &rg_gh);
- if (error)
- goto out_norgrp;
-
- gfs2_unlink_di(&ip->i_inode); /* mark inode unlinked */
- gfs2_glock_dq_uninit(&rg_gh);
- }
-
-out_norgrp:
- if (!existing)
- gfs2_glock_dq_uninit(&ri_gh);
-out:
- return error;
-}
-
struct inode *gfs2_lookup_simple(struct inode *dip, const char *name)
{
struct qstr qstr;
^ permalink raw reply [flat|nested] 93+ messages in thread* Re: [-mm patch] make gfs2_change_nlink_i() static
2007-01-13 9:56 ` [Cluster-devel] " Adrian Bunk
@ 2007-01-15 10:31 ` Steven Whitehouse
-1 siblings, 0 replies; 93+ messages in thread
From: Steven Whitehouse @ 2007-01-15 10:31 UTC (permalink / raw)
To: Adrian Bunk; +Cc: Andrew Morton, linux-kernel, cluster-devel
Hi,
On Sat, 2007-01-13 at 10:56 +0100, Adrian Bunk wrote:
> On Thu, Jan 11, 2007 at 10:26:27PM -0800, Andrew Morton wrote:
> >...
> > Changes since 2.6.20-rc3-mm1:
> >...
> > git-gfs2-nmw.patch
> >...
> > git trees
> >...
>
>
> This patch makes the needlessly globlal gfs2_change_nlink_i() static.
>
> Signed-off-by: Adrian Bunk <bunk@stusta.de>
>
Now applied to the GFS2 -nme git tree. Thanks,
Steve.
^ permalink raw reply [flat|nested] 93+ messages in thread
* [Cluster-devel] Re: [-mm patch] make gfs2_change_nlink_i() static
@ 2007-01-15 10:31 ` Steven Whitehouse
0 siblings, 0 replies; 93+ messages in thread
From: Steven Whitehouse @ 2007-01-15 10:31 UTC (permalink / raw)
To: cluster-devel.redhat.com
Hi,
On Sat, 2007-01-13 at 10:56 +0100, Adrian Bunk wrote:
> On Thu, Jan 11, 2007 at 10:26:27PM -0800, Andrew Morton wrote:
> >...
> > Changes since 2.6.20-rc3-mm1:
> >...
> > git-gfs2-nmw.patch
> >...
> > git trees
> >...
>
>
> This patch makes the needlessly globlal gfs2_change_nlink_i() static.
>
> Signed-off-by: Adrian Bunk <bunk@stusta.de>
>
Now applied to the GFS2 -nme git tree. Thanks,
Steve.
^ permalink raw reply [flat|nested] 93+ messages in thread
* Re: [Cluster-devel] [-mm patch] make gfs2_change_nlink_i() static
2007-01-13 9:56 ` [Cluster-devel] " Adrian Bunk
@ 2007-01-16 21:04 ` Wendy Cheng
-1 siblings, 0 replies; 93+ messages in thread
From: Wendy Cheng @ 2007-01-16 21:04 UTC (permalink / raw)
To: Adrian Bunk; +Cc: Andrew Morton, swhiteho, cluster-devel, linux-kernel
Adrian Bunk wrote:
> On Thu, Jan 11, 2007 at 10:26:27PM -0800, Andrew Morton wrote:
>
>> ...
>> Changes since 2.6.20-rc3-mm1:
>> ...
>> git-gfs2-nmw.patch
>> ...
>> git trees
>> ...
>>
>
>
> This patch makes the needlessly globlal gfs2_change_nlink_i() static.
>
We will probably need to call this routine from other files in our next
round of code check-in.
-- Wendy
> Signed-off-by: Adrian Bunk <bunk@stusta.de>
>
> ---
>
> fs/gfs2/inode.c | 88 ++++++++++++++++++++++++------------------------
> fs/gfs2/inode.h | 1
> 2 files changed, 44 insertions(+), 45 deletions(-)
>
> --- linux-2.6.20-rc4-mm1/fs/gfs2/inode.h.old 2007-01-13 08:56:24.000000000 +0100
> +++ linux-2.6.20-rc4-mm1/fs/gfs2/inode.h 2007-01-13 08:56:30.000000000 +0100
> @@ -40,7 +40,6 @@
>
> int gfs2_dinode_dealloc(struct gfs2_inode *inode);
> int gfs2_change_nlink(struct gfs2_inode *ip, int diff);
> -int gfs2_change_nlink_i(struct gfs2_inode *ip);
> struct inode *gfs2_lookupi(struct inode *dir, const struct qstr *name,
> int is_root, struct nameidata *nd);
> struct inode *gfs2_createi(struct gfs2_holder *ghs, const struct qstr *name,
> --- linux-2.6.20-rc4-mm1/fs/gfs2/inode.c.old 2007-01-13 08:56:37.000000000 +0100
> +++ linux-2.6.20-rc4-mm1/fs/gfs2/inode.c 2007-01-13 08:57:21.000000000 +0100
> @@ -280,6 +280,50 @@
> return error;
> }
>
> +static int gfs2_change_nlink_i(struct gfs2_inode *ip)
> +{
> + struct gfs2_sbd *sdp = ip->i_inode.i_sb->s_fs_info;
> + struct gfs2_inode *rindex = GFS2_I(sdp->sd_rindex);
> + struct gfs2_glock *ri_gl = rindex->i_gl;
> + struct gfs2_rgrpd *rgd;
> + struct gfs2_holder ri_gh, rg_gh;
> + int existing, error;
> +
> + /* if we come from rename path, we could have the lock already */
> + existing = gfs2_glock_is_locked_by_me(ri_gl);
> + if (!existing) {
> + error = gfs2_rindex_hold(sdp, &ri_gh);
> + if (error)
> + goto out;
> + }
> +
> + /* find the matching rgd */
> + error = -EIO;
> + rgd = gfs2_blk2rgrpd(sdp, ip->i_num.no_addr);
> + if (!rgd)
> + goto out_norgrp;
> +
> + /*
> + * Eventually we may want to move rgd(s) to a linked list
> + * and piggyback the free logic into one of gfs2 daemons
> + * to gain some performance.
> + */
> + if (!rgd->rd_gl || !gfs2_glock_is_locked_by_me(rgd->rd_gl)) {
> + error = gfs2_glock_nq_init(rgd->rd_gl, LM_ST_EXCLUSIVE, 0, &rg_gh);
> + if (error)
> + goto out_norgrp;
> +
> + gfs2_unlink_di(&ip->i_inode); /* mark inode unlinked */
> + gfs2_glock_dq_uninit(&rg_gh);
> + }
> +
> +out_norgrp:
> + if (!existing)
> + gfs2_glock_dq_uninit(&ri_gh);
> +out:
> + return error;
> +}
> +
> /**
> * gfs2_change_nlink - Change nlink count on inode
> * @ip: The GFS2 inode
> @@ -326,50 +370,6 @@
> return error;
> }
>
> -int gfs2_change_nlink_i(struct gfs2_inode *ip)
> -{
> - struct gfs2_sbd *sdp = ip->i_inode.i_sb->s_fs_info;
> - struct gfs2_inode *rindex = GFS2_I(sdp->sd_rindex);
> - struct gfs2_glock *ri_gl = rindex->i_gl;
> - struct gfs2_rgrpd *rgd;
> - struct gfs2_holder ri_gh, rg_gh;
> - int existing, error;
> -
> - /* if we come from rename path, we could have the lock already */
> - existing = gfs2_glock_is_locked_by_me(ri_gl);
> - if (!existing) {
> - error = gfs2_rindex_hold(sdp, &ri_gh);
> - if (error)
> - goto out;
> - }
> -
> - /* find the matching rgd */
> - error = -EIO;
> - rgd = gfs2_blk2rgrpd(sdp, ip->i_num.no_addr);
> - if (!rgd)
> - goto out_norgrp;
> -
> - /*
> - * Eventually we may want to move rgd(s) to a linked list
> - * and piggyback the free logic into one of gfs2 daemons
> - * to gain some performance.
> - */
> - if (!rgd->rd_gl || !gfs2_glock_is_locked_by_me(rgd->rd_gl)) {
> - error = gfs2_glock_nq_init(rgd->rd_gl, LM_ST_EXCLUSIVE, 0, &rg_gh);
> - if (error)
> - goto out_norgrp;
> -
> - gfs2_unlink_di(&ip->i_inode); /* mark inode unlinked */
> - gfs2_glock_dq_uninit(&rg_gh);
> - }
> -
> -out_norgrp:
> - if (!existing)
> - gfs2_glock_dq_uninit(&ri_gh);
> -out:
> - return error;
> -}
> -
> struct inode *gfs2_lookup_simple(struct inode *dip, const char *name)
> {
> struct qstr qstr;
>
>
^ permalink raw reply [flat|nested] 93+ messages in thread* [Cluster-devel] [-mm patch] make gfs2_change_nlink_i() static
@ 2007-01-16 21:04 ` Wendy Cheng
0 siblings, 0 replies; 93+ messages in thread
From: Wendy Cheng @ 2007-01-16 21:04 UTC (permalink / raw)
To: cluster-devel.redhat.com
Adrian Bunk wrote:
> On Thu, Jan 11, 2007 at 10:26:27PM -0800, Andrew Morton wrote:
>
>> ...
>> Changes since 2.6.20-rc3-mm1:
>> ...
>> git-gfs2-nmw.patch
>> ...
>> git trees
>> ...
>>
>
>
> This patch makes the needlessly globlal gfs2_change_nlink_i() static.
>
We will probably need to call this routine from other files in our next
round of code check-in.
-- Wendy
> Signed-off-by: Adrian Bunk <bunk@stusta.de>
>
> ---
>
> fs/gfs2/inode.c | 88 ++++++++++++++++++++++++------------------------
> fs/gfs2/inode.h | 1
> 2 files changed, 44 insertions(+), 45 deletions(-)
>
> --- linux-2.6.20-rc4-mm1/fs/gfs2/inode.h.old 2007-01-13 08:56:24.000000000 +0100
> +++ linux-2.6.20-rc4-mm1/fs/gfs2/inode.h 2007-01-13 08:56:30.000000000 +0100
> @@ -40,7 +40,6 @@
>
> int gfs2_dinode_dealloc(struct gfs2_inode *inode);
> int gfs2_change_nlink(struct gfs2_inode *ip, int diff);
> -int gfs2_change_nlink_i(struct gfs2_inode *ip);
> struct inode *gfs2_lookupi(struct inode *dir, const struct qstr *name,
> int is_root, struct nameidata *nd);
> struct inode *gfs2_createi(struct gfs2_holder *ghs, const struct qstr *name,
> --- linux-2.6.20-rc4-mm1/fs/gfs2/inode.c.old 2007-01-13 08:56:37.000000000 +0100
> +++ linux-2.6.20-rc4-mm1/fs/gfs2/inode.c 2007-01-13 08:57:21.000000000 +0100
> @@ -280,6 +280,50 @@
> return error;
> }
>
> +static int gfs2_change_nlink_i(struct gfs2_inode *ip)
> +{
> + struct gfs2_sbd *sdp = ip->i_inode.i_sb->s_fs_info;
> + struct gfs2_inode *rindex = GFS2_I(sdp->sd_rindex);
> + struct gfs2_glock *ri_gl = rindex->i_gl;
> + struct gfs2_rgrpd *rgd;
> + struct gfs2_holder ri_gh, rg_gh;
> + int existing, error;
> +
> + /* if we come from rename path, we could have the lock already */
> + existing = gfs2_glock_is_locked_by_me(ri_gl);
> + if (!existing) {
> + error = gfs2_rindex_hold(sdp, &ri_gh);
> + if (error)
> + goto out;
> + }
> +
> + /* find the matching rgd */
> + error = -EIO;
> + rgd = gfs2_blk2rgrpd(sdp, ip->i_num.no_addr);
> + if (!rgd)
> + goto out_norgrp;
> +
> + /*
> + * Eventually we may want to move rgd(s) to a linked list
> + * and piggyback the free logic into one of gfs2 daemons
> + * to gain some performance.
> + */
> + if (!rgd->rd_gl || !gfs2_glock_is_locked_by_me(rgd->rd_gl)) {
> + error = gfs2_glock_nq_init(rgd->rd_gl, LM_ST_EXCLUSIVE, 0, &rg_gh);
> + if (error)
> + goto out_norgrp;
> +
> + gfs2_unlink_di(&ip->i_inode); /* mark inode unlinked */
> + gfs2_glock_dq_uninit(&rg_gh);
> + }
> +
> +out_norgrp:
> + if (!existing)
> + gfs2_glock_dq_uninit(&ri_gh);
> +out:
> + return error;
> +}
> +
> /**
> * gfs2_change_nlink - Change nlink count on inode
> * @ip: The GFS2 inode
> @@ -326,50 +370,6 @@
> return error;
> }
>
> -int gfs2_change_nlink_i(struct gfs2_inode *ip)
> -{
> - struct gfs2_sbd *sdp = ip->i_inode.i_sb->s_fs_info;
> - struct gfs2_inode *rindex = GFS2_I(sdp->sd_rindex);
> - struct gfs2_glock *ri_gl = rindex->i_gl;
> - struct gfs2_rgrpd *rgd;
> - struct gfs2_holder ri_gh, rg_gh;
> - int existing, error;
> -
> - /* if we come from rename path, we could have the lock already */
> - existing = gfs2_glock_is_locked_by_me(ri_gl);
> - if (!existing) {
> - error = gfs2_rindex_hold(sdp, &ri_gh);
> - if (error)
> - goto out;
> - }
> -
> - /* find the matching rgd */
> - error = -EIO;
> - rgd = gfs2_blk2rgrpd(sdp, ip->i_num.no_addr);
> - if (!rgd)
> - goto out_norgrp;
> -
> - /*
> - * Eventually we may want to move rgd(s) to a linked list
> - * and piggyback the free logic into one of gfs2 daemons
> - * to gain some performance.
> - */
> - if (!rgd->rd_gl || !gfs2_glock_is_locked_by_me(rgd->rd_gl)) {
> - error = gfs2_glock_nq_init(rgd->rd_gl, LM_ST_EXCLUSIVE, 0, &rg_gh);
> - if (error)
> - goto out_norgrp;
> -
> - gfs2_unlink_di(&ip->i_inode); /* mark inode unlinked */
> - gfs2_glock_dq_uninit(&rg_gh);
> - }
> -
> -out_norgrp:
> - if (!existing)
> - gfs2_glock_dq_uninit(&ri_gh);
> -out:
> - return error;
> -}
> -
> struct inode *gfs2_lookup_simple(struct inode *dip, const char *name)
> {
> struct qstr qstr;
>
>
^ permalink raw reply [flat|nested] 93+ messages in thread* Re: [Cluster-devel] [-mm patch] make gfs2_change_nlink_i() static
2007-01-16 21:04 ` Wendy Cheng
@ 2007-01-16 21:29 ` Adrian Bunk
-1 siblings, 0 replies; 93+ messages in thread
From: Adrian Bunk @ 2007-01-16 21:29 UTC (permalink / raw)
To: Wendy Cheng; +Cc: Andrew Morton, swhiteho, cluster-devel, linux-kernel
On Tue, Jan 16, 2007 at 04:04:15PM -0500, Wendy Cheng wrote:
> Adrian Bunk wrote:
> >On Thu, Jan 11, 2007 at 10:26:27PM -0800, Andrew Morton wrote:
> >
> >>...
> >>Changes since 2.6.20-rc3-mm1:
> >>...
> >> git-gfs2-nmw.patch
> >>...
> >> git trees
> >>...
> >>
> >
> >
> >This patch makes the needlessly globlal gfs2_change_nlink_i() static.
> >
> We will probably need to call this routine from other files in our next
> round of code check-in.
You can always make it global again when you use it from another file.
> -- Wendy
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
^ permalink raw reply [flat|nested] 93+ messages in thread* [Cluster-devel] [-mm patch] make gfs2_change_nlink_i() static
@ 2007-01-16 21:29 ` Adrian Bunk
0 siblings, 0 replies; 93+ messages in thread
From: Adrian Bunk @ 2007-01-16 21:29 UTC (permalink / raw)
To: cluster-devel.redhat.com
On Tue, Jan 16, 2007 at 04:04:15PM -0500, Wendy Cheng wrote:
> Adrian Bunk wrote:
> >On Thu, Jan 11, 2007 at 10:26:27PM -0800, Andrew Morton wrote:
> >
> >>...
> >>Changes since 2.6.20-rc3-mm1:
> >>...
> >> git-gfs2-nmw.patch
> >>...
> >> git trees
> >>...
> >>
> >
> >
> >This patch makes the needlessly globlal gfs2_change_nlink_i() static.
> >
> We will probably need to call this routine from other files in our next
> round of code check-in.
You can always make it global again when you use it from another file.
> -- Wendy
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
^ permalink raw reply [flat|nested] 93+ messages in thread
* 2.6.20-rc4-mm1: different values for OHCI_QUIRK_ZFMICRO
2007-01-12 6:26 2.6.20-rc4-mm1 Andrew Morton
` (7 preceding siblings ...)
2007-01-13 9:56 ` [Cluster-devel] " Adrian Bunk
@ 2007-01-14 9:10 ` Adrian Bunk
2007-01-14 14:36 ` David Brownell
2007-01-14 9:48 ` 2.6.20-rc4-mm1 Thomas Gleixner
` (9 subsequent siblings)
18 siblings, 1 reply; 93+ messages in thread
From: Adrian Bunk @ 2007-01-14 9:10 UTC (permalink / raw)
To: Andrew Morton, Benjamin Herrenschmidt, David Brownell,
Geoff Levand, Greg Kroah-Hartman, Tony Olech
Cc: linux-kernel, linux-usb-devel
<-- snip -->
...
CC drivers/usb/misc/ftdi-elan.o
/home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/usb/misc/ftdi-elan.c:2307:1: warning: "OHCI_QUIRK_ZFMICRO" redefined
In file included from /home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/usb/misc/ftdi-elan.c:76:
/home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/usb/misc/../host/ohci.h:399:1: warning: this is the location of the previous definition
...
$ grep -r ^#define * | grep OHCI_QUIRK_ZFMICRO
drivers/usb/host/ohci.h:#define OHCI_QUIRK_ZFMICRO 0x20 /* Compaq ZFMicro chipset*/
drivers/usb/host/u132-hcd.c:#define OHCI_QUIRK_ZFMICRO 0x10
drivers/usb/misc/ftdi-elan.c:#define OHCI_QUIRK_ZFMICRO 0x10
$
<-- snip -->
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
^ permalink raw reply [flat|nested] 93+ messages in thread* Re: 2.6.20-rc4-mm1: different values for OHCI_QUIRK_ZFMICRO
2007-01-14 9:10 ` 2.6.20-rc4-mm1: different values for OHCI_QUIRK_ZFMICRO Adrian Bunk
@ 2007-01-14 14:36 ` David Brownell
2007-02-20 0:06 ` Adrian Bunk
0 siblings, 1 reply; 93+ messages in thread
From: David Brownell @ 2007-01-14 14:36 UTC (permalink / raw)
To: Adrian Bunk
Cc: Andrew Morton, Benjamin Herrenschmidt, David Brownell,
Geoff Levand, Greg Kroah-Hartman, Tony Olech, linux-kernel,
linux-usb-devel
On Sunday 14 January 2007 1:10 am, Adrian Bunk wrote:
> <-- snip -->
Waiting for Tony to submit bugfixes to his driver...
> ...
> CC drivers/usb/misc/ftdi-elan.o
> /home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/usb/misc/ftdi-elan.c:2307:1: warning: "OHCI_QUIRK_ZFMICRO" redefined
> In file included from /home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/usb/misc/ftdi-elan.c:76:
> /home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/usb/misc/../host/ohci.h:399:1: warning: this is the location of the previous definition
> ...
> $ grep -r ^#define * | grep OHCI_QUIRK_ZFMICRO
> drivers/usb/host/ohci.h:#define OHCI_QUIRK_ZFMICRO 0x20 /* Compaq ZFMicro chipset*/
> drivers/usb/host/u132-hcd.c:#define OHCI_QUIRK_ZFMICRO 0x10
> drivers/usb/misc/ftdi-elan.c:#define OHCI_QUIRK_ZFMICRO 0x10
> $
>
> <-- snip -->
>
> 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
>
^ permalink raw reply [flat|nested] 93+ messages in thread
* Re: 2.6.20-rc4-mm1: different values for OHCI_QUIRK_ZFMICRO
2007-01-14 14:36 ` David Brownell
@ 2007-02-20 0:06 ` Adrian Bunk
2007-03-29 22:06 ` Randy Dunlap
0 siblings, 1 reply; 93+ messages in thread
From: Adrian Bunk @ 2007-02-20 0:06 UTC (permalink / raw)
To: David Brownell
Cc: Andrew Morton, Benjamin Herrenschmidt, David Brownell,
Geoff Levand, Greg Kroah-Hartman, Tony Olech, linux-kernel,
linux-usb-devel
On Sun, Jan 14, 2007 at 06:36:10AM -0800, David Brownell wrote:
> On Sunday 14 January 2007 1:10 am, Adrian Bunk wrote:
> > <-- snip -->
>
> Waiting for Tony to submit bugfixes to his driver...
Still unfixed as of 2.6.20-mm1.
> > ...
> > CC drivers/usb/misc/ftdi-elan.o
> > /home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/usb/misc/ftdi-elan.c:2307:1: warning: "OHCI_QUIRK_ZFMICRO" redefined
> > In file included from /home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/usb/misc/ftdi-elan.c:76:
> > /home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/usb/misc/../host/ohci.h:399:1: warning: this is the location of the previous definition
> > ...
> > $ grep -r ^#define * | grep OHCI_QUIRK_ZFMICRO
> > drivers/usb/host/ohci.h:#define OHCI_QUIRK_ZFMICRO 0x20 /* Compaq ZFMicro chipset*/
> > drivers/usb/host/u132-hcd.c:#define OHCI_QUIRK_ZFMICRO 0x10
> > drivers/usb/misc/ftdi-elan.c:#define OHCI_QUIRK_ZFMICRO 0x10
> > $
> >
> > <-- snip -->
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
^ permalink raw reply [flat|nested] 93+ messages in thread* Re: 2.6.20-rc4-mm1: different values for OHCI_QUIRK_ZFMICRO
2007-02-20 0:06 ` Adrian Bunk
@ 2007-03-29 22:06 ` Randy Dunlap
2007-03-29 22:24 ` David Brownell
2007-03-30 15:18 ` 2.6.20-rc4-mm1: " Tony Olech
0 siblings, 2 replies; 93+ messages in thread
From: Randy Dunlap @ 2007-03-29 22:06 UTC (permalink / raw)
To: Adrian Bunk
Cc: David Brownell, Andrew Morton, Benjamin Herrenschmidt,
David Brownell, Geoff Levand, Greg Kroah-Hartman, Tony Olech,
linux-kernel, linux-usb-devel
On Tue, 20 Feb 2007 01:06:54 +0100 Adrian Bunk wrote:
> On Sun, Jan 14, 2007 at 06:36:10AM -0800, David Brownell wrote:
> > On Sunday 14 January 2007 1:10 am, Adrian Bunk wrote:
> > > <-- snip -->
> >
> > Waiting for Tony to submit bugfixes to his driver...
>
> Still unfixed as of 2.6.20-mm1.
>
> > > ...
> > > CC drivers/usb/misc/ftdi-elan.o
> > > /home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/usb/misc/ftdi-elan.c:2307:1: warning: "OHCI_QUIRK_ZFMICRO" redefined
> > > In file included from /home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/usb/misc/ftdi-elan.c:76:
> > > /home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/usb/misc/../host/ohci.h:399:1: warning: this is the location of the previous definition
> > > ...
> > > $ grep -r ^#define * | grep OHCI_QUIRK_ZFMICRO
> > > drivers/usb/host/ohci.h:#define OHCI_QUIRK_ZFMICRO 0x20 /* Compaq ZFMicro chipset*/
> > > drivers/usb/host/u132-hcd.c:#define OHCI_QUIRK_ZFMICRO 0x10
> > > drivers/usb/misc/ftdi-elan.c:#define OHCI_QUIRK_ZFMICRO 0x10
> > > $
> > >
> > > <-- snip -->
so is there a patch around for this yet?
or shall someone other than Tony (??) make one?
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ permalink raw reply [flat|nested] 93+ messages in thread
* Re: 2.6.20-rc4-mm1: different values for OHCI_QUIRK_ZFMICRO
2007-03-29 22:06 ` Randy Dunlap
@ 2007-03-29 22:24 ` David Brownell
2007-05-08 22:17 ` [PATCH] " Randy Dunlap
2007-03-30 15:18 ` 2.6.20-rc4-mm1: " Tony Olech
1 sibling, 1 reply; 93+ messages in thread
From: David Brownell @ 2007-03-29 22:24 UTC (permalink / raw)
To: Randy Dunlap
Cc: Adrian Bunk, Andrew Morton, Benjamin Herrenschmidt,
David Brownell, Geoff Levand, Greg Kroah-Hartman, Tony Olech,
linux-kernel, linux-usb-devel
On Thursday 29 March 2007 3:06 pm, Randy Dunlap wrote:
> On Tue, 20 Feb 2007 01:06:54 +0100 Adrian Bunk wrote:
>
> > On Sun, Jan 14, 2007 at 06:36:10AM -0800, David Brownell wrote:
> > > On Sunday 14 January 2007 1:10 am, Adrian Bunk wrote:
> > > > <-- snip -->
> > >
> > > Waiting for Tony to submit bugfixes to his driver...
> >
> > Still unfixed as of 2.6.20-mm1.
>
> so is there a patch around for this yet?
>
> or shall someone other than Tony (??) make one?
ISTR posting the appended patch back in January; it's been
refreshed since then. Presumably it still works.
- Dave
============= CUT HERE
Partial fix for bogosity in the ftdi-elan and u13-hcd drivers ... these
have no business including with the internals of other drivers, much less
doing so in a broken way!!
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Index: g26/drivers/usb/misc/ftdi-elan.c
===================================================================
--- g26.orig/drivers/usb/misc/ftdi-elan.c 2007-01-02 20:05:33.000000000 -0800
+++ g26/drivers/usb/misc/ftdi-elan.c 2007-02-08 18:45:13.000000000 -0800
@@ -73,6 +73,13 @@ static struct list_head ftdi_static_list
#include "usb_u132.h"
#include <asm/io.h>
#include "../core/hcd.h"
+
+ /* FIXME ohci.h is ONLY for internal use by the OHCI driver.
+ * If you're going to try crap like this, you need to split
+ * out the common stuff (register declarations?) into a
+ * sharable file, maybe name <linux/usb/ohci.h>
+ */
+
#include "../host/ohci.h"
/* Define these values to match your devices*/
#define USB_FTDI_ELAN_VENDOR_ID 0x0403
@@ -2300,11 +2307,7 @@ static int ftdi_elan_checkingPCI(struct
offsetof(struct ohci_regs, member), 0, data);
#define ftdi_write_pcimem(ftdi, member, data) ftdi_elan_write_pcimem(ftdi, \
offsetof(struct ohci_regs, member), 0, data);
-#define OHCI_QUIRK_AMD756 0x01
-#define OHCI_QUIRK_SUPERIO 0x02
-#define OHCI_QUIRK_INITRESET 0x04
-#define OHCI_BIG_ENDIAN 0x08
-#define OHCI_QUIRK_ZFMICRO 0x10
+
#define OHCI_CONTROL_INIT OHCI_CTRL_CBSR
#define OHCI_INTR_INIT (OHCI_INTR_MIE | OHCI_INTR_UE | OHCI_INTR_RD | \
OHCI_INTR_WDH)
Index: g26/drivers/usb/host/u132-hcd.c
===================================================================
--- g26.orig/drivers/usb/host/u132-hcd.c 2007-01-02 20:05:33.000000000 -0800
+++ g26/drivers/usb/host/u132-hcd.c 2007-02-08 18:45:06.000000000 -0800
@@ -58,6 +58,13 @@
#include <asm/system.h>
#include <asm/byteorder.h>
#include "../core/hcd.h"
+
+ /* FIXME ohci.h is ONLY for internal use by the OHCI driver.
+ * If you're going to try crap like this, you need to split
+ * out the common stuff (register declarations?) into a
+ * sharable file, maybe name <linux/usb/ohci.h>
+ */
+
#include "ohci.h"
#define OHCI_CONTROL_INIT OHCI_CTRL_CBSR
#define OHCI_INTR_INIT (OHCI_INTR_MIE | OHCI_INTR_UE | OHCI_INTR_RD | \
@@ -174,11 +181,6 @@ struct u132_ring {
struct u132_endp *curr_endp;
struct delayed_work scheduler;
};
-#define OHCI_QUIRK_AMD756 0x01
-#define OHCI_QUIRK_SUPERIO 0x02
-#define OHCI_QUIRK_INITRESET 0x04
-#define OHCI_BIG_ENDIAN 0x08
-#define OHCI_QUIRK_ZFMICRO 0x10
struct u132 {
struct kref kref;
struct list_head u132_list;
^ permalink raw reply [flat|nested] 93+ messages in thread* [PATCH] different values for OHCI_QUIRK_ZFMICRO
2007-03-29 22:24 ` David Brownell
@ 2007-05-08 22:17 ` Randy Dunlap
2007-05-08 22:34 ` David Brownell
2007-05-08 22:37 ` Greg KH
0 siblings, 2 replies; 93+ messages in thread
From: Randy Dunlap @ 2007-05-08 22:17 UTC (permalink / raw)
To: David Brownell
Cc: Andrew Morton, David Brownell, linux-usb-devel, Geoff Levand,
Benjamin Herrenschmidt, Greg Kroah-Hartman, linux-kernel,
Adrian Bunk, Tony Olech
On Thu, 29 Mar 2007 15:24:00 -0700 David Brownell wrote:
> On Thursday 29 March 2007 3:06 pm, Randy Dunlap wrote:
> > On Tue, 20 Feb 2007 01:06:54 +0100 Adrian Bunk wrote:
> >
> > > On Sun, Jan 14, 2007 at 06:36:10AM -0800, David Brownell wrote:
> > > > On Sunday 14 January 2007 1:10 am, Adrian Bunk wrote:
> > > > > <-- snip -->
> > > >
> > > > Waiting for Tony to submit bugfixes to his driver...
> > >
> > > Still unfixed as of 2.6.20-mm1.
> >
> > so is there a patch around for this yet?
> >
> > or shall someone other than Tony (??) make one?
>
> ISTR posting the appended patch back in January; it's been
> refreshed since then. Presumably it still works.
>
> - Dave
Oh, Greg, can we get this merged some day soon, please?
David posted this patch on 2007-FEB-08.
From: David Brownell <dbrownell@users.sourceforge.net>
Partial fix for bogosity in the ftdi-elan and u13-hcd drivers ... these
have no business including with the internals of other drivers, much less
doing so in a broken way!!
Updated for 2.6.21-git10.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
---
drivers/usb/host/u132-hcd.c | 12 +++++++-----
drivers/usb/misc/ftdi-elan.c | 12 ++++++++----
2 files changed, 15 insertions(+), 9 deletions(-)
--- linux-2.6.21-git10.orig/drivers/usb/host/u132-hcd.c
+++ linux-2.6.21-git10/drivers/usb/host/u132-hcd.c
@@ -57,6 +57,13 @@
#include <asm/system.h>
#include <asm/byteorder.h>
#include "../core/hcd.h"
+
+ /* FIXME ohci.h is ONLY for internal use by the OHCI driver.
+ * If you're going to try crap like this, you need to split
+ * out the common stuff (register declarations?) into a
+ * sharable file, maybe name <linux/usb/ohci.h>
+ */
+
#include "ohci.h"
#define OHCI_CONTROL_INIT OHCI_CTRL_CBSR
#define OHCI_INTR_INIT (OHCI_INTR_MIE | OHCI_INTR_UE | OHCI_INTR_RD | \
@@ -173,11 +180,6 @@ struct u132_ring {
struct u132_endp *curr_endp;
struct delayed_work scheduler;
};
-#define OHCI_QUIRK_AMD756 0x01
-#define OHCI_QUIRK_SUPERIO 0x02
-#define OHCI_QUIRK_INITRESET 0x04
-#define OHCI_BIG_ENDIAN 0x08
-#define OHCI_QUIRK_ZFMICRO 0x10
struct u132 {
struct kref kref;
struct list_head u132_list;
--- linux-2.6.21-git10.orig/drivers/usb/misc/ftdi-elan.c
+++ linux-2.6.21-git10/drivers/usb/misc/ftdi-elan.c
@@ -73,6 +73,13 @@ static struct list_head ftdi_static_list
#include "usb_u132.h"
#include <asm/io.h>
#include "../core/hcd.h"
+
+ /* FIXME ohci.h is ONLY for internal use by the OHCI driver.
+ * If you're going to try crap like this, you need to split
+ * out the common stuff (register declarations?) into a
+ * sharable file, maybe name <linux/usb/ohci.h>
+ */
+
#include "../host/ohci.h"
/* Define these values to match your devices*/
#define USB_FTDI_ELAN_VENDOR_ID 0x0403
@@ -2300,10 +2307,7 @@ static int ftdi_elan_checkingPCI(struct
offsetof(struct ohci_regs, member), 0, data);
#define ftdi_write_pcimem(ftdi, member, data) ftdi_elan_write_pcimem(ftdi, \
offsetof(struct ohci_regs, member), 0, data);
-#define OHCI_QUIRK_AMD756 0x01
-#define OHCI_QUIRK_SUPERIO 0x02
-#define OHCI_QUIRK_INITRESET 0x04
-#define OHCI_BIG_ENDIAN 0x08
+
#define OHCI_CONTROL_INIT OHCI_CTRL_CBSR
#define OHCI_INTR_INIT (OHCI_INTR_MIE | OHCI_INTR_UE | OHCI_INTR_RD | \
OHCI_INTR_WDH)
^ permalink raw reply [flat|nested] 93+ messages in thread* Re: [PATCH] different values for OHCI_QUIRK_ZFMICRO
2007-05-08 22:17 ` [PATCH] " Randy Dunlap
@ 2007-05-08 22:34 ` David Brownell
2007-05-08 22:37 ` Greg KH
1 sibling, 0 replies; 93+ messages in thread
From: David Brownell @ 2007-05-08 22:34 UTC (permalink / raw)
To: Randy Dunlap, Greg Kroah-Hartman
Cc: Andrew Morton, David Brownell, linux-usb-devel, Geoff Levand,
Benjamin Herrenschmidt, linux-kernel, Adrian Bunk, Tony Olech
On Tuesday 08 May 2007, Randy Dunlap wrote:
> On Thu, 29 Mar 2007 15:24:00 -0700 David Brownell wrote:
>
> > On Thursday 29 March 2007 3:06 pm, Randy Dunlap wrote:
> > > On Tue, 20 Feb 2007 01:06:54 +0100 Adrian Bunk wrote:
> > >
> > > > On Sun, Jan 14, 2007 at 06:36:10AM -0800, David Brownell wrote:
> > > > > On Sunday 14 January 2007 1:10 am, Adrian Bunk wrote:
> > > > > > <-- snip -->
> > > > >
> > > > > Waiting for Tony to submit bugfixes to his driver...
> > > >
> > > > Still unfixed as of 2.6.20-mm1.
> > >
> > > so is there a patch around for this yet?
> > >
> > > or shall someone other than Tony (??) make one?
> >
> > ISTR posting the appended patch back in January; it's been
> > refreshed since then. Presumably it still works.
> >
> > - Dave
>
> Oh, Greg, can we get this merged some day soon, please?
> David posted this patch on 2007-FEB-08.
And reposted it 2007-APR-29 too, after refresh ...
^ permalink raw reply [flat|nested] 93+ messages in thread
* Re: [PATCH] different values for OHCI_QUIRK_ZFMICRO
2007-05-08 22:17 ` [PATCH] " Randy Dunlap
2007-05-08 22:34 ` David Brownell
@ 2007-05-08 22:37 ` Greg KH
1 sibling, 0 replies; 93+ messages in thread
From: Greg KH @ 2007-05-08 22:37 UTC (permalink / raw)
To: Randy Dunlap
Cc: David Brownell, Andrew Morton, David Brownell, linux-usb-devel,
Geoff Levand, Benjamin Herrenschmidt, linux-kernel, Adrian Bunk,
Tony Olech
On Tue, May 08, 2007 at 03:17:53PM -0700, Randy Dunlap wrote:
> On Thu, 29 Mar 2007 15:24:00 -0700 David Brownell wrote:
>
> > On Thursday 29 March 2007 3:06 pm, Randy Dunlap wrote:
> > > On Tue, 20 Feb 2007 01:06:54 +0100 Adrian Bunk wrote:
> > >
> > > > On Sun, Jan 14, 2007 at 06:36:10AM -0800, David Brownell wrote:
> > > > > On Sunday 14 January 2007 1:10 am, Adrian Bunk wrote:
> > > > > > <-- snip -->
> > > > >
> > > > > Waiting for Tony to submit bugfixes to his driver...
> > > >
> > > > Still unfixed as of 2.6.20-mm1.
> > >
> > > so is there a patch around for this yet?
> > >
> > > or shall someone other than Tony (??) make one?
> >
> > ISTR posting the appended patch back in January; it's been
> > refreshed since then. Presumably it still works.
> >
> > - Dave
>
> Oh, Greg, can we get this merged some day soon, please?
> David posted this patch on 2007-FEB-08.
>
>
> From: David Brownell <dbrownell@users.sourceforge.net>
>
> Partial fix for bogosity in the ftdi-elan and u13-hcd drivers ... these
> have no business including with the internals of other drivers, much less
> doing so in a broken way!!
>
> Updated for 2.6.21-git10.
This is already in my tree, and should show up in the next -mm and will
be going to Linus in time for 2.6.22. He resent it to me a few days
ago, sorry for somehow dropping it back in Feburary :(
thanks,
greg k-h
^ permalink raw reply [flat|nested] 93+ messages in thread
* Re: 2.6.20-rc4-mm1: different values for OHCI_QUIRK_ZFMICRO
2007-03-29 22:06 ` Randy Dunlap
2007-03-29 22:24 ` David Brownell
@ 2007-03-30 15:18 ` Tony Olech
1 sibling, 0 replies; 93+ messages in thread
From: Tony Olech @ 2007-03-30 15:18 UTC (permalink / raw)
To: Randy Dunlap, Adrian Bunk
Cc: David Brownell, Andrew Morton, Benjamin Herrenschmidt,
David Brownell, Geoff Levand, Greg Kroah-Hartman, linux-kernel,
linux-usb-devel
Sorry guys,
I have spent the last three weeks trying to track
down a problem one of our customers has been having,
the only thing I have been able to determine is that using
mutex'es the kernel crashes and using semaphores instead
works. Now I realize that the target is to use mutexes,
but I have been really at my wits end trying to solve the
problem. As a result I am just now doing an external
module tar ball version and with a bit of luck I should
be able to post it on our web site, so that our customers
can download it, before I take my two week easter
holiday starting in one hour. Since I have restructured
the driver several times trying to get a handle on the
problem, I think the kernel patch is going to be a complete
replacement, which will take a couple of weeks to squeeze
all the lines into 80 columns.
Tony Olech
----- Original Message -----
From: "Randy Dunlap" <randy.dunlap@oracle.com>
To: "Adrian Bunk" <bunk@stusta.de>
Cc: "David Brownell" <david-b@pacbell.net>; "Andrew Morton" <akpm@osdl.org>;
"Benjamin Herrenschmidt" <benh@kernel.crashing.org>; "David Brownell"
<dbrownell@users.sourceforge.net>; "Geoff Levand"
<geoffrey.levand@am.sony.com>; "Greg Kroah-Hartman" <gregkh@suse.de>; "Tony
Olech" <tony.olech@elandigitalsystems.com>; <linux-kernel@vger.kernel.org>;
<linux-usb-devel@lists.sourceforge.net>
Sent: Thursday, March 29, 2007 11:06 PM
Subject: Re: 2.6.20-rc4-mm1: different values for OHCI_QUIRK_ZFMICRO
> On Tue, 20 Feb 2007 01:06:54 +0100 Adrian Bunk wrote:
>
>> On Sun, Jan 14, 2007 at 06:36:10AM -0800, David Brownell wrote:
>> > On Sunday 14 January 2007 1:10 am, Adrian Bunk wrote:
>> > > <-- snip -->
>> >
>> > Waiting for Tony to submit bugfixes to his driver...
>>
>> Still unfixed as of 2.6.20-mm1.
>>
>> > > ...
>> > > CC drivers/usb/misc/ftdi-elan.o
>> > > /home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/usb/misc/ftdi-elan.c:2307:1:
>> > > warning: "OHCI_QUIRK_ZFMICRO" redefined
>> > > In file included from
>> > > /home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/usb/misc/ftdi-elan.c:76:
>> > > /home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/usb/misc/../host/ohci.h:399:1:
>> > > warning: this is the location of the previous definition
>> > > ...
>> > > $ grep -r ^#define * | grep OHCI_QUIRK_ZFMICRO
>> > > drivers/usb/host/ohci.h:#define OHCI_QUIRK_ZFMICRO 0x20
>> > > /* Compaq ZFMicro chipset*/
>> > > drivers/usb/host/u132-hcd.c:#define OHCI_QUIRK_ZFMICRO 0x10
>> > > drivers/usb/misc/ftdi-elan.c:#define OHCI_QUIRK_ZFMICRO 0x10
>> > > $
>> > >
>> > > <-- snip -->
>
> so is there a patch around for this yet?
>
> or shall someone other than Tony (??) make one?
>
>
> ---
> ~Randy
> *** Remember to use Documentation/SubmitChecklist when testing your code
> ***
>
>
^ permalink raw reply [flat|nested] 93+ messages in thread
* Re: 2.6.20-rc4-mm1
2007-01-12 6:26 2.6.20-rc4-mm1 Andrew Morton
` (8 preceding siblings ...)
2007-01-14 9:10 ` 2.6.20-rc4-mm1: different values for OHCI_QUIRK_ZFMICRO Adrian Bunk
@ 2007-01-14 9:48 ` Thomas Gleixner
2007-01-14 10:46 ` 2.6.20-rc4-mm1 Thomas Gleixner
2007-01-14 23:52 ` i810fb fails to load (was: 2.6.20-rc4-mm1) Tilman Schmidt
` (8 subsequent siblings)
18 siblings, 1 reply; 93+ messages in thread
From: Thomas Gleixner @ 2007-01-14 9:48 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel, jgarzik, linux-ide
On Thu, 2007-01-11 at 22:26 -0800, Andrew Morton wrote:
> - Merged the "filesystem AIO patches".
Hotfixes alreday applied.
BUG: at /home/tglx/work/kernel/vanilla/linux-2.6.20-rc4-mm1/arch/i386/mm/highmem.c:60 kmap_atomic()
[<c0105fba>] show_trace_log_lvl+0x1a/0x2f
[<c01065ff>] show_trace+0x12/0x14
[<c01066b1>] dump_stack+0x16/0x18
[<c011fad8>] kmap_atomic+0x12f/0x1c8
[<f88db29c>] ata_scsi_rbuf_get+0x22/0x37 [libata]
[<f88db773>] atapi_qc_complete+0x1ee/0x240 [libata]
[<f88d666b>] __ata_qc_complete+0x86/0x8d [libata]
[<f88d670a>] ata_qc_complete+0x98/0x9e [libata]
[<f88d98f4>] ata_qc_complete_multiple+0x8a/0xa4 [libata]
[<f88b3a2c>] ahci_interrupt+0x2bd/0x3b9 [ahci]
[<c0154a2d>] handle_IRQ_event+0x21/0x48
[<c0155971>] handle_edge_irq+0xd1/0x115
[<c01071af>] do_IRQ+0x6c/0x89
[<c0105a0b>] common_interrupt+0x23/0x28
[<c01031c2>] mwait_idle+0xd/0xf
[<c010343f>] cpu_idle+0xb7/0xf1
[<c010141d>] rest_init+0x37/0x3a
[<c04629bd>] start_kernel+0x3cc/0x3ef
[<00000000>] 0x0
ata_scsi_rbuf_get requests KM_IRQ0 type memory and calls kmap_atomic
with interrupts enabled.
Boot proceeds, but gets stuck hard at:
"Remounting root filesystem in read-write mode:"
No SysRq-T, nothing.
The above BUG seems unrelated to that. Investigating further.
tglx
^ permalink raw reply [flat|nested] 93+ messages in thread* Re: 2.6.20-rc4-mm1
2007-01-14 9:48 ` 2.6.20-rc4-mm1 Thomas Gleixner
@ 2007-01-14 10:46 ` Thomas Gleixner
2007-01-14 14:40 ` 2.6.20-rc4-mm1 Thomas Gleixner
0 siblings, 1 reply; 93+ messages in thread
From: Thomas Gleixner @ 2007-01-14 10:46 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel, jgarzik, linux-ide, axboe
On Sun, 2007-01-14 at 10:48 +0100, Thomas Gleixner wrote:
> ata_scsi_rbuf_get requests KM_IRQ0 type memory and calls kmap_atomic
> with interrupts enabled.
>
> Boot proceeds, but gets stuck hard at:
> "Remounting root filesystem in read-write mode:"
>
> No SysRq-T, nothing.
>
> The above BUG seems unrelated to that. Investigating further.
Bisect identified: git-block.patch
tglx
^ permalink raw reply [flat|nested] 93+ messages in thread
* Re: 2.6.20-rc4-mm1
2007-01-14 10:46 ` 2.6.20-rc4-mm1 Thomas Gleixner
@ 2007-01-14 14:40 ` Thomas Gleixner
2007-01-14 22:05 ` 2.6.20-rc4-mm1 Jens Axboe
2007-01-14 22:20 ` 2.6.20-rc4-mm1 Jens Axboe
0 siblings, 2 replies; 93+ messages in thread
From: Thomas Gleixner @ 2007-01-14 14:40 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel, jgarzik, linux-ide, axboe
On Sun, 2007-01-14 at 11:46 +0100, Thomas Gleixner wrote:
> > Boot proceeds, but gets stuck hard at:
> > "Remounting root filesystem in read-write mode:"
> >
> > No SysRq-T, nothing.
> >
> > The above BUG seems unrelated to that. Investigating further.
>
> Bisect identified: git-block.patch
Does only happen on 2 systems. Both have sata + raid1 setup. I managed
to get a stacktrace from the SMP box. Sits there and sleeps forever.
tglx
[<c032ac64>] io_schedule+0x7a/0x9a
[<c0157f89>] sleep_on_page+0x8/0xc
[<c032ae45>] __wait_on_bit+0x36/0x5d
[<c01580d8>] wait_on_page_bit+0x5b/0x61
[<c0158a2b>] wait_on_page_writeback_range+0x4f/0xef
[<c0158b0f>] filemap_fdatawait+0x44/0x49
[<c0158da0>] filemap_write_and_wait+0x22/0x2d
[<c0190e39>] sync_blockdev+0x17/0x1d
[<c01a27af>] quota_sync_sb+0x33/0xd6
[<c01a2874>] sync_dquots+0x22/0xfa
[<c01757cf>] __fsync_super+0x17/0x66
[<c0175829>] fsync_super+0xb/0x19
[<c0175880>] do_remount_sb+0x49/0x101
[<c0187f98>] do_mount+0x1ad/0x678
[<c01884d2>] sys_mount+0x6f/0xa4
[<c0103f6a>] sysenter_past_esp+0x5f/0x99
^ permalink raw reply [flat|nested] 93+ messages in thread
* Re: 2.6.20-rc4-mm1
2007-01-14 14:40 ` 2.6.20-rc4-mm1 Thomas Gleixner
@ 2007-01-14 22:05 ` Jens Axboe
2007-01-14 22:31 ` 2.6.20-rc4-mm1 Thomas Gleixner
2007-01-14 22:20 ` 2.6.20-rc4-mm1 Jens Axboe
1 sibling, 1 reply; 93+ messages in thread
From: Jens Axboe @ 2007-01-14 22:05 UTC (permalink / raw)
To: Thomas Gleixner; +Cc: Andrew Morton, linux-kernel, jgarzik, linux-ide
On Sun, Jan 14 2007, Thomas Gleixner wrote:
> On Sun, 2007-01-14 at 11:46 +0100, Thomas Gleixner wrote:
> > > Boot proceeds, but gets stuck hard at:
> > > "Remounting root filesystem in read-write mode:"
> > >
> > > No SysRq-T, nothing.
> > >
> > > The above BUG seems unrelated to that. Investigating further.
> >
> > Bisect identified: git-block.patch
>
> Does only happen on 2 systems. Both have sata + raid1 setup. I managed
> to get a stacktrace from the SMP box. Sits there and sleeps forever.
>
> tglx
>
> [<c032ac64>] io_schedule+0x7a/0x9a
> [<c0157f89>] sleep_on_page+0x8/0xc
> [<c032ae45>] __wait_on_bit+0x36/0x5d
> [<c01580d8>] wait_on_page_bit+0x5b/0x61
> [<c0158a2b>] wait_on_page_writeback_range+0x4f/0xef
> [<c0158b0f>] filemap_fdatawait+0x44/0x49
> [<c0158da0>] filemap_write_and_wait+0x22/0x2d
> [<c0190e39>] sync_blockdev+0x17/0x1d
> [<c01a27af>] quota_sync_sb+0x33/0xd6
> [<c01a2874>] sync_dquots+0x22/0xfa
> [<c01757cf>] __fsync_super+0x17/0x66
> [<c0175829>] fsync_super+0xb/0x19
> [<c0175880>] do_remount_sb+0x49/0x101
> [<c0187f98>] do_mount+0x1ad/0x678
> [<c01884d2>] sys_mount+0x6f/0xa4
> [<c0103f6a>] sysenter_past_esp+0x5f/0x99
raid seems to have severe problems with the plugging change. I'll try
and find Neil and have a chat with him, hopefully we can work it out.
--
Jens Axboe
^ permalink raw reply [flat|nested] 93+ messages in thread
* Re: 2.6.20-rc4-mm1
2007-01-14 22:05 ` 2.6.20-rc4-mm1 Jens Axboe
@ 2007-01-14 22:31 ` Thomas Gleixner
2007-01-14 22:30 ` 2.6.20-rc4-mm1 Jens Axboe
0 siblings, 1 reply; 93+ messages in thread
From: Thomas Gleixner @ 2007-01-14 22:31 UTC (permalink / raw)
To: Jens Axboe; +Cc: Andrew Morton, linux-kernel, jgarzik, linux-ide
On Mon, 2007-01-15 at 09:05 +1100, Jens Axboe wrote:
> raid seems to have severe problems with the plugging change. I'll try
> and find Neil and have a chat with him, hopefully we can work it out.
Some hints:
mount(1899): WRITE block 16424 on md3
call md_write_start
md3_raid1(438): WRITE block 40965504 on sdb6
md3_raid1(438): WRITE block 40965504 on sda6
First Write sector 16424 disks 2
Stuck.
Note, that neither end_buffer_async_write() nor
raid1_end_write_request() are invoked,
In a previous write invoked by:
fsck.ext3(1896): WRITE block 8552 on sdb1
end_buffer_async_write() is invoked.
sdb1 is not a part of a raid device.
Hope that helps,
tglx
^ permalink raw reply [flat|nested] 93+ messages in thread
* Re: 2.6.20-rc4-mm1
2007-01-14 22:31 ` 2.6.20-rc4-mm1 Thomas Gleixner
@ 2007-01-14 22:30 ` Jens Axboe
2007-01-15 8:22 ` 2.6.20-rc4-mm1 Ingo Molnar
0 siblings, 1 reply; 93+ messages in thread
From: Jens Axboe @ 2007-01-14 22:30 UTC (permalink / raw)
To: Thomas Gleixner; +Cc: Andrew Morton, linux-kernel, jgarzik, linux-ide
On Sun, Jan 14 2007, Thomas Gleixner wrote:
> On Mon, 2007-01-15 at 09:05 +1100, Jens Axboe wrote:
> > raid seems to have severe problems with the plugging change. I'll try
> > and find Neil and have a chat with him, hopefully we can work it out.
>
> Some hints:
>
> mount(1899): WRITE block 16424 on md3
> call md_write_start
> md3_raid1(438): WRITE block 40965504 on sdb6
> md3_raid1(438): WRITE block 40965504 on sda6
> First Write sector 16424 disks 2
>
> Stuck.
>
> Note, that neither end_buffer_async_write() nor
> raid1_end_write_request() are invoked,
>
> In a previous write invoked by:
> fsck.ext3(1896): WRITE block 8552 on sdb1
> end_buffer_async_write() is invoked.
>
> sdb1 is not a part of a raid device.
When I briefly tested this before I left (and found it broken), doing a
cat /proc/mdstat got things going again. Hard if that's your rootfs,
it's just a hint :-)
> Hope that helps,
I can reproduce, so that's not a problem. I can't do much about it until
I'm back next week, but Neil might be able to help. We shall see. Thanks
for testing.
--
Jens Axboe
^ permalink raw reply [flat|nested] 93+ messages in thread
* Re: 2.6.20-rc4-mm1
2007-01-14 22:30 ` 2.6.20-rc4-mm1 Jens Axboe
@ 2007-01-15 8:22 ` Ingo Molnar
2007-01-15 23:55 ` 2.6.20-rc4-mm1 Jens Axboe
0 siblings, 1 reply; 93+ messages in thread
From: Ingo Molnar @ 2007-01-15 8:22 UTC (permalink / raw)
To: Jens Axboe
Cc: Thomas Gleixner, Andrew Morton, linux-kernel, jgarzik, linux-ide
* Jens Axboe <jens.axboe@oracle.com> wrote:
> > In a previous write invoked by: fsck.ext3(1896): WRITE block 8552 on
> > sdb1 end_buffer_async_write() is invoked.
> >
> > sdb1 is not a part of a raid device.
>
> When I briefly tested this before I left (and found it broken), doing
> a cat /proc/mdstat got things going again. Hard if that's your rootfs,
> it's just a hint :-)
hm, so you knew it's broken, still you let Andrew pick it up, or am i
misunderstanding something?
Ingo
^ permalink raw reply [flat|nested] 93+ messages in thread
* Re: 2.6.20-rc4-mm1
2007-01-15 8:22 ` 2.6.20-rc4-mm1 Ingo Molnar
@ 2007-01-15 23:55 ` Jens Axboe
0 siblings, 0 replies; 93+ messages in thread
From: Jens Axboe @ 2007-01-15 23:55 UTC (permalink / raw)
To: Ingo Molnar
Cc: Thomas Gleixner, Andrew Morton, linux-kernel, jgarzik, linux-ide
On Mon, Jan 15 2007, Ingo Molnar wrote:
>
> * Jens Axboe <jens.axboe@oracle.com> wrote:
>
> > > In a previous write invoked by: fsck.ext3(1896): WRITE block 8552 on
> > > sdb1 end_buffer_async_write() is invoked.
> > >
> > > sdb1 is not a part of a raid device.
> >
> > When I briefly tested this before I left (and found it broken), doing
> > a cat /proc/mdstat got things going again. Hard if that's your rootfs,
> > it's just a hint :-)
>
> hm, so you knew it's broken, still you let Andrew pick it up, or am i
> misunderstanding something?
Well the raid issue wasn't known before it was in -mm.
--
Jens Axboe
^ permalink raw reply [flat|nested] 93+ messages in thread
* Re: 2.6.20-rc4-mm1
2007-01-14 14:40 ` 2.6.20-rc4-mm1 Thomas Gleixner
2007-01-14 22:05 ` 2.6.20-rc4-mm1 Jens Axboe
@ 2007-01-14 22:20 ` Jens Axboe
1 sibling, 0 replies; 93+ messages in thread
From: Jens Axboe @ 2007-01-14 22:20 UTC (permalink / raw)
To: Thomas Gleixner; +Cc: Andrew Morton, linux-kernel, jgarzik, linux-ide
On Sun, Jan 14 2007, Thomas Gleixner wrote:
> On Sun, 2007-01-14 at 11:46 +0100, Thomas Gleixner wrote:
> > > Boot proceeds, but gets stuck hard at:
> > > "Remounting root filesystem in read-write mode:"
> > >
> > > No SysRq-T, nothing.
> > >
> > > The above BUG seems unrelated to that. Investigating further.
> >
> > Bisect identified: git-block.patch
>
> Does only happen on 2 systems. Both have sata + raid1 setup. I managed
> to get a stacktrace from the SMP box. Sits there and sleeps forever.
>
> tglx
>
> [<c032ac64>] io_schedule+0x7a/0x9a
> [<c0157f89>] sleep_on_page+0x8/0xc
> [<c032ae45>] __wait_on_bit+0x36/0x5d
> [<c01580d8>] wait_on_page_bit+0x5b/0x61
> [<c0158a2b>] wait_on_page_writeback_range+0x4f/0xef
> [<c0158b0f>] filemap_fdatawait+0x44/0x49
> [<c0158da0>] filemap_write_and_wait+0x22/0x2d
> [<c0190e39>] sync_blockdev+0x17/0x1d
> [<c01a27af>] quota_sync_sb+0x33/0xd6
> [<c01a2874>] sync_dquots+0x22/0xfa
> [<c01757cf>] __fsync_super+0x17/0x66
> [<c0175829>] fsync_super+0xb/0x19
> [<c0175880>] do_remount_sb+0x49/0x101
> [<c0187f98>] do_mount+0x1ad/0x678
> [<c01884d2>] sys_mount+0x6f/0xa4
> [<c0103f6a>] sysenter_past_esp+0x5f/0x99
raid seems to have severe problems with the plugging change. I'll try
and find Neil and have a chat with him, hopefully we can work it out.
--
Jens Axboe
^ permalink raw reply [flat|nested] 93+ messages in thread
* i810fb fails to load (was: 2.6.20-rc4-mm1)
2007-01-12 6:26 2.6.20-rc4-mm1 Andrew Morton
` (9 preceding siblings ...)
2007-01-14 9:48 ` 2.6.20-rc4-mm1 Thomas Gleixner
@ 2007-01-14 23:52 ` Tilman Schmidt
2007-01-15 0:22 ` Andrew Morton
2007-01-18 21:55 ` [-mm patch] fs/unionfs/: possible cleanups Adrian Bunk
` (7 subsequent siblings)
18 siblings, 1 reply; 93+ messages in thread
From: Tilman Schmidt @ 2007-01-14 23:52 UTC (permalink / raw)
To: Andrew Morton, linux-kernel, linux-fbdev-devel
[-- Attachment #1: Type: text/plain, Size: 2502 bytes --]
With kernel 2.6.20-rc4-mm1 and all hotfixes, i810fb fails to load on my
Dell Optiplex GX110. Here's an excerpt of the diff between the boot logs
of 2.6.20-rc5 (working) and 2.6.20-rc4-mm1 (non-working):
@@ -4,7 +4,7 @@
No module symbols loaded - kernel modules not enabled.
klogd 1.4.1, log source = ksyslog started.
-<5>Linux version 2.6.20-rc5-noinitrd (ts@gx110) (gcc version 4.0.2 20050901 (prerelease) (SUSE Linux)) #2 PREEMPT Sun Jan 14 23:37:12 CET 2007
+<5>Linux version 2.6.20-rc4-mm1-noinitrd (ts@gx110) (gcc version 4.0.2 20050901 (prerelease) (SUSE Linux)) #3 PREEMPT Sun Jan 14 21:08:56 CET 2007
<6>BIOS-provided physical RAM map:
<4>sanitize start
<4>sanitize end
@@ -188,7 +192,6 @@
<6>ACPI: Interpreter enabled
<6>ACPI: Using PIC for interrupt routing
<6>ACPI: PCI Root Bridge [PCI0] (0000:00)
-<7>PCI: Probing PCI hardware (bus 00)
<6>ACPI: Assume root bridge [\_SB_.PCI0] bus is 0
<7>Boot video device is 0000:00:01.0
<4>PCI quirk: region 0800-087f claimed by ICH4 ACPI/GPIO/TCO
@@ -238,20 +241,15 @@
<6>isapnp: No Plug & Play device found
<6>Real Time Clock Driver v1.12ac
<6>Intel 82802 RNG detected
-<6>Linux agpgart interface v0.101 (c) Dave Jones
+<6>Linux agpgart interface v0.102 (c) Dave Jones
<6>agpgart: Detected an Intel i810 E Chipset.
<6>agpgart: detected 4MB dedicated video ram.
<6>agpgart: AGP aperture is 64M @ 0xf8000000
<4>ACPI: PCI Interrupt Link [LNKA] enabled at IRQ 9
<7>PCI: setting IRQ 9 as level-triggered
<6>ACPI: PCI Interrupt 0000:00:01.0[A] -> Link [LNKA] -> GSI 9 (level, low) -> IRQ 9
-<4>i810-i2c: Probe DDC1 Bus
-<4>i810fb_init_pci: DDC probe successful
-<4>Console: switching to colour frame buffer device 160x64
-<4>I810FB: fb0 : Intel(R) 810E Framebuffer Device v0.9.0
-<4>I810FB: Video RAM : 4096K
-<4>I810FB: Monitor : H: 30-83 KHz V: 55-75 Hz
-<4>I810FB: Mode : 1280x1024-8bpp@60Hz
+<4>i810fb_alloc_fbmem: can't bind framebuffer memory
+<4>i810fb: probe of 0000:00:01.0 failed with error -16
<6>Serial: 8250/16550 driver $Revision: 1.90 $ 4 ports, IRQ sharing enabled
<6>serial8250: ttyS0 at I/O 0x3f8 (irq = 4) is a 16550A
<6>serial8250: ttyS1 at I/O 0x2f8 (irq = 3) is a 16550A
Please let me know if you need more information.
Thanks
Tilman
--
Tilman Schmidt E-Mail: tilman@imap.cc
Bonn, Germany
Diese Nachricht besteht zu 100% aus wiederverwerteten Bits.
Ungeöffnet mindestens haltbar bis: (siehe Rückseite)
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 253 bytes --]
^ permalink raw reply [flat|nested] 93+ messages in thread* Re: i810fb fails to load (was: 2.6.20-rc4-mm1)
2007-01-14 23:52 ` i810fb fails to load (was: 2.6.20-rc4-mm1) Tilman Schmidt
@ 2007-01-15 0:22 ` Andrew Morton
0 siblings, 0 replies; 93+ messages in thread
From: Andrew Morton @ 2007-01-15 0:22 UTC (permalink / raw)
To: Tilman Schmidt
Cc: linux-kernel, linux-fbdev-devel, Dave Airlie, linux-fbdev-devel,
Thomas Hellstrom
> On Mon, 15 Jan 2007 00:52:36 +0100 Tilman Schmidt <tilman@imap.cc> wrote:
> With kernel 2.6.20-rc4-mm1 and all hotfixes, i810fb fails to load on my
> Dell Optiplex GX110. Here's an excerpt of the diff between the boot logs
> of 2.6.20-rc5 (working) and 2.6.20-rc4-mm1 (non-working):
>
> @@ -4,7 +4,7 @@
> No module symbols loaded - kernel modules not enabled.
>
> klogd 1.4.1, log source = ksyslog started.
> -<5>Linux version 2.6.20-rc5-noinitrd (ts@gx110) (gcc version 4.0.2 20050901 (prerelease) (SUSE Linux)) #2 PREEMPT Sun Jan 14 23:37:12 CET 2007
> +<5>Linux version 2.6.20-rc4-mm1-noinitrd (ts@gx110) (gcc version 4.0.2 20050901 (prerelease) (SUSE Linux)) #3 PREEMPT Sun Jan 14 21:08:56 CET 2007
> <6>BIOS-provided physical RAM map:
> <4>sanitize start
> <4>sanitize end
> @@ -188,7 +192,6 @@
> <6>ACPI: Interpreter enabled
> <6>ACPI: Using PIC for interrupt routing
> <6>ACPI: PCI Root Bridge [PCI0] (0000:00)
> -<7>PCI: Probing PCI hardware (bus 00)
> <6>ACPI: Assume root bridge [\_SB_.PCI0] bus is 0
> <7>Boot video device is 0000:00:01.0
> <4>PCI quirk: region 0800-087f claimed by ICH4 ACPI/GPIO/TCO
> @@ -238,20 +241,15 @@
> <6>isapnp: No Plug & Play device found
> <6>Real Time Clock Driver v1.12ac
> <6>Intel 82802 RNG detected
> -<6>Linux agpgart interface v0.101 (c) Dave Jones
> +<6>Linux agpgart interface v0.102 (c) Dave Jones
> <6>agpgart: Detected an Intel i810 E Chipset.
> <6>agpgart: detected 4MB dedicated video ram.
> <6>agpgart: AGP aperture is 64M @ 0xf8000000
> <4>ACPI: PCI Interrupt Link [LNKA] enabled at IRQ 9
> <7>PCI: setting IRQ 9 as level-triggered
> <6>ACPI: PCI Interrupt 0000:00:01.0[A] -> Link [LNKA] -> GSI 9 (level, low) -> IRQ 9
> -<4>i810-i2c: Probe DDC1 Bus
> -<4>i810fb_init_pci: DDC probe successful
> -<4>Console: switching to colour frame buffer device 160x64
> -<4>I810FB: fb0 : Intel(R) 810E Framebuffer Device v0.9.0
> -<4>I810FB: Video RAM : 4096K
> -<4>I810FB: Monitor : H: 30-83 KHz V: 55-75 Hz
> -<4>I810FB: Mode : 1280x1024-8bpp@60Hz
> +<4>i810fb_alloc_fbmem: can't bind framebuffer memory
> +<4>i810fb: probe of 0000:00:01.0 failed with error -16
> <6>Serial: 8250/16550 driver $Revision: 1.90 $ 4 ports, IRQ sharing enabled
> <6>serial8250: ttyS0 at I/O 0x3f8 (irq = 4) is a 16550A
> <6>serial8250: ttyS1 at I/O 0x2f8 (irq = 3) is a 16550A
>
> Please let me know if you need more information.
>
Don't know. But I bet someone on the Cc does...
^ permalink raw reply [flat|nested] 93+ messages in thread
* Re: i810fb fails to load (was: 2.6.20-rc4-mm1)
@ 2007-01-15 0:22 ` Andrew Morton
0 siblings, 0 replies; 93+ messages in thread
From: Andrew Morton @ 2007-01-15 0:22 UTC (permalink / raw)
To: Tilman Schmidt; +Cc: linux-kernel, linux-fbdev-devel, Dave Airlie
> On Mon, 15 Jan 2007 00:52:36 +0100 Tilman Schmidt <tilman@imap.cc> wrote:
> With kernel 2.6.20-rc4-mm1 and all hotfixes, i810fb fails to load on my
> Dell Optiplex GX110. Here's an excerpt of the diff between the boot logs
> of 2.6.20-rc5 (working) and 2.6.20-rc4-mm1 (non-working):
>
> @@ -4,7 +4,7 @@
> No module symbols loaded - kernel modules not enabled.
>
> klogd 1.4.1, log source = ksyslog started.
> -<5>Linux version 2.6.20-rc5-noinitrd (ts@gx110) (gcc version 4.0.2 20050901 (prerelease) (SUSE Linux)) #2 PREEMPT Sun Jan 14 23:37:12 CET 2007
> +<5>Linux version 2.6.20-rc4-mm1-noinitrd (ts@gx110) (gcc version 4.0.2 20050901 (prerelease) (SUSE Linux)) #3 PREEMPT Sun Jan 14 21:08:56 CET 2007
> <6>BIOS-provided physical RAM map:
> <4>sanitize start
> <4>sanitize end
> @@ -188,7 +192,6 @@
> <6>ACPI: Interpreter enabled
> <6>ACPI: Using PIC for interrupt routing
> <6>ACPI: PCI Root Bridge [PCI0] (0000:00)
> -<7>PCI: Probing PCI hardware (bus 00)
> <6>ACPI: Assume root bridge [\_SB_.PCI0] bus is 0
> <7>Boot video device is 0000:00:01.0
> <4>PCI quirk: region 0800-087f claimed by ICH4 ACPI/GPIO/TCO
> @@ -238,20 +241,15 @@
> <6>isapnp: No Plug & Play device found
> <6>Real Time Clock Driver v1.12ac
> <6>Intel 82802 RNG detected
> -<6>Linux agpgart interface v0.101 (c) Dave Jones
> +<6>Linux agpgart interface v0.102 (c) Dave Jones
> <6>agpgart: Detected an Intel i810 E Chipset.
> <6>agpgart: detected 4MB dedicated video ram.
> <6>agpgart: AGP aperture is 64M @ 0xf8000000
> <4>ACPI: PCI Interrupt Link [LNKA] enabled at IRQ 9
> <7>PCI: setting IRQ 9 as level-triggered
> <6>ACPI: PCI Interrupt 0000:00:01.0[A] -> Link [LNKA] -> GSI 9 (level, low) -> IRQ 9
> -<4>i810-i2c: Probe DDC1 Bus
> -<4>i810fb_init_pci: DDC probe successful
> -<4>Console: switching to colour frame buffer device 160x64
> -<4>I810FB: fb0 : Intel(R) 810E Framebuffer Device v0.9.0
> -<4>I810FB: Video RAM : 4096K
> -<4>I810FB: Monitor : H: 30-83 KHz V: 55-75 Hz
> -<4>I810FB: Mode : 1280x1024-8bpp@60Hz
> +<4>i810fb_alloc_fbmem: can't bind framebuffer memory
> +<4>i810fb: probe of 0000:00:01.0 failed with error -16
> <6>Serial: 8250/16550 driver $Revision: 1.90 $ 4 ports, IRQ sharing enabled
> <6>serial8250: ttyS0 at I/O 0x3f8 (irq = 4) is a 16550A
> <6>serial8250: ttyS1 at I/O 0x2f8 (irq = 3) is a 16550A
>
> Please let me know if you need more information.
>
Don't know. But I bet someone on the Cc does...
^ permalink raw reply [flat|nested] 93+ messages in thread
* Re: i810fb fails to load
2007-01-15 0:22 ` Andrew Morton
(?)
@ 2007-01-22 13:42 ` Thomas Hellström
2007-01-22 18:30 ` Tilman Schmidt
2007-01-22 21:50 ` Dave Airlie
-1 siblings, 2 replies; 93+ messages in thread
From: Thomas Hellström @ 2007-01-22 13:42 UTC (permalink / raw)
To: Tilman Schmidt
Cc: Andrew Morton, linux-kernel, linux-fbdev-devel, Dave Airlie
[-- Attachment #1: Type: text/plain, Size: 2725 bytes --]
Andrew Morton wrote:
>> On Mon, 15 Jan 2007 00:52:36 +0100 Tilman Schmidt <tilman@imap.cc> wrote:
>> With kernel 2.6.20-rc4-mm1 and all hotfixes, i810fb fails to load on my
>> Dell Optiplex GX110. Here's an excerpt of the diff between the boot logs
>> of 2.6.20-rc5 (working) and 2.6.20-rc4-mm1 (non-working):
>>
>> @@ -4,7 +4,7 @@
>> No module symbols loaded - kernel modules not enabled.
>>
>> klogd 1.4.1, log source = ksyslog started.
>> -<5>Linux version 2.6.20-rc5-noinitrd (ts@gx110) (gcc version 4.0.2 20050901 (prerelease) (SUSE Linux)) #2 PREEMPT Sun Jan 14 23:37:12 CET 2007
>> +<5>Linux version 2.6.20-rc4-mm1-noinitrd (ts@gx110) (gcc version 4.0.2 20050901 (prerelease) (SUSE Linux)) #3 PREEMPT Sun Jan 14 21:08:56 CET 2007
>> <6>BIOS-provided physical RAM map:
>> <4>sanitize start
>> <4>sanitize end
>> @@ -188,7 +192,6 @@
>> <6>ACPI: Interpreter enabled
>> <6>ACPI: Using PIC for interrupt routing
>> <6>ACPI: PCI Root Bridge [PCI0] (0000:00)
>> -<7>PCI: Probing PCI hardware (bus 00)
>> <6>ACPI: Assume root bridge [\_SB_.PCI0] bus is 0
>> <7>Boot video device is 0000:00:01.0
>> <4>PCI quirk: region 0800-087f claimed by ICH4 ACPI/GPIO/TCO
>> @@ -238,20 +241,15 @@
>> <6>isapnp: No Plug & Play device found
>> <6>Real Time Clock Driver v1.12ac
>> <6>Intel 82802 RNG detected
>> -<6>Linux agpgart interface v0.101 (c) Dave Jones
>> +<6>Linux agpgart interface v0.102 (c) Dave Jones
>> <6>agpgart: Detected an Intel i810 E Chipset.
>> <6>agpgart: detected 4MB dedicated video ram.
>> <6>agpgart: AGP aperture is 64M @ 0xf8000000
>> <4>ACPI: PCI Interrupt Link [LNKA] enabled at IRQ 9
>> <7>PCI: setting IRQ 9 as level-triggered
>> <6>ACPI: PCI Interrupt 0000:00:01.0[A] -> Link [LNKA] -> GSI 9 (level, low) -> IRQ 9
>> -<4>i810-i2c: Probe DDC1 Bus
>> -<4>i810fb_init_pci: DDC probe successful
>> -<4>Console: switching to colour frame buffer device 160x64
>> -<4>I810FB: fb0 : Intel(R) 810E Framebuffer Device v0.9.0
>> -<4>I810FB: Video RAM : 4096K
>> -<4>I810FB: Monitor : H: 30-83 KHz V: 55-75 Hz
>> -<4>I810FB: Mode : 1280x1024-8bpp@60Hz
>> +<4>i810fb_alloc_fbmem: can't bind framebuffer memory
>> +<4>i810fb: probe of 0000:00:01.0 failed with error -16
>> <6>Serial: 8250/16550 driver $Revision: 1.90 $ 4 ports, IRQ sharing enabled
>> <6>serial8250: ttyS0 at I/O 0x3f8 (irq = 4) is a 16550A
>> <6>serial8250: ttyS1 at I/O 0x2f8 (irq = 3) is a 16550A
>>
>> Please let me know if you need more information.
>>
>>
>
> Don't know. But I bet someone on the Cc does...
>
Tilman,
Thanks for reporting.
Can you try the attached patch to see if that fixes the problem.
Regards,
Thomas Hellström
[-- Attachment #2: i810fix.diff --]
[-- Type: text/x-patch, Size: 844 bytes --]
diff --git a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c
index 91c1f36..6ef0960 100644
--- a/drivers/char/agp/generic.c
+++ b/drivers/char/agp/generic.c
@@ -190,6 +190,7 @@ struct agp_memory *agp_create_memory(int
return NULL;
}
new->num_scratch_pages = scratch_pages;
+ new->type = AGP_NORMAL_MEMORY;
return new;
}
EXPORT_SYMBOL(agp_create_memory);
diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
index b8896c8..5a0713c 100644
--- a/drivers/char/agp/intel-agp.c
+++ b/drivers/char/agp/intel-agp.c
@@ -260,6 +260,7 @@ static int intel_i810_insert_entries(str
readl(intel_i810_private.registers+I810_PTE_BASE+((i-1)*4));
break;
case AGP_PHYS_MEMORY:
+ case AGP_NORMAL_MEMORY:
if (!mem->is_flushed)
global_cache_flush();
for (i = 0, j = pg_start; i < mem->page_count; i++, j++) {
^ permalink raw reply related [flat|nested] 93+ messages in thread* Re: i810fb fails to load
2007-01-22 13:42 ` i810fb fails to load Thomas Hellström
@ 2007-01-22 18:30 ` Tilman Schmidt
2007-01-22 21:50 ` Dave Airlie
1 sibling, 0 replies; 93+ messages in thread
From: Tilman Schmidt @ 2007-01-22 18:30 UTC (permalink / raw)
To: Thomas Hellström
Cc: Andrew Morton, linux-kernel, linux-fbdev-devel, Dave Airlie
[-- Attachment #1: Type: text/plain, Size: 1558 bytes --]
Am 22.01.2007 14:42 schrieb Thomas Hellström:
>>> On Mon, 15 Jan 2007 00:52:36 +0100 Tilman Schmidt <tilman@imap.cc> wrote:
>>> With kernel 2.6.20-rc4-mm1 and all hotfixes, i810fb fails to load on my
>>> Dell Optiplex GX110. [...]
>>
> Can you try the attached patch to see if that fixes the problem.
Yes, that patch fixes it.
Thanks
Tilman
> ------------------------------------------------------------------------
>
> diff --git a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c
> index 91c1f36..6ef0960 100644
> --- a/drivers/char/agp/generic.c
> +++ b/drivers/char/agp/generic.c
> @@ -190,6 +190,7 @@ struct agp_memory *agp_create_memory(int
> return NULL;
> }
> new->num_scratch_pages = scratch_pages;
> + new->type = AGP_NORMAL_MEMORY;
> return new;
> }
> EXPORT_SYMBOL(agp_create_memory);
> diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
> index b8896c8..5a0713c 100644
> --- a/drivers/char/agp/intel-agp.c
> +++ b/drivers/char/agp/intel-agp.c
> @@ -260,6 +260,7 @@ static int intel_i810_insert_entries(str
> readl(intel_i810_private.registers+I810_PTE_BASE+((i-1)*4));
> break;
> case AGP_PHYS_MEMORY:
> + case AGP_NORMAL_MEMORY:
> if (!mem->is_flushed)
> global_cache_flush();
> for (i = 0, j = pg_start; i < mem->page_count; i++, j++) {
--
Tilman Schmidt E-Mail: tilman@imap.cc
Bonn, Germany
Diese Nachricht besteht zu 100% aus wiederverwerteten Bits.
Ungeöffnet mindestens haltbar bis: (siehe Rückseite)
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 253 bytes --]
^ permalink raw reply [flat|nested] 93+ messages in thread* Re: i810fb fails to load
2007-01-22 13:42 ` i810fb fails to load Thomas Hellström
2007-01-22 18:30 ` Tilman Schmidt
@ 2007-01-22 21:50 ` Dave Airlie
2007-01-23 8:10 ` Thomas Hellström
1 sibling, 1 reply; 93+ messages in thread
From: Dave Airlie @ 2007-01-22 21:50 UTC (permalink / raw)
To: Thomas Hellström
Cc: Tilman Schmidt, Andrew Morton, linux-kernel, linux-fbdev-devel,
Dave Airlie
> >>
> >>
> >
> > Don't know. But I bet someone on the Cc does...
> >
> Tilman,
> Thanks for reporting.
> Can you try the attached patch to see if that fixes the problem.
>
Hi Thomas,
This also fixes X starting on old i810/5 hardware, I had noticed it
broken but hadn't had time to investigate it, this patch fixes it...
Dave.
^ permalink raw reply [flat|nested] 93+ messages in thread
* Re: i810fb fails to load
2007-01-22 21:50 ` Dave Airlie
@ 2007-01-23 8:10 ` Thomas Hellström
0 siblings, 0 replies; 93+ messages in thread
From: Thomas Hellström @ 2007-01-23 8:10 UTC (permalink / raw)
To: Dave Airlie
Cc: Tilman Schmidt, Andrew Morton, linux-kernel, linux-fbdev-devel,
Dave Airlie
Dave Airlie wrote:
>> >>
>> >>
>> >
>> > Don't know. But I bet someone on the Cc does...
>> >
>> Tilman,
>> Thanks for reporting.
>> Can you try the attached patch to see if that fixes the problem.
>>
>
> Hi Thomas,
>
> This also fixes X starting on old i810/5 hardware, I had noticed it
> broken but hadn't had time to investigate it, this patch fixes it...
>
> Dave.
Great.
The oldest hardware I have is an i915 which hampers me a bit.
/Thomas
^ permalink raw reply [flat|nested] 93+ messages in thread
* Re: i810fb fails to load
@ 2007-01-23 8:10 ` Thomas Hellström
0 siblings, 0 replies; 93+ messages in thread
From: Thomas Hellström @ 2007-01-23 8:10 UTC (permalink / raw)
To: Dave Airlie
Cc: Andrew Morton, linux-fbdev-devel, Dave Airlie, Tilman Schmidt,
linux-kernel
Dave Airlie wrote:
>> >>
>> >>
>> >
>> > Don't know. But I bet someone on the Cc does...
>> >
>> Tilman,
>> Thanks for reporting.
>> Can you try the attached patch to see if that fixes the problem.
>>
>
> Hi Thomas,
>
> This also fixes X starting on old i810/5 hardware, I had noticed it
> broken but hadn't had time to investigate it, this patch fixes it...
>
> Dave.
Great.
The oldest hardware I have is an i915 which hampers me a bit.
/Thomas
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
^ permalink raw reply [flat|nested] 93+ messages in thread
* [-mm patch] fs/unionfs/: possible cleanups
2007-01-12 6:26 2.6.20-rc4-mm1 Andrew Morton
` (10 preceding siblings ...)
2007-01-14 23:52 ` i810fb fails to load (was: 2.6.20-rc4-mm1) Tilman Schmidt
@ 2007-01-18 21:55 ` Adrian Bunk
2007-01-20 22:06 ` Josef Sipek
2007-01-19 18:40 ` Adrian Bunk
` (6 subsequent siblings)
18 siblings, 1 reply; 93+ messages in thread
From: Adrian Bunk @ 2007-01-18 21:55 UTC (permalink / raw)
To: Andrew Morton, jsipek; +Cc: linux-kernel, unionfs
On Thu, Jan 11, 2007 at 10:26:27PM -0800, Andrew Morton wrote:
>...
> - Added the unionfs filesystem driver as git-unionfs.patch (Josef "Jeff"
> Sipek <jsipek@cs.sunysb.edu>)
>...
> Changes since 2.6.20-rc3-mm1:
>...
> git-unionfs.patch
>...
> git trees
>...
Let's start with a small exercise:
Consider sparse tells you about a global function:
warning: symbol 'unionfs_d_revalidate_wrap' was not declared. Should
it be static?
I'll give three possible solutions, spot the one that is always wrong:
1. make the function static
2. add a prototype in a header file
3. add a prototype in the C file
If you need a hint, look at what the patch below removes...
<-- snip -->
This patch contains the following possible cleanups:
- every function should #include the headers containing the prototypes
of it's global functions
- static functions in C files shouldn't be marked "inline", gcc should
know best when to inline them
- make needlessly global code static
- #if 0 the following unused global function:
- stale_inode.c: is_stale_inode()
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
fs/unionfs/commonfops.c | 6 +--
fs/unionfs/copyup.c | 59 +++++++++++++++++++++------------------
fs/unionfs/dentry.c | 11 +------
fs/unionfs/file.c | 17 +++--------
fs/unionfs/inode.c | 19 ++++--------
fs/unionfs/main.c | 4 +-
fs/unionfs/rdstate.c | 2 -
fs/unionfs/sioq.c | 2 -
fs/unionfs/sioq.h | 1
fs/unionfs/stale_inode.c | 9 +++--
fs/unionfs/union.h | 13 --------
11 files changed, 60 insertions(+), 83 deletions(-)
--- linux-2.6.20-rc4-mm1/fs/unionfs/union.h.old 2007-01-18 21:02:45.000000000 +0100
+++ linux-2.6.20-rc4-mm1/fs/unionfs/union.h 2007-01-18 21:32:42.000000000 +0100
@@ -241,11 +241,6 @@
/* replicates the directory structure upto given dentry in given branch */
extern struct dentry *create_parents(struct inode *dir, struct dentry *dentry,
int bindex);
-struct dentry *create_parents_named(struct inode *dir, struct dentry *dentry,
- const char *name, int bindex);
-
-/* check if two branches overlap */
-extern int is_branch_overlap(struct dentry *dent1, struct dentry *dent2);
/* partial lookup */
extern int unionfs_partial_lookup(struct dentry *dentry);
@@ -265,10 +260,6 @@
/* copies a dentry from dbstart to newbindex branch */
extern int copyup_dentry(struct inode *dir, struct dentry *dentry, int bstart,
int new_bindex, struct file **copyup_file, loff_t len);
-extern int copyup_named_dentry(struct inode *dir, struct dentry *dentry,
- int bstart, int new_bindex, const char *name,
- int namelen, struct file **copyup_file,
- loff_t len);
extern int remove_whiteouts(struct dentry *dentry, struct dentry *hidden_dentry,
int bindex);
@@ -325,9 +316,6 @@
int unionfs_ioctl_queryfile(struct file *file, unsigned int cmd,
unsigned long arg);
-/* Verify that a branch is valid. */
-int check_branch(struct nameidata *nd);
-
#ifdef CONFIG_UNION_FS_XATTR
/* Extended attribute functions. */
extern void *unionfs_xattr_alloc(size_t size, size_t limit);
@@ -395,7 +383,6 @@
}
struct dentry *unionfs_lookup_backend(struct dentry *dentry, struct nameidata *nd, int lookupmode);
-int is_stale_inode(struct inode *inode);
void make_stale_inode(struct inode *inode);
#define IS_SET(sb, check_flag) ((check_flag) & MOUNT_FLAG(sb))
--- linux-2.6.20-rc4-mm1/fs/unionfs/copyup.c.old 2007-01-18 21:03:05.000000000 +0100
+++ linux-2.6.20-rc4-mm1/fs/unionfs/copyup.c 2007-01-18 21:35:33.000000000 +0100
@@ -18,6 +18,14 @@
#include "union.h"
+static int copyup_named_dentry(struct inode *dir, struct dentry *dentry,
+ int bstart, int new_bindex, const char *name,
+ int namelen, struct file **copyup_file,
+ loff_t len);
+static struct dentry *create_parents_named(struct inode *dir,
+ struct dentry *dentry,
+ const char *name, int bindex);
+
#ifdef CONFIG_UNION_FS_XATTR
/* copyup all extended attrs for a given dentry */
static int copyup_xattrs(struct dentry *old_hidden_dentry,
@@ -129,10 +137,10 @@
* if the object being copied up is a regular file, the file is only created,
* the contents have to be copied up separately
*/
-static inline int __copyup_ndentry(struct dentry *old_hidden_dentry,
- struct dentry *new_hidden_dentry,
- struct dentry *new_hidden_parent_dentry,
- char *symbuf)
+static int __copyup_ndentry(struct dentry *old_hidden_dentry,
+ struct dentry *new_hidden_dentry,
+ struct dentry *new_hidden_parent_dentry,
+ char *symbuf)
{
int err = 0;
umode_t old_mode = old_hidden_dentry->d_inode->i_mode;
@@ -179,13 +187,10 @@
return err;
}
-static inline int __copyup_reg_data(struct dentry *dentry,
- struct dentry *new_hidden_dentry,
- int new_bindex,
- struct dentry *old_hidden_dentry,
- int old_bindex,
- struct file **copyup_file,
- loff_t len)
+static int __copyup_reg_data(struct dentry *dentry,
+ struct dentry *new_hidden_dentry, int new_bindex,
+ struct dentry *old_hidden_dentry, int old_bindex,
+ struct file **copyup_file, loff_t len)
{
struct super_block *sb = dentry->d_sb;
struct file *input_file;
@@ -300,11 +305,9 @@
/* dput the lower references for old and new dentry & clear a lower dentry
* pointer
*/
-static inline void __clear(struct dentry *dentry,
- struct dentry *old_hidden_dentry,
- int old_bstart, int old_bend,
- struct dentry *new_hidden_dentry,
- int new_bindex)
+static void __clear(struct dentry *dentry, struct dentry *old_hidden_dentry,
+ int old_bstart, int old_bend,
+ struct dentry *new_hidden_dentry, int new_bindex)
{
/* get rid of the hidden dentry and all its traces */
unionfs_set_lower_dentry_idx(dentry, new_bindex, NULL);
@@ -316,9 +319,10 @@
}
/* copy up a dentry to a file of specified name */
-int copyup_named_dentry(struct inode *dir, struct dentry *dentry,
- int bstart, int new_bindex, const char *name,
- int namelen, struct file **copyup_file, loff_t len)
+static int copyup_named_dentry(struct inode *dir, struct dentry *dentry,
+ int bstart, int new_bindex, const char *name,
+ int namelen, struct file **copyup_file,
+ loff_t len)
{
struct dentry *new_hidden_dentry;
struct dentry *old_hidden_dentry = NULL;
@@ -510,8 +514,8 @@
return create_parents_named(dir, dentry, dentry->d_name.name, bindex);
}
-static inline void __cleanup_dentry(struct dentry * dentry, int bindex,
- int old_bstart, int old_bend)
+static void __cleanup_dentry(struct dentry * dentry, int bindex,
+ int old_bstart, int old_bend)
{
int loop_start;
int loop_end;
@@ -557,8 +561,8 @@
}
/* set lower inode ptr and update bstart & bend if necessary */
-static inline void __set_inode(struct dentry * upper, struct dentry * lower,
- int bindex)
+static void __set_inode(struct dentry * upper, struct dentry * lower,
+ int bindex)
{
unionfs_set_lower_inode_idx(upper->d_inode, bindex,
igrab(lower->d_inode));
@@ -570,8 +574,8 @@
}
/* set lower dentry ptr and update bstart & bend if necessary */
-static inline void __set_dentry(struct dentry * upper, struct dentry * lower,
- int bindex)
+static void __set_dentry(struct dentry * upper, struct dentry * lower,
+ int bindex)
{
unionfs_set_lower_dentry_idx(upper, bindex, lower);
if (likely(dbstart(upper) > bindex))
@@ -583,8 +587,9 @@
/* This function replicates the directory structure upto given dentry
* in the bindex branch.
*/
-struct dentry *create_parents_named(struct inode *dir, struct dentry *dentry,
- const char *name, int bindex)
+static struct dentry *create_parents_named(struct inode *dir,
+ struct dentry *dentry,
+ const char *name, int bindex)
{
int err;
struct dentry *child_dentry;
--- linux-2.6.20-rc4-mm1/fs/unionfs/dentry.c.old 2007-01-18 21:15:30.000000000 +0100
+++ linux-2.6.20-rc4-mm1/fs/unionfs/dentry.c 2007-01-18 21:21:21.000000000 +0100
@@ -18,12 +18,6 @@
#include "union.h"
-/* declarations added for "sparse" */
-extern int unionfs_d_revalidate_wrap(struct dentry *dentry,
- struct nameidata *nd);
-extern void unionfs_d_release(struct dentry *dentry);
-extern void unionfs_d_iput(struct dentry *dentry, struct inode *inode);
-
/*
* returns 1 if valid, 0 otherwise.
*/
@@ -180,7 +174,8 @@
return valid;
}
-int unionfs_d_revalidate_wrap(struct dentry *dentry, struct nameidata *nd)
+static int unionfs_d_revalidate_wrap(struct dentry *dentry,
+ struct nameidata *nd)
{
int err;
@@ -191,7 +186,7 @@
return err;
}
-void unionfs_d_release(struct dentry *dentry)
+static void unionfs_d_release(struct dentry *dentry)
{
int bindex, bstart, bend;
--- linux-2.6.20-rc4-mm1/fs/unionfs/file.c.old 2007-01-18 21:21:45.000000000 +0100
+++ linux-2.6.20-rc4-mm1/fs/unionfs/file.c 2007-01-18 21:23:51.000000000 +0100
@@ -18,11 +18,6 @@
#include "union.h"
-/* declarations for sparse */
-extern ssize_t unionfs_read(struct file *, char __user *, size_t, loff_t *);
-extern ssize_t unionfs_write(struct file *, const char __user *, size_t,
- loff_t *);
-
/*******************
* File Operations *
*******************/
@@ -56,8 +51,8 @@
return err;
}
-ssize_t unionfs_read(struct file * file, char __user * buf, size_t count,
- loff_t * ppos)
+static ssize_t unionfs_read(struct file * file, char __user * buf,
+ size_t count, loff_t * ppos)
{
struct file *hidden_file;
loff_t pos = *ppos;
@@ -78,8 +73,8 @@
return err;
}
-ssize_t __unionfs_write(struct file * file, const char __user * buf,
- size_t count, loff_t * ppos)
+static ssize_t __unionfs_write(struct file * file, const char __user * buf,
+ size_t count, loff_t * ppos)
{
int err = -EINVAL;
struct file *hidden_file = NULL;
@@ -123,8 +118,8 @@
return err;
}
-ssize_t unionfs_write(struct file * file, const char __user * buf, size_t count,
- loff_t * ppos)
+static ssize_t unionfs_write(struct file * file, const char __user * buf,
+ size_t count, loff_t * ppos)
{
int err = 0;
--- linux-2.6.20-rc4-mm1/fs/unionfs/inode.c.old 2007-01-18 21:28:17.000000000 +0100
+++ linux-2.6.20-rc4-mm1/fs/unionfs/inode.c 2007-01-18 21:29:43.000000000 +0100
@@ -18,14 +18,6 @@
#include "union.h"
-/* declarations added for "sparse" */
-extern struct dentry *unionfs_lookup(struct inode *, struct dentry *,
- struct nameidata *);
-extern int unionfs_readlink(struct dentry *dentry, char __user * buf,
- int bufsiz);
-extern void unionfs_put_link(struct dentry *dentry, struct nameidata *nd,
- void *cookie);
-
static int unionfs_create(struct inode *parent, struct dentry *dentry,
int mode, struct nameidata *nd)
{
@@ -195,8 +187,9 @@
return err;
}
-struct dentry *unionfs_lookup(struct inode *parent, struct dentry *dentry,
- struct nameidata *nd)
+static struct dentry *unionfs_lookup(struct inode *parent,
+ struct dentry *dentry,
+ struct nameidata *nd)
{
struct nameidata lowernd; /* TODO: be gentler to the stack */
@@ -688,7 +681,8 @@
return err;
}
-int unionfs_readlink(struct dentry *dentry, char __user * buf, int bufsiz)
+static int unionfs_readlink(struct dentry *dentry, char __user * buf,
+ int bufsiz)
{
int err;
struct dentry *hidden_dentry;
@@ -743,7 +737,8 @@
return ERR_PTR(err);
}
-void unionfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
+static void unionfs_put_link(struct dentry *dentry, struct nameidata *nd,
+ void *cookie)
{
kfree(nd_get_link(nd));
}
--- linux-2.6.20-rc4-mm1/fs/unionfs/main.c.old 2007-01-18 21:30:34.000000000 +0100
+++ linux-2.6.20-rc4-mm1/fs/unionfs/main.c 2007-01-18 21:31:05.000000000 +0100
@@ -188,7 +188,7 @@
* 2) it exists
* 3) is a directory
*/
-int check_branch(struct nameidata *nd)
+static int check_branch(struct nameidata *nd)
{
if (!strcmp(nd->dentry->d_sb->s_type->name, "unionfs"))
return -EINVAL;
@@ -200,7 +200,7 @@
}
/* checks if two hidden_dentries have overlapping branches */
-int is_branch_overlap(struct dentry *dent1, struct dentry *dent2)
+static int is_branch_overlap(struct dentry *dent1, struct dentry *dent2)
{
struct dentry *dent = NULL;
--- linux-2.6.20-rc4-mm1/fs/unionfs/rdstate.c.old 2007-01-18 21:31:24.000000000 +0100
+++ linux-2.6.20-rc4-mm1/fs/unionfs/rdstate.c 2007-01-18 21:31:37.000000000 +0100
@@ -232,7 +232,7 @@
return cursor;
}
-inline struct filldir_node *alloc_filldir_node(const char *name, int namelen,
+static struct filldir_node *alloc_filldir_node(const char *name, int namelen,
unsigned int hash, int bindex)
{
return kmem_cache_alloc(unionfs_filldir_cachep, GFP_KERNEL);
--- linux-2.6.20-rc4-mm1/fs/unionfs/sioq.h.old 2007-01-18 21:36:56.000000000 +0100
+++ linux-2.6.20-rc4-mm1/fs/unionfs/sioq.h 2007-01-18 21:37:02.000000000 +0100
@@ -61,7 +61,6 @@
};
};
-extern struct workqueue_struct *sioq;
extern int __init init_sioq(void);
extern __exit void stop_sioq(void);
extern void run_sioq(work_func_t func, struct sioq_args *args);
--- linux-2.6.20-rc4-mm1/fs/unionfs/sioq.c.old 2007-01-18 21:32:14.000000000 +0100
+++ linux-2.6.20-rc4-mm1/fs/unionfs/sioq.c 2007-01-18 21:32:22.000000000 +0100
@@ -24,7 +24,7 @@
* whiteouts).
*/
-struct workqueue_struct *sioq;
+static struct workqueue_struct *sioq;
int __init init_sioq(void)
{
--- linux-2.6.20-rc4-mm1/fs/unionfs/stale_inode.c.old 2007-01-18 21:33:03.000000000 +0100
+++ linux-2.6.20-rc4-mm1/fs/unionfs/stale_inode.c 2007-01-18 21:37:40.000000000 +0100
@@ -13,10 +13,9 @@
#include <linux/stat.h>
#include <linux/sched.h>
-static struct address_space_operations unionfs_stale_aops;
+#include "union.h"
-/* declarations for "sparse */
-extern struct inode_operations stale_inode_ops;
+static struct address_space_operations unionfs_stale_aops;
/*
* The follow_link operation is special: it must behave as a no-op
@@ -51,7 +50,7 @@
.lock = ESTALE_ERROR,
};
-struct inode_operations stale_inode_ops = {
+static struct inode_operations stale_inode_ops = {
.create = ESTALE_ERROR,
.lookup = ESTALE_ERROR,
.link = ESTALE_ERROR,
@@ -99,6 +98,7 @@
* those created by make_stale_inode() above.
*/
+#if 0
/**
* is_stale_inode - is an inode errored
* @inode: inode to test
@@ -109,4 +109,5 @@
{
return (inode->i_op == &stale_inode_ops);
}
+#endif /* 0 */
--- linux-2.6.20-rc4-mm1/fs/unionfs/commonfops.c.old 2007-01-18 21:34:11.000000000 +0100
+++ linux-2.6.20-rc4-mm1/fs/unionfs/commonfops.c 2007-01-18 21:34:24.000000000 +0100
@@ -292,7 +292,7 @@
}
/* unionfs_open helper function: open a directory */
-static inline int __open_dir(struct inode *inode, struct file *file)
+static int __open_dir(struct inode *inode, struct file *file)
{
struct dentry *hidden_dentry;
struct file *hidden_file;
@@ -326,7 +326,7 @@
}
/* unionfs_open helper function: open a file */
-static inline int __open_file(struct inode *inode, struct file *file)
+static int __open_file(struct inode *inode, struct file *file)
{
struct dentry *hidden_dentry;
struct file *hidden_file;
@@ -493,7 +493,7 @@
}
/* pass the ioctl to the lower fs */
-static inline long do_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
+static long do_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
{
struct file *hidden_file;
int err;
^ permalink raw reply [flat|nested] 93+ messages in thread* Re: [-mm patch] fs/unionfs/: possible cleanups
2007-01-18 21:55 ` [-mm patch] fs/unionfs/: possible cleanups Adrian Bunk
@ 2007-01-20 22:06 ` Josef Sipek
0 siblings, 0 replies; 93+ messages in thread
From: Josef Sipek @ 2007-01-20 22:06 UTC (permalink / raw)
To: Adrian Bunk; +Cc: Andrew Morton, linux-kernel, unionfs
On Thu, Jan 18, 2007 at 10:55:54PM +0100, Adrian Bunk wrote:
> Let's start with a small exercise:
>
> Consider sparse tells you about a global function:
> warning: symbol 'unionfs_d_revalidate_wrap' was not declared. Should
> it be static?
I ran sparse last week, and cleaned up a few things (not commited to korg
yet). I'll use your patch instead.
> This patch contains the following possible cleanups:
> - every function should #include the headers containing the prototypes
> of it's global functions
> - static functions in C files shouldn't be marked "inline", gcc should
> know best when to inline them
> - make needlessly global code static
> - #if 0 the following unused global function:
> - stale_inode.c: is_stale_inode()
>
> Signed-off-by: Adrian Bunk <bunk@stusta.de>
Thanks.
Josef "Jeff" Sipek.
--
NT is to UNIX what a doughnut is to a particle accelerator.
^ permalink raw reply [flat|nested] 93+ messages in thread
* [-mm patch] drivers/mtd/ubi/: possible cleanups
2007-01-12 6:26 2.6.20-rc4-mm1 Andrew Morton
@ 2007-01-19 18:40 ` Adrian Bunk
2007-01-12 10:25 ` 2.6.20-rc4-mm1 Mariusz Kozlowski
` (17 subsequent siblings)
18 siblings, 0 replies; 93+ messages in thread
From: Adrian Bunk @ 2007-01-19 18:40 UTC (permalink / raw)
To: Andrew Morton, Artem Bityutskiy; +Cc: linux-kernel, dwmw2, linux-mtd
On Thu, Jan 11, 2007 at 10:26:27PM -0800, Andrew Morton wrote:
>...
> Changes since 2.6.20-rc3-mm1:
>...
> git-ubi.patch
>...
> git trees
>...
This patch contains the following possible cleanups:
- make needlessly global code static
- remove the following unused variable:
- debug.c: alloc_prints
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
BTW: Do you really need that many different
CONFIG_MTD_UBI_DEBUG_* options?
drivers/mtd/ubi/cdev.c | 4 +-
drivers/mtd/ubi/debug.c | 57 ++++++++++++++++++----------------------
2 files changed, 28 insertions(+), 33 deletions(-)
--- linux-2.6.20-rc4-mm1/drivers/mtd/ubi/cdev.c.old 2007-01-19 17:49:47.000000000 +0100
+++ linux-2.6.20-rc4-mm1/drivers/mtd/ubi/cdev.c 2007-01-19 17:50:03.000000000 +0100
@@ -47,7 +47,7 @@
static int vol_cdev_open(struct inode *inode, struct file *file);
static int vol_cdev_release(struct inode *inode, struct file *file);
-loff_t vol_cdev_llseek(struct file *file, loff_t offset, int origin);
+static loff_t vol_cdev_llseek(struct file *file, loff_t offset, int origin);
static ssize_t vol_cdev_read(struct file *file, __user char *buf,
size_t count, loff_t * offp);
static ssize_t vol_cdev_write(struct file *file, const char __user *buf,
@@ -224,7 +224,7 @@
* positive offset in case of success and a negative error code in case of
* failure.
*/
-loff_t vol_cdev_llseek(struct file *file, loff_t offset, int origin)
+static loff_t vol_cdev_llseek(struct file *file, loff_t offset, int origin)
{
const struct ubi_vtbl_vtr *vtr;
struct ubi_vol_desc *desc = file->private_data;
--- linux-2.6.20-rc4-mm1/drivers/mtd/ubi/debug.c.old 2007-01-19 17:50:42.000000000 +0100
+++ linux-2.6.20-rc4-mm1/drivers/mtd/ubi/debug.c 2007-01-19 18:43:59.000000000 +0100
@@ -67,74 +67,69 @@
static int vb_err_prints;
#endif
#ifdef CONFIG_MTD_UBI_DEBUG_MSG_UIF
-int uif_prints = 1;
+static int uif_prints = 1;
#else
-int uif_prints;
+static int uif_prints;
#endif
#ifdef CONFIG_MTD_UBI_DEBUG_MSG_CDEV
-int cdev_prints = 1;
+static int cdev_prints = 1;
#else
-int cdev_prints;
+static int cdev_prints;
#endif
#ifdef CONFIG_MTD_UBI_DEBUG_MSG_GLUEBI
-int gluebi_prints = 1;
+static int gluebi_prints = 1;
#else
-int gluebi_prints;
+static int gluebi_prints;
#endif
#ifdef CONFIG_MTD_UBI_DEBUG_MSG_VMT
-int vmt_prints = 1;
+static int vmt_prints = 1;
#else
-int vmt_prints;
+static int vmt_prints;
#endif
#ifdef CONFIG_MTD_UBI_DEBUG_MSG_UPD
-int upd_prints = 1;
+static int upd_prints = 1;
#else
-int upd_prints;
+static int upd_prints;
#endif
#ifdef CONFIG_MTD_UBI_DEBUG_MSG_VTBL
-int vtbl_prints = 1;
+static int vtbl_prints = 1;
#else
-int vtbl_prints;
+static int vtbl_prints;
#endif
#ifdef CONFIG_MTD_UBI_DEBUG_MSG_ACC
-int acc_prints = 1;
+static int acc_prints = 1;
#else
-int acc_prints;
+static int acc_prints;
#endif
#ifdef CONFIG_MTD_UBI_DEBUG_MSG_EBA
-int eba_prints = 1;
+static int eba_prints = 1;
#else
-int eba_prints;
+static int eba_prints;
#endif
#ifdef CONFIG_MTD_UBI_DEBUG_MSG_WL
-int wl_prints = 1;
+static int wl_prints = 1;
#else
-int wl_prints;
+static int wl_prints;
#endif
#ifdef CONFIG_MTD_UBI_DEBUG_MSG_BGT
-int bgt_prints = 1;
+static int bgt_prints = 1;
#else
-int bgt_prints;
-#endif
-#ifdef CONFIG_MTD_UBI_DEBUG_MSG_ALLOC
-int alloc_prints = 1;
-#else
-int alloc_prints;
+static int bgt_prints;
#endif
#ifdef CONFIG_MTD_UBI_DEBUG_MSG_IO
-int io_prints = 1;
+static int io_prints = 1;
#else
-int io_prints;
+static int io_prints;
#endif
#ifdef CONFIG_MTD_UBI_DEBUG_MSG_BLD
-int bld_prints = 1;
+static int bld_prints = 1;
#else
-int bld_prints;
+static int bld_prints;
#endif
#ifdef CONFIG_MTD_UBI_DEBUG_MSG_SCAN
-int scan_prints = 1;
+static int scan_prints = 1;
#else
-int scan_prints;
+static int scan_prints;
#endif
/* If debugging messages should also go to the console */
^ permalink raw reply [flat|nested] 93+ messages in thread* [-mm patch] drivers/mtd/ubi/: possible cleanups
@ 2007-01-19 18:40 ` Adrian Bunk
0 siblings, 0 replies; 93+ messages in thread
From: Adrian Bunk @ 2007-01-19 18:40 UTC (permalink / raw)
To: Andrew Morton, Artem Bityutskiy; +Cc: linux-mtd, dwmw2, linux-kernel
On Thu, Jan 11, 2007 at 10:26:27PM -0800, Andrew Morton wrote:
>...
> Changes since 2.6.20-rc3-mm1:
>...
> git-ubi.patch
>...
> git trees
>...
This patch contains the following possible cleanups:
- make needlessly global code static
- remove the following unused variable:
- debug.c: alloc_prints
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
BTW: Do you really need that many different
CONFIG_MTD_UBI_DEBUG_* options?
drivers/mtd/ubi/cdev.c | 4 +-
drivers/mtd/ubi/debug.c | 57 ++++++++++++++++++----------------------
2 files changed, 28 insertions(+), 33 deletions(-)
--- linux-2.6.20-rc4-mm1/drivers/mtd/ubi/cdev.c.old 2007-01-19 17:49:47.000000000 +0100
+++ linux-2.6.20-rc4-mm1/drivers/mtd/ubi/cdev.c 2007-01-19 17:50:03.000000000 +0100
@@ -47,7 +47,7 @@
static int vol_cdev_open(struct inode *inode, struct file *file);
static int vol_cdev_release(struct inode *inode, struct file *file);
-loff_t vol_cdev_llseek(struct file *file, loff_t offset, int origin);
+static loff_t vol_cdev_llseek(struct file *file, loff_t offset, int origin);
static ssize_t vol_cdev_read(struct file *file, __user char *buf,
size_t count, loff_t * offp);
static ssize_t vol_cdev_write(struct file *file, const char __user *buf,
@@ -224,7 +224,7 @@
* positive offset in case of success and a negative error code in case of
* failure.
*/
-loff_t vol_cdev_llseek(struct file *file, loff_t offset, int origin)
+static loff_t vol_cdev_llseek(struct file *file, loff_t offset, int origin)
{
const struct ubi_vtbl_vtr *vtr;
struct ubi_vol_desc *desc = file->private_data;
--- linux-2.6.20-rc4-mm1/drivers/mtd/ubi/debug.c.old 2007-01-19 17:50:42.000000000 +0100
+++ linux-2.6.20-rc4-mm1/drivers/mtd/ubi/debug.c 2007-01-19 18:43:59.000000000 +0100
@@ -67,74 +67,69 @@
static int vb_err_prints;
#endif
#ifdef CONFIG_MTD_UBI_DEBUG_MSG_UIF
-int uif_prints = 1;
+static int uif_prints = 1;
#else
-int uif_prints;
+static int uif_prints;
#endif
#ifdef CONFIG_MTD_UBI_DEBUG_MSG_CDEV
-int cdev_prints = 1;
+static int cdev_prints = 1;
#else
-int cdev_prints;
+static int cdev_prints;
#endif
#ifdef CONFIG_MTD_UBI_DEBUG_MSG_GLUEBI
-int gluebi_prints = 1;
+static int gluebi_prints = 1;
#else
-int gluebi_prints;
+static int gluebi_prints;
#endif
#ifdef CONFIG_MTD_UBI_DEBUG_MSG_VMT
-int vmt_prints = 1;
+static int vmt_prints = 1;
#else
-int vmt_prints;
+static int vmt_prints;
#endif
#ifdef CONFIG_MTD_UBI_DEBUG_MSG_UPD
-int upd_prints = 1;
+static int upd_prints = 1;
#else
-int upd_prints;
+static int upd_prints;
#endif
#ifdef CONFIG_MTD_UBI_DEBUG_MSG_VTBL
-int vtbl_prints = 1;
+static int vtbl_prints = 1;
#else
-int vtbl_prints;
+static int vtbl_prints;
#endif
#ifdef CONFIG_MTD_UBI_DEBUG_MSG_ACC
-int acc_prints = 1;
+static int acc_prints = 1;
#else
-int acc_prints;
+static int acc_prints;
#endif
#ifdef CONFIG_MTD_UBI_DEBUG_MSG_EBA
-int eba_prints = 1;
+static int eba_prints = 1;
#else
-int eba_prints;
+static int eba_prints;
#endif
#ifdef CONFIG_MTD_UBI_DEBUG_MSG_WL
-int wl_prints = 1;
+static int wl_prints = 1;
#else
-int wl_prints;
+static int wl_prints;
#endif
#ifdef CONFIG_MTD_UBI_DEBUG_MSG_BGT
-int bgt_prints = 1;
+static int bgt_prints = 1;
#else
-int bgt_prints;
-#endif
-#ifdef CONFIG_MTD_UBI_DEBUG_MSG_ALLOC
-int alloc_prints = 1;
-#else
-int alloc_prints;
+static int bgt_prints;
#endif
#ifdef CONFIG_MTD_UBI_DEBUG_MSG_IO
-int io_prints = 1;
+static int io_prints = 1;
#else
-int io_prints;
+static int io_prints;
#endif
#ifdef CONFIG_MTD_UBI_DEBUG_MSG_BLD
-int bld_prints = 1;
+static int bld_prints = 1;
#else
-int bld_prints;
+static int bld_prints;
#endif
#ifdef CONFIG_MTD_UBI_DEBUG_MSG_SCAN
-int scan_prints = 1;
+static int scan_prints = 1;
#else
-int scan_prints;
+static int scan_prints;
#endif
/* If debugging messages should also go to the console */
^ permalink raw reply [flat|nested] 93+ messages in thread* Re: [-mm patch] drivers/mtd/ubi/: possible cleanups
2007-01-19 18:40 ` Adrian Bunk
(?)
@ 2007-01-21 11:23 ` Artem Bityutskiy
-1 siblings, 0 replies; 93+ messages in thread
From: Artem Bityutskiy @ 2007-01-21 11:23 UTC (permalink / raw)
To: Adrian Bunk
Cc: Andrew Morton, Artem Bityutskiy, linux-mtd, dwmw2, linux-kernel
On Fri, 2007-01-19 at 19:40 +0100, Adrian Bunk wrote:
This patch contains the following possible cleanups:
> - make needlessly global code static
> - remove the following unused variable:
> - debug.c: alloc_prints
>
> Signed-off-by: Adrian Bunk <bunk@stusta.de>
>
I've committed this.
BTW: Do you really need that many different
> CONFIG_MTD_UBI_DEBUG_* options?
>
The idea is to be able to switch debugging messages on/off for different
units separately. But the number of the option may indeed be reduced - i
will try to do this.
Thanks!
--
Best regards,
Artem Bityutskiy
^ permalink raw reply [flat|nested] 93+ messages in thread
* [-mm patch] oops in drivers/net/shaper.c
2007-01-12 6:26 2.6.20-rc4-mm1 Andrew Morton
` (12 preceding siblings ...)
2007-01-19 18:40 ` Adrian Bunk
@ 2007-01-20 22:38 ` Frederik Deweerdt
2007-01-21 19:13 ` [-mm patch] remove one remaining "#define BCM_TSO 1" Adrian Bunk
` (4 subsequent siblings)
18 siblings, 0 replies; 93+ messages in thread
From: Frederik Deweerdt @ 2007-01-20 22:38 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel, alan
Hi,
The following code:
[...]
s = socket(AF_PACKET, SOCK_RAW, htons(ETH_P_ALL));
socket_address.sll_family = PF_PACKET;
socket_address.sll_protocol = htons(ETH_P_IP);
/*
* this happens to be shaper0 on my system
*/
=> socket_address.sll_ifindex = 2;
socket_address.sll_hatype = ARPHRD_ETHER;
socket_address.sll_pkttype = PACKET_OTHERHOST;
socket_address.sll_halen = ETH_ALEN;
socket_address.sll_addr[0] = 0x00;
socket_address.sll_addr[1] = 0x04;
socket_address.sll_addr[2] = 0x75;
socket_address.sll_addr[3] = 0xC8;
socket_address.sll_addr[4] = 0x28;
socket_address.sll_addr[5] = 0xE5;
socket_address.sll_addr[6] = 0x00;
socket_address.sll_addr[7] = 0x00;
memcpy((void *) buffer, (void *) dest_mac, ETH_ALEN);
memcpy((void *) (buffer + ETH_ALEN), (void *) src_mac, ETH_ALEN);
eh->h_proto = 0x00;
for (j = 0; j < 1500; j++) {
data[j] =
(unsigned
char) ((int) (255.0 * rand() / (RAND_MAX + 1.0)));
}
/*
* Oopses here
*/
=> send_result = sendto(s, buffer, 1499, 0,
(struct sockaddr *) &socket_address,
sizeof(socket_address));
[...]
Causes the following oops:
[ 66.355049] BUG: unable to handle kernel NULL pointer dereference at virtual address 00000000
[ 66.355053] printing eip:
[ 66.355055] 00000000
[ 66.355056] *pde = 00000000
[ 66.355059] Oops: 0000 [#1]
[ 66.355061] PREEMPT SMP DEBUG_PAGEALLOC
[ 66.355065] last sysfs file: /devices/pci0000:00/0000:00:1e.2/modalias
[ 66.355069] Modules linked in: snd_pcm_oss snd_mixer_oss snd_seq_dummy snd_seq_oss snd_seq_midi_event snd_seq snd_seq_device af_packet ohci_hcd fuse cpufreq_stats cpufreq_powersave cpufreq_ondemand cpufreq_conservative speedstep_centrino freq_table processor ac battery i915 drm usb_storage parport_pc parport sr_mod serio_raw yenta_socket rsrc_nonstatic pcmcia_core ipw2200 tg3 snd_intel8x0 snd_ac97_codec pcspkr ac97_bus snd_pcm ehci_hcd snd_timer snd soundcore snd_page_alloc uhci_hcd usbcore shpchp pci_hotplug joydev evdev tsdev
[ 66.355115] CPU: 0
[ 66.355116] EIP: 0060:[<00000000>] Not tainted VLI
[ 66.355117] EFLAGS: 00210282 (2.6.20-rc4-mm1-def01 #2)
[ 66.355122] EIP is at 0x0
[ 66.355124] eax: f6a1f480 ebx: f705a500 ecx: 00000800 edx: 00000000
[ 66.355128] esi: f6a1f480 edi: 00000800 ebp: f6261d90 esp: f6261d70
[ 66.355131] ds: 007b es: 007b fs: 00d8 gs: 0033 ss: 0068
[ 66.355134] Process aze (pid: 11005, ti=f6260000 task=f62d08b0 task.ti=f6260000)
[ 66.355136] Stack: c0294465 f6261ec0 00000000 000005db f705a000 f6261f34 f6316380 f705a000
[ 66.355145] f6261dc4 f8adaf03 f6261ec0 00000000 000005db f6b1b400 f6a1f480 00080e38
[ 66.355153] f6261ec0 ffffffea f8adc1e0 000005db f6316380 f6261eac c030e1c5 000005db
[ 66.355161] Call Trace:
[ 66.355163] [<c0105265>] show_trace_log_lvl+0x1a/0x30
[ 66.355171] [<c0105324>] show_stack_log_lvl+0xa9/0xd5
[ 66.355176] [<c0105549>] show_registers+0x1f9/0x362
[ 66.355180] [<c01057de>] die+0x12c/0x261
[ 66.355184] [<c039864f>] do_page_fault+0x2ef/0x5d0
[ 66.355188] [<c0396c74>] error_code+0x7c/0x84
[ 66.355192] [<f8adaf03>] packet_sendmsg+0x147/0x201 [af_packet]
[ 66.355199] [<c030e1c5>] sock_sendmsg+0xf9/0x116
[ 66.355204] [<c030eb54>] sys_sendto+0xbf/0xe0
[ 66.355208] [<c030f494>] sys_socketcall+0x1aa/0x277
[ 66.355212] [<c01041ea>] sysenter_past_esp+0x5f/0x99
[ 66.355216] =======================
[ 66.355218] Code: Bad EIP value.
[ 66.355223] EIP: [<00000000>] 0x0 SS:ESP 0068:f6261d70
shaper_header() should check for shaper->dev not being NULL (ie. the
shaper was actually attached) as in the following patch.
This happens in mainline too (tested 2.6.19.2).
Regards,
Frederik
Signed-off-by: Frederik Deweerdt <frederik.deweerdt@gmail.com>
diff --git a/drivers/net/shaper.c b/drivers/net/shaper.c
index e886e8d..40e9e27 100644
--- a/drivers/net/shaper.c
+++ b/drivers/net/shaper.c
@@ -340,6 +340,10 @@ static int shaper_header(struct sk_buff *skb, struct net_device *dev,
{
struct shaper *sh=dev->priv;
int v;
+
+ if(sh->dev==NULL)
+ return -ENODEV;
+
if(sh_debug)
printk("Shaper header\n");
skb->dev=sh->dev;
^ permalink raw reply related [flat|nested] 93+ messages in thread* [-mm patch] remove one remaining "#define BCM_TSO 1"
2007-01-12 6:26 2.6.20-rc4-mm1 Andrew Morton
` (13 preceding siblings ...)
2007-01-20 22:38 ` [-mm patch] oops in drivers/net/shaper.c Frederik Deweerdt
@ 2007-01-21 19:13 ` Adrian Bunk
2007-01-22 18:17 ` [-mm patch] drivers/firewire/: cleanups Adrian Bunk
` (3 subsequent siblings)
18 siblings, 0 replies; 93+ messages in thread
From: Adrian Bunk @ 2007-01-21 19:13 UTC (permalink / raw)
To: Andrew Morton, jgarzik; +Cc: linux-kernel, netdev, Arjan van de Ven
On Thu, Jan 11, 2007 at 10:26:27PM -0800, Andrew Morton wrote:
>...
> Changes since 2.6.20-rc3-mm1:
>...
> git-netdev-all.patch
>...
> git trees
>...
Since it's no longer used, this "#define BCM_TSO 1" can now be removed.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
--- linux-2.6.20-rc4-mm1/drivers/net/bnx2.c.old 2007-01-21 18:25:52.000000000 +0100
+++ linux-2.6.20-rc4-mm1/drivers/net/bnx2.c 2007-01-21 18:25:58.000000000 +0100
@@ -42,7 +42,6 @@
#include <net/ip.h>
#include <net/tcp.h>
#include <net/checksum.h>
-#define BCM_TSO 1
#include <linux/workqueue.h>
#include <linux/crc32.h>
#include <linux/prefetch.h>
^ permalink raw reply [flat|nested] 93+ messages in thread* [-mm patch] drivers/firewire/: cleanups
2007-01-12 6:26 2.6.20-rc4-mm1 Andrew Morton
` (14 preceding siblings ...)
2007-01-21 19:13 ` [-mm patch] remove one remaining "#define BCM_TSO 1" Adrian Bunk
@ 2007-01-22 18:17 ` Adrian Bunk
2007-01-22 19:41 ` Kristian Høgsberg
2007-01-23 6:02 ` `make htmldocs` fails Don Mullis
` (2 subsequent siblings)
18 siblings, 1 reply; 93+ messages in thread
From: Adrian Bunk @ 2007-01-22 18:17 UTC (permalink / raw)
To: Andrew Morton, Kristian Hoegsberg
Cc: linux-kernel, Stefan Richter, linux1394-devel
On Thu, Jan 11, 2007 at 10:26:27PM -0800, Andrew Morton wrote:
>...
> Changes since 2.6.20-rc3-mm1:
>...
> git-ieee1394.patch
>...
> git trees
>...
This patch contains the following cleanups:
- "extern inline" -> "static inline"
- fw-topology.c: make struct fw_node_create static
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
drivers/firewire/fw-ohci.c | 8 ++++----
drivers/firewire/fw-topology.c | 2 +-
drivers/firewire/fw-topology.h | 6 +++---
drivers/firewire/fw-transaction.c | 2 +-
drivers/firewire/fw-transaction.h | 2 +-
5 files changed, 10 insertions(+), 10 deletions(-)
--- linux-2.6.20-rc4-mm1/drivers/firewire/fw-topology.c.old 2007-01-22 18:27:12.000000000 +0100
+++ linux-2.6.20-rc4-mm1/drivers/firewire/fw-topology.c 2007-01-22 18:27:21.000000000 +0100
@@ -92,7 +92,7 @@
return (sid[index] >> shift) & 0x03;
}
-struct fw_node *fw_node_create(u32 sid, int port_count, int color)
+static struct fw_node *fw_node_create(u32 sid, int port_count, int color)
{
struct fw_node *node;
--- linux-2.6.20-rc4-mm1/drivers/firewire/fw-transaction.c.old 2007-01-22 18:27:45.000000000 +0100
+++ linux-2.6.20-rc4-mm1/drivers/firewire/fw-transaction.c 2007-01-22 18:27:54.000000000 +0100
@@ -106,7 +106,7 @@
}
}
-void
+static void
fw_fill_packet(struct fw_packet *packet, int tcode, int tlabel,
int node_id, int generation, int speed,
unsigned long long offset, void *payload, size_t length)
--- linux-2.6.20-rc4-mm1/drivers/firewire/fw-transaction.h.old 2007-01-22 18:29:01.000000000 +0100
+++ linux-2.6.20-rc4-mm1/drivers/firewire/fw-transaction.h 2007-01-22 18:29:13.000000000 +0100
@@ -198,7 +198,7 @@
void *callback_data;
};
-extern inline struct fw_packet *
+static inline struct fw_packet *
fw_packet(struct list_head *l)
{
return list_entry (l, struct fw_packet, link);
--- linux-2.6.20-rc4-mm1/drivers/firewire/fw-topology.h.old 2007-01-22 18:29:39.000000000 +0100
+++ linux-2.6.20-rc4-mm1/drivers/firewire/fw-topology.h 2007-01-22 18:29:43.000000000 +0100
@@ -57,13 +57,13 @@
struct fw_port ports[0];
};
-extern inline struct fw_node *
+static inline struct fw_node *
fw_node(struct list_head *l)
{
return list_entry (l, struct fw_node, link);
}
-extern inline struct fw_node *
+static inline struct fw_node *
fw_node_get(struct fw_node *node)
{
atomic_inc(&node->ref_count);
@@ -71,7 +71,7 @@
return node;
}
-extern inline void
+static inline void
fw_node_put(struct fw_node *node)
{
if (atomic_dec_and_test(&node->ref_count))
--- linux-2.6.20-rc4-mm1/drivers/firewire/fw-ohci.c.old 2007-01-22 18:32:58.000000000 +0100
+++ linux-2.6.20-rc4-mm1/drivers/firewire/fw-ohci.c 2007-01-22 18:33:02.000000000 +0100
@@ -147,7 +147,7 @@
struct iso_context *ir_context_list;
};
-extern inline struct fw_ohci *fw_ohci(struct fw_card *card)
+static inline struct fw_ohci *fw_ohci(struct fw_card *card)
{
return container_of(card, struct fw_ohci, card);
}
@@ -174,17 +174,17 @@
static char ohci_driver_name[] = KBUILD_MODNAME;
-extern inline void reg_write(const struct fw_ohci *ohci, int offset, u32 data)
+static inline void reg_write(const struct fw_ohci *ohci, int offset, u32 data)
{
writel(data, ohci->registers + offset);
}
-extern inline u32 reg_read(const struct fw_ohci *ohci, int offset)
+static inline u32 reg_read(const struct fw_ohci *ohci, int offset)
{
return readl(ohci->registers + offset);
}
-extern inline void flush_writes(const struct fw_ohci *ohci)
+static inline void flush_writes(const struct fw_ohci *ohci)
{
/* Do a dummy read to flush writes. */
reg_read(ohci, OHCI1394_Version);
^ permalink raw reply [flat|nested] 93+ messages in thread* Re: [-mm patch] drivers/firewire/: cleanups
2007-01-22 18:17 ` [-mm patch] drivers/firewire/: cleanups Adrian Bunk
@ 2007-01-22 19:41 ` Kristian Høgsberg
2007-01-22 20:04 ` Adrian Bunk
0 siblings, 1 reply; 93+ messages in thread
From: Kristian Høgsberg @ 2007-01-22 19:41 UTC (permalink / raw)
To: Adrian Bunk; +Cc: Andrew Morton, linux-kernel, Stefan Richter, linux1394-devel
Adrian Bunk wrote:
> On Thu, Jan 11, 2007 at 10:26:27PM -0800, Andrew Morton wrote:
>> ...
>> Changes since 2.6.20-rc3-mm1:
>> ...
>> git-ieee1394.patch
>> ...
>> git trees
>> ...
>
>
> This patch contains the following cleanups:
> - "extern inline" -> "static inline"
I guess that's fine, I do like how extern inline will never generate code and
that gcc warns on missing prototype for these case is more of a gcc bug. Not
a big deal though, it's more worthwhile to track down real missing prototype
offenders.
> - fw-topology.c: make struct fw_node_create static
Looks good.
Signed-off-by: Kristian Høgsberg <krh@redhat.com>
^ permalink raw reply [flat|nested] 93+ messages in thread
* Re: [-mm patch] drivers/firewire/: cleanups
2007-01-22 19:41 ` Kristian Høgsberg
@ 2007-01-22 20:04 ` Adrian Bunk
2007-01-22 20:04 ` Kristian Høgsberg
0 siblings, 1 reply; 93+ messages in thread
From: Adrian Bunk @ 2007-01-22 20:04 UTC (permalink / raw)
To: Kristian Høgsberg
Cc: Andrew Morton, linux-kernel, Stefan Richter, linux1394-devel
On Mon, Jan 22, 2007 at 02:41:29PM -0500, Kristian Høgsberg wrote:
> Adrian Bunk wrote:
> >On Thu, Jan 11, 2007 at 10:26:27PM -0800, Andrew Morton wrote:
> >>...
> >>Changes since 2.6.20-rc3-mm1:
> >>...
> >> git-ieee1394.patch
> >>...
> >> git trees
> >>...
> >
> >
> >This patch contains the following cleanups:
> >- "extern inline" -> "static inline"
>
> I guess that's fine, I do like how extern inline will never generate code
Exactly the opposite will be true when gcc will switch to the C99
semantics...
Besides this, "static inline" forces inlining in the kernel due to
#define inline inline __attribute__((always_inline))
> and that gcc warns on missing prototype for these case is more of a gcc
> bug. Not a big deal though, it's more worthwhile to track down real
> missing prototype offenders.
>
> >- fw-topology.c: make struct fw_node_create static
>
> Looks good.
>
> Signed-off-by: Kristian Høgsberg <krh@redhat.com>
>
>
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
^ permalink raw reply [flat|nested] 93+ messages in thread* Re: [-mm patch] drivers/firewire/: cleanups
2007-01-22 20:04 ` Adrian Bunk
@ 2007-01-22 20:04 ` Kristian Høgsberg
2007-01-22 20:44 ` Stefan Richter
0 siblings, 1 reply; 93+ messages in thread
From: Kristian Høgsberg @ 2007-01-22 20:04 UTC (permalink / raw)
To: Adrian Bunk; +Cc: Andrew Morton, linux-kernel, Stefan Richter, linux1394-devel
Adrian Bunk wrote:
> On Mon, Jan 22, 2007 at 02:41:29PM -0500, Kristian Høgsberg wrote:
>> Adrian Bunk wrote:
>>> On Thu, Jan 11, 2007 at 10:26:27PM -0800, Andrew Morton wrote:
>>>> ...
>>>> Changes since 2.6.20-rc3-mm1:
>>>> ...
>>>> git-ieee1394.patch
>>>> ...
>>>> git trees
>>>> ...
>>>
>>> This patch contains the following cleanups:
>>> - "extern inline" -> "static inline"
>> I guess that's fine, I do like how extern inline will never generate code
>
> Exactly the opposite will be true when gcc will switch to the C99
> semantics...
>
> Besides this, "static inline" forces inlining in the kernel due to
> #define inline inline __attribute__((always_inline))
In that case I have no reservations at all.
thanks,
Kristian
^ permalink raw reply [flat|nested] 93+ messages in thread
* `make htmldocs` fails
2007-01-12 6:26 2.6.20-rc4-mm1 Andrew Morton
` (15 preceding siblings ...)
2007-01-22 18:17 ` [-mm patch] drivers/firewire/: cleanups Adrian Bunk
@ 2007-01-23 6:02 ` Don Mullis
2007-01-23 6:22 ` Randy Dunlap
2007-01-23 6:35 ` `make htmldocs` fails Greg KH
2007-01-24 13:53 ` 2.6.20-rc4-mm1: PCI=n: drivers/net/3c59x.c compile error Adrian Bunk
2007-01-24 22:36 ` [-mm patch] MTD_CK804XROM must depend on PCI Adrian Bunk
18 siblings, 2 replies; 93+ messages in thread
From: Don Mullis @ 2007-01-23 6:02 UTC (permalink / raw)
To: Andrew Morton, linux-kernel; +Cc: gregkh, rdunlap
Bisection shows the bad patch to be:
gregkh-driver-uio-documentation.patch
The htmldocs build failure can be eliminated by:
quilt remove Documentation/DocBook/kernel-api.tmpl
The error messages were:
.../linux-2.6.19 $ make htmldocs
DOCPROC Documentation/DocBook/kernel-api.xml
Warning(/noback/kernel.org/2.6.20-rc_fault-injection/linux-2.6.19//drivers/uio/uio.c:521): No description found for parameter 'owner'
Warning(/noback/kernel.org/2.6.20-rc_fault-injection/linux-2.6.19//drivers/uio/uio.c:521): No description found for parameter 'info'
Warning(/noback/kernel.org/2.6.20-rc_fault-injection/linux-2.6.19//drivers/uio/uio.c:591): No description found for parameter 'idev'
Error(/noback/kernel.org/2.6.20-rc_fault-injection/linux-2.6.19//include/linux/uio_driver.h:33): cannot understand prototype: 'struct uio_info '
Warning(/noback/kernel.org/2.6.20-rc_fault-injection/linux-2.6.19//include/linux/uio_driver.h): no structured comments found
make[1]: *** [Documentation/DocBook/kernel-api.xml] Error 1
make: *** [htmldocs] Error 2
The failure was observed on an up-to-date Fedora Core 5 host.
^ permalink raw reply [flat|nested] 93+ messages in thread* Re: `make htmldocs` fails
2007-01-23 6:02 ` `make htmldocs` fails Don Mullis
@ 2007-01-23 6:22 ` Randy Dunlap
2007-01-23 6:45 ` `make htmldocs` fails -- 2.6.20-rc4-mm1 Don Mullis
2007-01-23 6:35 ` `make htmldocs` fails Greg KH
1 sibling, 1 reply; 93+ messages in thread
From: Randy Dunlap @ 2007-01-23 6:22 UTC (permalink / raw)
To: Don Mullis; +Cc: Andrew Morton, linux-kernel, gregkh, rdunlap
On Mon, 22 Jan 2007 22:02:30 -0800 Don Mullis wrote:
>
> Bisection shows the bad patch to be:
> gregkh-driver-uio-documentation.patch
>
> The htmldocs build failure can be eliminated by:
> quilt remove Documentation/DocBook/kernel-api.tmpl
or by: quilt delete gregkh-driver-uio-documentation.patch ??
> The error messages were:
>
> .../linux-2.6.19 $ make htmldocs
> DOCPROC Documentation/DocBook/kernel-api.xml
> Warning(/noback/kernel.org/2.6.20-rc_fault-injection/linux-2.6.19//drivers/uio/uio.c:521): No description found for parameter 'owner'
> Warning(/noback/kernel.org/2.6.20-rc_fault-injection/linux-2.6.19//drivers/uio/uio.c:521): No description found for parameter 'info'
> Warning(/noback/kernel.org/2.6.20-rc_fault-injection/linux-2.6.19//drivers/uio/uio.c:591): No description found for parameter 'idev'
> Error(/noback/kernel.org/2.6.20-rc_fault-injection/linux-2.6.19//include/linux/uio_driver.h:33): cannot understand prototype: 'struct uio_info '
> Warning(/noback/kernel.org/2.6.20-rc_fault-injection/linux-2.6.19//include/linux/uio_driver.h): no structured comments found
> make[1]: *** [Documentation/DocBook/kernel-api.xml] Error 1
> make: *** [htmldocs] Error 2
>
> The failure was observed on an up-to-date Fedora Core 5 host.
How about an accurate description of what kernel tree has this problem?
It's not 2.6.19. It's not 2.6.20-rc5.
---
~Randy
^ permalink raw reply [flat|nested] 93+ messages in thread
* Re: `make htmldocs` fails -- 2.6.20-rc4-mm1
2007-01-23 6:22 ` Randy Dunlap
@ 2007-01-23 6:45 ` Don Mullis
0 siblings, 0 replies; 93+ messages in thread
From: Don Mullis @ 2007-01-23 6:45 UTC (permalink / raw)
To: Randy Dunlap; +Cc: Andrew Morton, linux-kernel, gregkh
On Mon, 2007-01-22 at 22:22 -0800, Randy Dunlap wrote:
> On Mon, 22 Jan 2007 22:02:30 -0800 Don Mullis wrote:
>
> >
> > Bisection shows the bad patch to be:
> > gregkh-driver-uio-documentation.patch
> >
> > The htmldocs build failure can be eliminated by:
> > quilt remove Documentation/DocBook/kernel-api.tmpl
>
> or by: quilt delete gregkh-driver-uio-documentation.patch ??
That would fix the htmldoc build too, but would throw out lots of
documentation. Greg K-H would seem the prime candidate to propose a
fix.
> How about an accurate description of what kernel tree has this problem?
> It's not 2.6.19. It's not 2.6.20-rc5.
2.6.20-rc4-mm1, sorry. Forgot that posting as a reply to the
2.6.20-rc4-mm1 announcement is no help for someone receiving the mail
directly.
^ permalink raw reply [flat|nested] 93+ messages in thread
* Re: `make htmldocs` fails
2007-01-23 6:02 ` `make htmldocs` fails Don Mullis
2007-01-23 6:22 ` Randy Dunlap
@ 2007-01-23 6:35 ` Greg KH
1 sibling, 0 replies; 93+ messages in thread
From: Greg KH @ 2007-01-23 6:35 UTC (permalink / raw)
To: Don Mullis; +Cc: Andrew Morton, linux-kernel, rdunlap
On Mon, Jan 22, 2007 at 10:02:30PM -0800, Don Mullis wrote:
>
> Bisection shows the bad patch to be:
> gregkh-driver-uio-documentation.patch
>
> The htmldocs build failure can be eliminated by:
> quilt remove Documentation/DocBook/kernel-api.tmpl
>
> The error messages were:
>
> .../linux-2.6.19 $ make htmldocs
> DOCPROC Documentation/DocBook/kernel-api.xml
> Warning(/noback/kernel.org/2.6.20-rc_fault-injection/linux-2.6.19//drivers/uio/uio.c:521): No description found for parameter 'owner'
> Warning(/noback/kernel.org/2.6.20-rc_fault-injection/linux-2.6.19//drivers/uio/uio.c:521): No description found for parameter 'info'
> Warning(/noback/kernel.org/2.6.20-rc_fault-injection/linux-2.6.19//drivers/uio/uio.c:591): No description found for parameter 'idev'
Thanks, I've fixed these warnings now.
> Error(/noback/kernel.org/2.6.20-rc_fault-injection/linux-2.6.19//include/linux/uio_driver.h:33): cannot understand prototype: 'struct uio_info '
I think I've fixed this now, the next -mm should contain the update.
thanks for letting me know.
greg k-h
^ permalink raw reply [flat|nested] 93+ messages in thread
* 2.6.20-rc4-mm1: PCI=n: drivers/net/3c59x.c compile error
2007-01-12 6:26 2.6.20-rc4-mm1 Andrew Morton
` (16 preceding siblings ...)
2007-01-23 6:02 ` `make htmldocs` fails Don Mullis
@ 2007-01-24 13:53 ` Adrian Bunk
2007-01-24 14:12 ` Sergei Shtylyov
2007-01-24 22:36 ` [-mm patch] MTD_CK804XROM must depend on PCI Adrian Bunk
18 siblings, 1 reply; 93+ messages in thread
From: Adrian Bunk @ 2007-01-24 13:53 UTC (permalink / raw)
To: Andrew Morton, Sergei Shtylyov, Jeff Garzik; +Cc: linux-kernel, netdev
3x59x-fix-pci-resource-management.patch causes the following compile
error with CONFIG_PCI=n:
<-- snip -->
...
CC drivers/net/3c59x.o
/home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/net/3c59x.c: In function 'vortex_init_one':
/home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/net/3c59x.c:961: error: implicit declaration of function 'pci_request_regions'
/home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/net/3c59x.c:985: error: implicit declaration of function 'pci_release_regions'
make[3]: *** [drivers/net/3c59x.o] Error 1
<-- snip -->
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
^ permalink raw reply [flat|nested] 93+ messages in thread* Re: 2.6.20-rc4-mm1: PCI=n: drivers/net/3c59x.c compile error
2007-01-24 13:53 ` 2.6.20-rc4-mm1: PCI=n: drivers/net/3c59x.c compile error Adrian Bunk
@ 2007-01-24 14:12 ` Sergei Shtylyov
2007-02-17 19:26 ` Sergei Shtylyov
0 siblings, 1 reply; 93+ messages in thread
From: Sergei Shtylyov @ 2007-01-24 14:12 UTC (permalink / raw)
To: Adrian Bunk; +Cc: Andrew Morton, Jeff Garzik, linux-kernel, netdev
Hello.
Adrian Bunk wrote:
> 3x59x-fix-pci-resource-management.patch causes the following compile
> error with CONFIG_PCI=n:
>
> <-- snip -->
>
> ...
> CC drivers/net/3c59x.o
> /home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/net/3c59x.c: In function 'vortex_init_one':
> /home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/net/3c59x.c:961: error: implicit declaration of function 'pci_request_regions'
> /home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/net/3c59x.c:985: error: implicit declaration of function 'pci_release_regions'
> make[3]: *** [drivers/net/3c59x.o] Error 1
Grr, at at the same time it's happy with pci_enable_device().
I'd say the problem is in <linux/pci.h>, not in the patch.
> cu
> Adrian
MBR, Sergei
^ permalink raw reply [flat|nested] 93+ messages in thread* Re: 2.6.20-rc4-mm1: PCI=n: drivers/net/3c59x.c compile error
2007-01-24 14:12 ` Sergei Shtylyov
@ 2007-02-17 19:26 ` Sergei Shtylyov
2007-02-17 19:32 ` Sergei Shtylyov
0 siblings, 1 reply; 93+ messages in thread
From: Sergei Shtylyov @ 2007-02-17 19:26 UTC (permalink / raw)
To: Adrian Bunk; +Cc: Andrew Morton, Jeff Garzik, linux-kernel, netdev
Hello, I wrote:
>> 3x59x-fix-pci-resource-management.patch causes the following compile
>> error with CONFIG_PCI=n:
>> <-- snip -->
>> ...
>> CC drivers/net/3c59x.o
>> /home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/net/3c59x.c:
>> In function 'vortex_init_one':
>> /home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/net/3c59x.c:961:
>> error: implicit declaration of function 'pci_request_regions'
>> /home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/net/3c59x.c:985:
>> error: implicit declaration of function 'pci_release_regions'
>> make[3]: *** [drivers/net/3c59x.o] Error 1
> Grr, at at the same time it's happy with pci_enable_device().
> I'd say the problem is in <linux/pci.h>, not in the patch.
Has there been any patch to fix the "unbalanced"
pci_{request|release}_regions() declarations? Am I suposed to create such?
>> cu
>> Adrian
MBR, Sergei
^ permalink raw reply [flat|nested] 93+ messages in thread* Re: 2.6.20-rc4-mm1: PCI=n: drivers/net/3c59x.c compile error
2007-02-17 19:26 ` Sergei Shtylyov
@ 2007-02-17 19:32 ` Sergei Shtylyov
2007-02-26 13:22 ` Sergei Shtylyov
0 siblings, 1 reply; 93+ messages in thread
From: Sergei Shtylyov @ 2007-02-17 19:32 UTC (permalink / raw)
To: Adrian Bunk; +Cc: Andrew Morton, Jeff Garzik, linux-kernel, netdev
Hello.
Sergei Shtylyov wrote:
>>> 3x59x-fix-pci-resource-management.patch causes the following compile
>>> error with CONFIG_PCI=n:
>>> <-- snip -->
>>> ...
>>> CC drivers/net/3c59x.o
>>> /home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/net/3c59x.c:
>>> In function 'vortex_init_one':
>>> /home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/net/3c59x.c:961:
>>> error: implicit declaration of function 'pci_request_regions'
>>> /home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/net/3c59x.c:985:
>>> error: implicit declaration of function 'pci_release_regions'
>>> make[3]: *** [drivers/net/3c59x.o] Error 1
>
>
>> Grr, at at the same time it's happy with pci_enable_device().
>> I'd say the problem is in <linux/pci.h>, not in the patch.
> Has there been any patch to fix the "unbalanced"
> pci_{request|release}_regions() declarations? Am I suposed to create such?
Alternatively, vortex_{init|remove_one() and struct pci_driver there could
have been put under #ifdef CONFIG_PCI (good idea anyway -- should reduce
driver size on non-PCI systems)...
>>> cu
>>> Adrian
MBR, Sergei
^ permalink raw reply [flat|nested] 93+ messages in thread* Re: 2.6.20-rc4-mm1: PCI=n: drivers/net/3c59x.c compile error
2007-02-17 19:32 ` Sergei Shtylyov
@ 2007-02-26 13:22 ` Sergei Shtylyov
2007-02-26 17:26 ` Randy Dunlap
0 siblings, 1 reply; 93+ messages in thread
From: Sergei Shtylyov @ 2007-02-26 13:22 UTC (permalink / raw)
To: linux-pci; +Cc: Adrian Bunk, Andrew Morton, Jeff Garzik, linux-kernel, netdev
Hello, I wrote:
>>>> 3x59x-fix-pci-resource-management.patch causes the following compile
>>>> error with CONFIG_PCI=n:
>>>> <-- snip -->
>>>> ...
>>>> CC drivers/net/3c59x.o
>>>> /home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/net/3c59x.c:
>>>> In function 'vortex_init_one':
>>>> /home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/net/3c59x.c:961:
>>>> error: implicit declaration of function 'pci_request_regions'
>>>> /home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/net/3c59x.c:985:
>>>> error: implicit declaration of function 'pci_release_regions'
>>>> make[3]: *** [drivers/net/3c59x.o] Error 1
>>> Grr, at at the same time it's happy with pci_enable_device().
>>> I'd say the problem is in <linux/pci.h>, not in the patch.
>> Has there been any patch to fix the "unbalanced"
>> pci_{request|release}_regions() declarations? Am I suposed to create
>> such?
> Alternatively, vortex_{init|remove_one() and struct pci_driver there
> could have been put under #ifdef CONFIG_PCI (good idea anyway -- should
> reduce driver size on non-PCI systems)...
I wonder if I may count on any feedback on this -- asking linux-pci now...
The issue is as follows: with my patch pci_{request|release}_regions() may
be called with CONFIG_PCI=n (probably, this never has been a issue before) but
<linux/pci.h> don't have them declared in this case -- unlike
pci_enable_device() which is just empty for CONFIG_PCI=n.
Now, what kind of approach do I take:
- a "fair one", so that pci_{request|release}_regions() get "balanced"
declarations in the header like pci_enable_device();
- a "local one" (and even saving non-PCI kernel from needless bloat), i.e.
#ifdef out functions that are only meaningful with CONFIG_PCI=y)?
I'm leaning to the second now...
>>>> cu
>>>> Adrian
MBR, Sergei
^ permalink raw reply [flat|nested] 93+ messages in thread* Re: 2.6.20-rc4-mm1: PCI=n: drivers/net/3c59x.c compile error
2007-02-26 13:22 ` Sergei Shtylyov
@ 2007-02-26 17:26 ` Randy Dunlap
2007-02-26 21:14 ` Greg KH
0 siblings, 1 reply; 93+ messages in thread
From: Randy Dunlap @ 2007-02-26 17:26 UTC (permalink / raw)
To: Sergei Shtylyov
Cc: linux-pci, Adrian Bunk, Andrew Morton, Jeff Garzik, linux-kernel, netdev
On Mon, 26 Feb 2007 16:22:27 +0300 Sergei Shtylyov wrote:
> Hello, I wrote:
>
> >>>> 3x59x-fix-pci-resource-management.patch causes the following compile
> >>>> error with CONFIG_PCI=n:
>
> >>>> <-- snip -->
>
> >>>> ...
> >>>> CC drivers/net/3c59x.o
> >>>> /home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/net/3c59x.c:
> >>>> In function 'vortex_init_one':
> >>>> /home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/net/3c59x.c:961:
> >>>> error: implicit declaration of function 'pci_request_regions'
> >>>> /home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/net/3c59x.c:985:
> >>>> error: implicit declaration of function 'pci_release_regions'
> >>>> make[3]: *** [drivers/net/3c59x.o] Error 1
>
> >>> Grr, at at the same time it's happy with pci_enable_device().
> >>> I'd say the problem is in <linux/pci.h>, not in the patch.
>
> >> Has there been any patch to fix the "unbalanced"
> >> pci_{request|release}_regions() declarations? Am I suposed to create
> >> such?
>
> > Alternatively, vortex_{init|remove_one() and struct pci_driver there
> > could have been put under #ifdef CONFIG_PCI (good idea anyway -- should
> > reduce driver size on non-PCI systems)...
>
> I wonder if I may count on any feedback on this -- asking linux-pci now...
> The issue is as follows: with my patch pci_{request|release}_regions() may
> be called with CONFIG_PCI=n (probably, this never has been a issue before) but
> <linux/pci.h> don't have them declared in this case -- unlike
> pci_enable_device() which is just empty for CONFIG_PCI=n.
> Now, what kind of approach do I take:
>
> - a "fair one", so that pci_{request|release}_regions() get "balanced"
> declarations in the header like pci_enable_device();
>
> - a "local one" (and even saving non-PCI kernel from needless bloat), i.e.
> #ifdef out functions that are only meaningful with CONFIG_PCI=y)?
>
> I'm leaning to the second now...
I'd prefer the fair one -- add stubs to include/linux/pci.h.
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ permalink raw reply [flat|nested] 93+ messages in thread* Re: 2.6.20-rc4-mm1: PCI=n: drivers/net/3c59x.c compile error
2007-02-26 17:26 ` Randy Dunlap
@ 2007-02-26 21:14 ` Greg KH
2007-03-06 16:15 ` Sergei Shtylyov
0 siblings, 1 reply; 93+ messages in thread
From: Greg KH @ 2007-02-26 21:14 UTC (permalink / raw)
To: Randy Dunlap
Cc: Sergei Shtylyov, linux-pci, Adrian Bunk, Andrew Morton,
Jeff Garzik, linux-kernel, netdev
On Mon, Feb 26, 2007 at 09:26:44AM -0800, Randy Dunlap wrote:
> On Mon, 26 Feb 2007 16:22:27 +0300 Sergei Shtylyov wrote:
>
> > Hello, I wrote:
> >
> > >>>> 3x59x-fix-pci-resource-management.patch causes the following compile
> > >>>> error with CONFIG_PCI=n:
> >
> > >>>> <-- snip -->
> >
> > >>>> ...
> > >>>> CC drivers/net/3c59x.o
> > >>>> /home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/net/3c59x.c:
> > >>>> In function 'vortex_init_one':
> > >>>> /home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/net/3c59x.c:961:
> > >>>> error: implicit declaration of function 'pci_request_regions'
> > >>>> /home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/net/3c59x.c:985:
> > >>>> error: implicit declaration of function 'pci_release_regions'
> > >>>> make[3]: *** [drivers/net/3c59x.o] Error 1
> >
> > >>> Grr, at at the same time it's happy with pci_enable_device().
> > >>> I'd say the problem is in <linux/pci.h>, not in the patch.
> >
> > >> Has there been any patch to fix the "unbalanced"
> > >> pci_{request|release}_regions() declarations? Am I suposed to create
> > >> such?
> >
> > > Alternatively, vortex_{init|remove_one() and struct pci_driver there
> > > could have been put under #ifdef CONFIG_PCI (good idea anyway -- should
> > > reduce driver size on non-PCI systems)...
> >
> > I wonder if I may count on any feedback on this -- asking linux-pci now...
> > The issue is as follows: with my patch pci_{request|release}_regions() may
> > be called with CONFIG_PCI=n (probably, this never has been a issue before) but
> > <linux/pci.h> don't have them declared in this case -- unlike
> > pci_enable_device() which is just empty for CONFIG_PCI=n.
> > Now, what kind of approach do I take:
> >
> > - a "fair one", so that pci_{request|release}_regions() get "balanced"
> > declarations in the header like pci_enable_device();
> >
> > - a "local one" (and even saving non-PCI kernel from needless bloat), i.e.
> > #ifdef out functions that are only meaningful with CONFIG_PCI=y)?
> >
> > I'm leaning to the second now...
>
> I'd prefer the fair one -- add stubs to include/linux/pci.h.
Me too, please just send me a patch adding them to pci.h so you don't
have to have #ifdefs in your .c code.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 93+ messages in thread* Re: 2.6.20-rc4-mm1: PCI=n: drivers/net/3c59x.c compile error
2007-02-26 21:14 ` Greg KH
@ 2007-03-06 16:15 ` Sergei Shtylyov
2007-03-06 16:47 ` Randy Dunlap
0 siblings, 1 reply; 93+ messages in thread
From: Sergei Shtylyov @ 2007-03-06 16:15 UTC (permalink / raw)
To: Greg KH
Cc: Randy Dunlap, linux-pci, Adrian Bunk, Andrew Morton, Jeff Garzik,
linux-kernel, netdev
Hello.
Greg KH wrote:
>>>>>>>3x59x-fix-pci-resource-management.patch causes the following compile
>>>>>>>error with CONFIG_PCI=n:
>>>>>>><-- snip -->
>>>>>>>...
>>>>>>> CC drivers/net/3c59x.o
>>>>>>>/home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/net/3c59x.c:
>>>>>>>In function 'vortex_init_one':
>>>>>>>/home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/net/3c59x.c:961:
>>>>>>>error: implicit declaration of function 'pci_request_regions'
>>>>>>>/home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/net/3c59x.c:985:
>>>>>>>error: implicit declaration of function 'pci_release_regions'
>>>>>>>make[3]: *** [drivers/net/3c59x.o] Error 1
>>>>>> Grr, at at the same time it's happy with pci_enable_device().
>>>>>> I'd say the problem is in <linux/pci.h>, not in the patch.
>>>>> Has there been any patch to fix the "unbalanced"
>>>>>pci_{request|release}_regions() declarations? Am I suposed to create
>>>>>such?
>>>> Alternatively, vortex_{init|remove_one() and struct pci_driver there
>>>>could have been put under #ifdef CONFIG_PCI (good idea anyway -- should
>>>>reduce driver size on non-PCI systems)...
>>> I wonder if I may count on any feedback on this -- asking linux-pci now...
>>> The issue is as follows: with my patch pci_{request|release}_regions() may
>>>be called with CONFIG_PCI=n (probably, this never has been a issue before) but
>>><linux/pci.h> don't have them declared in this case -- unlike
>>>pci_enable_device() which is just empty for CONFIG_PCI=n.
>>> Now, what kind of approach do I take:
>>>- a "fair one", so that pci_{request|release}_regions() get "balanced"
>>> declarations in the header like pci_enable_device();
>>>- a "local one" (and even saving non-PCI kernel from needless bloat), i.e.
>>> #ifdef out functions that are only meaningful with CONFIG_PCI=y)?
>>> I'm leaning to the second now...
>>I'd prefer the fair one -- add stubs to include/linux/pci.h.
> Me too, please just send me a patch adding them to pci.h so you don't
> have to have #ifdefs in your .c code.
Erm, before I do that, could somebody explain what
#define HAVE_PCI_REQ_REGIONS 2
accompanying their declaration is for? I have't found any references to it in
the source. Should I duplicate it for CONFIG_PCI=n case (I guess not)?
> thanks,
> greg k-h
WBR, Sergei
^ permalink raw reply [flat|nested] 93+ messages in thread* Re: 2.6.20-rc4-mm1: PCI=n: drivers/net/3c59x.c compile error
2007-03-06 16:15 ` Sergei Shtylyov
@ 2007-03-06 16:47 ` Randy Dunlap
2007-03-09 12:54 ` Tejun Heo
0 siblings, 1 reply; 93+ messages in thread
From: Randy Dunlap @ 2007-03-06 16:47 UTC (permalink / raw)
To: Sergei Shtylyov, htejun
Cc: Greg KH, linux-pci, Adrian Bunk, Andrew Morton, Jeff Garzik,
linux-kernel, netdev
On Tue, 06 Mar 2007 19:15:12 +0300 Sergei Shtylyov wrote:
> Hello.
>
> Greg KH wrote:
>
> >>>>>>>3x59x-fix-pci-resource-management.patch causes the following compile
> >>>>>>>error with CONFIG_PCI=n:
>
> >>>>>>><-- snip -->
>
> >>>>>>>...
> >>>>>>> CC drivers/net/3c59x.o
> >>>>>>>/home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/net/3c59x.c:
> >>>>>>>In function 'vortex_init_one':
> >>>>>>>/home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/net/3c59x.c:961:
> >>>>>>>error: implicit declaration of function 'pci_request_regions'
> >>>>>>>/home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/net/3c59x.c:985:
> >>>>>>>error: implicit declaration of function 'pci_release_regions'
> >>>>>>>make[3]: *** [drivers/net/3c59x.o] Error 1
>
> >>>>>> Grr, at at the same time it's happy with pci_enable_device().
> >>>>>> I'd say the problem is in <linux/pci.h>, not in the patch.
>
> >>>>> Has there been any patch to fix the "unbalanced"
> >>>>>pci_{request|release}_regions() declarations? Am I suposed to create
> >>>>>such?
>
> >>>> Alternatively, vortex_{init|remove_one() and struct pci_driver there
> >>>>could have been put under #ifdef CONFIG_PCI (good idea anyway -- should
> >>>>reduce driver size on non-PCI systems)...
>
> >>> I wonder if I may count on any feedback on this -- asking linux-pci now...
> >>> The issue is as follows: with my patch pci_{request|release}_regions() may
> >>>be called with CONFIG_PCI=n (probably, this never has been a issue before) but
> >>><linux/pci.h> don't have them declared in this case -- unlike
> >>>pci_enable_device() which is just empty for CONFIG_PCI=n.
> >>> Now, what kind of approach do I take:
>
> >>>- a "fair one", so that pci_{request|release}_regions() get "balanced"
> >>> declarations in the header like pci_enable_device();
>
> >>>- a "local one" (and even saving non-PCI kernel from needless bloat), i.e.
> >>> #ifdef out functions that are only meaningful with CONFIG_PCI=y)?
>
> >>> I'm leaning to the second now...
>
> >>I'd prefer the fair one -- add stubs to include/linux/pci.h.
>
> > Me too, please just send me a patch adding them to pci.h so you don't
> > have to have #ifdefs in your .c code.
>
> Erm, before I do that, could somebody explain what
>
> #define HAVE_PCI_REQ_REGIONS 2
>
> accompanying their declaration is for? I have't found any references to it in
> the source. Should I duplicate it for CONFIG_PCI=n case (I guess not)?
I wouldn't since it's not used anywhere, but maybe Tejun could comment
on it...
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ permalink raw reply [flat|nested] 93+ messages in thread* Re: 2.6.20-rc4-mm1: PCI=n: drivers/net/3c59x.c compile error
2007-03-06 16:47 ` Randy Dunlap
@ 2007-03-09 12:54 ` Tejun Heo
0 siblings, 0 replies; 93+ messages in thread
From: Tejun Heo @ 2007-03-09 12:54 UTC (permalink / raw)
To: Randy Dunlap
Cc: Sergei Shtylyov, Greg KH, linux-pci, Adrian Bunk, Andrew Morton,
Jeff Garzik, linux-kernel, netdev
Hello,
Randy Dunlap wrote:
>> Erm, before I do that, could somebody explain what
>>
>> #define HAVE_PCI_REQ_REGIONS 2
>>
>> accompanying their declaration is for? I have't found any references to it in
>> the source. Should I duplicate it for CONFIG_PCI=n case (I guess not)?
>
> I wouldn't since it's not used anywhere, but maybe Tejun could comment
> on it...
This is the first time I see that macro. There is no user in the whole
source. I think the best way is to just kill it.
Thanks.
--
tejun
^ permalink raw reply [flat|nested] 93+ messages in thread
* [-mm patch] MTD_CK804XROM must depend on PCI
2007-01-12 6:26 2.6.20-rc4-mm1 Andrew Morton
` (17 preceding siblings ...)
2007-01-24 13:53 ` 2.6.20-rc4-mm1: PCI=n: drivers/net/3c59x.c compile error Adrian Bunk
@ 2007-01-24 22:36 ` Adrian Bunk
18 siblings, 0 replies; 93+ messages in thread
From: Adrian Bunk @ 2007-01-24 22:36 UTC (permalink / raw)
To: Andrew Morton, Ryan Jackson, David Woodhouse; +Cc: linux-kernel, dwmw2
On Thu, Jan 11, 2007 at 10:26:27PM -0800, Andrew Morton wrote:
>...
> git-mtd.patch
>...
> git trees
CONFIG_MTD_CK804XROM=y, CONFIG_PCI=n results in the following compile
error:
<-- snip -->
...
CC drivers/mtd/maps/ck804xrom.o
/home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/mtd/maps/ck804xrom.c: In function 'ck804xrom_init_one':
/home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/mtd/maps/ck804xrom.c:114: error: implicit declaration of function 'pci_dev_get'
/home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/mtd/maps/ck804xrom.c:114: warning: assignment makes pointer from integer without a cast
make[4]: *** [drivers/mtd/maps/ck804xrom.o] Error 1
<-- snip -->
Considering what hardware this driver is driving, a dependency on PCI
also seems logical.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
--- linux-2.6.20-rc4-mm1/drivers/mtd/maps/Kconfig.old 2007-01-24 13:53:18.000000000 +0100
+++ linux-2.6.20-rc4-mm1/drivers/mtd/maps/Kconfig 2007-01-24 13:53:39.000000000 +0100
@@ -204,7 +204,7 @@
config MTD_CK804XROM
tristate "BIOS flash chip on Nvidia CK804"
- depends on X86 && MTD_JEDECPROBE
+ depends on X86 && MTD_JEDECPROBE && PCI
help
Support for treating the BIOS flash chip on nvidia motherboards
as an MTD device - with this you can reprogram your BIOS.
^ permalink raw reply [flat|nested] 93+ messages in thread