[-mm patch] drivers/acpi/: make two functions static

[-mm patch] drivers/acpi/: make two functions static

[Adrian Bunk]

On Sat, Jan 07, 2006 at 05:22:21AM -0800, Andrew Morton wrote:
>...
> Changes since 2.6.15-mm1:
>...
> +fix-some-f_ops-abuse-in-acpi.patch
>...

After this patch, we can make two functions static.


Signed-off-by: Adrian Bunk <bunk-HeJ8Db2Gnd6zQB+pC5nmwQ@public.gmane.org>

---

 drivers/acpi/processor_thermal.c    |    6 +++---
 drivers/acpi/processor_throttling.c |    6 +++---
 include/acpi/processor.h            |    6 ------
 3 files changed, 6 insertions(+), 12 deletions(-)

--- linux-2.6.15-mm2-full/include/acpi/processor.h.old	2006-01-07 17:52:17.000000000 +0100
+++ linux-2.6.15-mm2-full/include/acpi/processor.h	2006-01-07 17:52:28.000000000 +0100
@@ -223,9 +223,6 @@
 /* in processor_throttling.c */
 int acpi_processor_get_throttling_info(struct acpi_processor *pr);
 int acpi_processor_set_throttling(struct acpi_processor *pr, int state);
-ssize_t acpi_processor_write_throttling(struct file *file,
-					const char __user * buffer,
-					size_t count, loff_t * data);
 extern struct file_operations acpi_processor_throttling_fops;
 
 /* in processor_idle.c */
@@ -237,9 +234,6 @@
 
 /* in processor_thermal.c */
 int acpi_processor_get_limit_info(struct acpi_processor *pr);
-ssize_t acpi_processor_write_limit(struct file *file,
-				   const char __user * buffer,
-				   size_t count, loff_t * data);
 extern struct file_operations acpi_processor_limit_fops;
 
 #ifdef CONFIG_CPU_FREQ
--- linux-2.6.15-mm2-full/drivers/acpi/processor_throttling.c.old	2006-01-07 17:52:37.000000000 +0100
+++ linux-2.6.15-mm2-full/drivers/acpi/processor_throttling.c	2006-01-07 17:52:54.000000000 +0100
@@ -306,9 +306,9 @@
 			   PDE(inode)->data);
 }
 
-ssize_t acpi_processor_write_throttling(struct file * file,
-					const char __user * buffer,
-					size_t count, loff_t * data)
+static ssize_t acpi_processor_write_throttling(struct file * file,
+					       const char __user * buffer,
+					       size_t count, loff_t * data)
 {
 	int result = 0;
 	struct seq_file *m = (struct seq_file *)file->private_data;
--- linux-2.6.15-mm2-full/drivers/acpi/processor_thermal.c.old	2006-01-07 17:53:04.000000000 +0100
+++ linux-2.6.15-mm2-full/drivers/acpi/processor_thermal.c	2006-01-07 17:53:16.000000000 +0100
@@ -348,9 +348,9 @@
 			   PDE(inode)->data);
 }
 
-ssize_t acpi_processor_write_limit(struct file * file,
-				   const char __user * buffer,
-				   size_t count, loff_t * data)
+static ssize_t acpi_processor_write_limit(struct file * file,
+					  const char __user * buffer,
+					  size_t count, loff_t * data)
 {
 	int result = 0;
 	struct seq_file *m = (struct seq_file *)file->private_data;

-
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: 2.6.15-mm2

[Andrew Morton]

Brice Goglin <Brice.Goglin-vYW+cPY1g1pg9hUCZPvPmw@public.gmane.org> wrote:
>
> 2) acpi-cpufreq does not load either, returns ENODEV too. It's probably
>  git-acpi. I tried to revert it but there are lots of other patches
>  depending on it, so I finally gave up.

OK, let me try to reproduce this.  acpi and cpufreq are fully merged up, so
this bug may well be in mainline now.

>  3) wpa_supplicant does not find my WPA network anymore (while iwlist
>  scanning sees). I didn't see anything relevant in dmesg. My driver is
>  ipw2200.

It's things like this which make me consider a career in carpentry.

I assume 2.6.15 works OK?

Unfortunately I don't know diddly about wpa_supplicant (how come FC5-test1
doesn't ship it?)

-
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: 2.6.15-mm2

[Brice Goglin]

Andrew Morton wrote:

>Brice Goglin <Brice.Goglin-vYW+cPY1g1pg9hUCZPvPmw@public.gmane.org> wrote:
>  
>
>>2) acpi-cpufreq does not load either, returns ENODEV too. It's probably
>> git-acpi. I tried to revert it but there are lots of other patches
>> depending on it, so I finally gave up.
>>    
>>
>
>OK, let me try to reproduce this.  acpi and cpufreq are fully merged up, so
>this bug may well be in mainline now.
>
>  
>
>> 3) wpa_supplicant does not find my WPA network anymore (while iwlist
>> scanning sees). I didn't see anything relevant in dmesg. My driver is
>> ipw2200.
>>    
>>
>
>It's things like this which make me consider a career in carpentry.
>
>I assume 2.6.15 works OK?
>  
>

2.6.15 and 2.6.15-git3 both don't show any of these issues. Did acpi and
cpufreq get merged after -git3 ?

thanks,
Brice

-
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

RE: 2.6.15-mm2

[Brown, Len]

 
>2) acpi-cpufreq does not load either, returns ENODEV too. It's probably
>git-acpi. I tried to revert it but there are lots of other patches
>depending on it, so I finally gave up.

Brice,
Can you try the converse?
Apply the acpi patch (which is included in -mm)
without the rest of the mm tree to see if that broke acpi-cpufreq?:

http://ftp.kernel.org/pub/linux/kernel/people/lenb/acpi/patches/test/2.6.15/acpi-test-20051216-2.6.15.diff.bz2

thanks,
-Len
-
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: 2.6.15-mm2

[Erik Slagter]

[-- Attachment #1: Type: text/plain, Size: 310 bytes --]

On Sat, 2006-01-07 at 14:58 -0800, Andrew Morton wrote:

> I assume 2.6.15 works OK?
> 
> Unfortunately I don't know diddly about wpa_supplicant (how come FC5-test1
> doesn't ship it?)

Yeah, for some odd reason FC doesn't ship wpa_supplicant, forcing all
those poor users to use WEP "encryption" :-(

[-- Attachment #2: smime.p7s --]
[-- Type: application/x-pkcs7-signature, Size: 2771 bytes --]

Re: 2.6.15-mm2

[Andrew Morton]

Brice Goglin <Brice.Goglin-vYW+cPY1g1pg9hUCZPvPmw@public.gmane.org> wrote:
>
> Andrew Morton wrote:
> 
> >Brice Goglin <Brice.Goglin-vYW+cPY1g1pg9hUCZPvPmw@public.gmane.org> wrote:
> >  
> >
> >>2) acpi-cpufreq does not load either, returns ENODEV too. It's probably
> >> git-acpi. I tried to revert it but there are lots of other patches
> >> depending on it, so I finally gave up.
> >>    
> >>
> >
> >OK, let me try to reproduce this.  acpi and cpufreq are fully merged up, so
> >this bug may well be in mainline now.
> >
> >  
> >
> >> 3) wpa_supplicant does not find my WPA network anymore (while iwlist
> >> scanning sees). I didn't see anything relevant in dmesg. My driver is
> >> ipw2200.
> >>    
> >>
> >
> >It's things like this which make me consider a career in carpentry.
> >
> >I assume 2.6.15 works OK?
> >  
> >
> 
> 2.6.15 and 2.6.15-git3 both don't show any of these issues. Did acpi and
> cpufreq get merged after -git3 ?
> 

Well whatever bug it is, it's in Linus's tree now.  Happens for me too.

I traced the failure down as far as acpi_processor_get_performance_info(),
where it's failing here:

	status = acpi_get_handle(pr->handle, "_PCT", &handle);
	if (ACPI_FAILURE(status)) {
		ACPI_DEBUG_PRINT((ACPI_DB_INFO,
				  "ACPI-based processor performance control unavailable\n"));
		return_VALUE(-ENODEV);
	}


-
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: 2.6.15-mm2

[Brice Goglin]

Brown, Len wrote:

> 
>  
>
>>2) acpi-cpufreq does not load either, returns ENODEV too. It's probably
>>git-acpi. I tried to revert it but there are lots of other patches
>>depending on it, so I finally gave up.
>>    
>>
>
>Brice,
>Can you try the converse?
>Apply the acpi patch (which is included in -mm)
>without the rest of the mm tree to see if that broke acpi-cpufreq?:
>
>http://ftp.kernel.org/pub/linux/kernel/people/lenb/acpi/patches/test/2.6.15/acpi-test-20051216-2.6.15.diff.bz2
>
>thanks,
>-Len
>  
>

Len,

This patch applied on top of 2.6.15 breaks acpi-cpufreq in the same way.

Brice

Re: 2.6.15-mm2

[Brice Goglin]

Andrew Morton wrote:

>Well whatever bug it is, it's in Linus's tree now.  Happens for me too.
>
>  
>
Happens for you in -git4 ? Does not here...

Brice



>I traced the failure down as far as acpi_processor_get_performance_info(),
>where it's failing here:
>
>	status = acpi_get_handle(pr->handle, "_PCT", &handle);
>	if (ACPI_FAILURE(status)) {
>		ACPI_DEBUG_PRINT((ACPI_DB_INFO,
>				  "ACPI-based processor performance control unavailable\n"));
>		return_VALUE(-ENODEV);
>	}
>
>
>  
>

-
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

RE: 2.6.15-mm2

[Brown, Len]

>>>2) acpi-cpufreq does not load either, returns ENODEV too. 
>>>It's probably git-acpi. I tried to revert it but there are
>>>lots of other patches depending on it, so I finally gave up.
>>>    
>>>
>>
>>Brice,
>>Can you try the converse?
>>Apply the acpi patch (which is included in -mm)
>>without the rest of the mm tree to see if that broke acpi-cpufreq?:
>>
>>http://ftp.kernel.org/pub/linux/kernel/people/lenb/acpi/patche
>s/test/2.6.15/acpi-test-20051216-2.6.15.diff.bz2
>>
>>thanks,
>>-Len
>>  
>>
>
>Len,
>
>This patch applied on top of 2.6.15 breaks acpi-cpufreq in the 
>same way.

Ah good!
Can you test the _PDC patch here all by itself?

http://bugzilla.kernel.org/show_bug.cgi?id=5483#c17

If this patch is what causes the failure, please 
build with CONFIG_ACP_DEBUG=y and attach the dmesg
from the failure, as well as the output from acpidump,
available in the latest pmtools here:

http://ftp.kernel.org/pub/linux/kernel/people/lenb/acpi/utils

thanks,
-Len
-
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

RE: 2.6.15-mm2

[Brown, Len]

 
>> 2.6.15 and 2.6.15-git3 both don't show any of these issues. 
>> Did acpi and cpufreq get merged after -git3 ?
>> 
>
>Well whatever bug it is, it's in Linus's tree now.  Happens for me too.
>
>I traced the failure down as far as acpi_processor_get_performance_info(),
>where it's failing here:
>
>	status = acpi_get_handle(pr->handle, "_PCT", &handle);
>	if (ACPI_FAILURE(status)) {
>		ACPI_DEBUG_PRINT((ACPI_DB_INFO,
>				  "ACPI-based processor 
>performance control unavailable\n"));
>		return_VALUE(-ENODEV);
>	}

No, acpi was not merged after 2.6.15 -- see if cpufreq changed.

-Len
-
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: 2.6.15-mm2

[Andrew Morton]

Brice Goglin <Brice.Goglin-vYW+cPY1g1pg9hUCZPvPmw@public.gmane.org> wrote:
>
> Andrew Morton wrote:
> 
> >Well whatever bug it is, it's in Linus's tree now.  Happens for me too.
> >
> >  
> >
> Happens for you in -git4 ?

Yup.

> Does not here...

grr.
-
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: 2.6.15-mm2

[Dave Jones]

On Sun, Jan 08, 2006 at 11:31:22AM +0100, Erik Slagter wrote:
 > On Sat, 2006-01-07 at 14:58 -0800, Andrew Morton wrote:
 > 
 > > I assume 2.6.15 works OK?
 > > 
 > > Unfortunately I don't know diddly about wpa_supplicant (how come FC5-test1
 > > doesn't ship it?)
 > 
 > Yeah, for some odd reason FC doesn't ship wpa_supplicant, forcing all
 > those poor users to use WEP "encryption" :-(

http://www.iceni.org/cgi-bin/blosxom.cgi//2006/01/08#NetworkManager_now_has_WPA_support

		Dave

-
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html