Re: 2.6.8-rc2 acpi numa warnings

Re: 2.6.8-rc2 acpi numa warnings

[Takayoshi Kochi]

Hi Len,

Please apply the attached patch to prevent warning messages
in drivers/acpi/numa.c.  Reported by Keith Owens.
This applies to 2.6.8-rc2 or 2.6.8-rc2-mm1.

From: Keith Owens <kaos-sJ/iWh9BUns@public.gmane.org>
Subject: 2.6.8-rc2 acpi numa warnings
Date: Sun, 18 Jul 2004 18:55:21 +1000

> Building 2.6.8-rc2 for ia64 NUMA gets these warnings.
> 
> drivers/acpi/numa.c: In function `acpi_table_print_srat_entry':
> drivers/acpi/numa.c:55: warning: unused variable `p'
> drivers/acpi/numa.c:65: warning: unused variable `p'
> drivers/acpi/numa.c: In function `acpi_numa_init':
> drivers/acpi/numa.c:179: warning: passing arg 2 of `acpi_table_parse_srat' from incompatible pointer type
> drivers/acpi/numa.c:182: warning: passing arg 2 of `acpi_table_parse_srat' from incompatible pointer type
> 

Signed-off-by: Takayoshi Kochi <t-kochi-UDFczIW9X1d8UrSeD/g0lQ@public.gmane.org>

--- linux-2.6.7.orig/drivers/acpi/numa.c	2004-07-28 21:55:43.694641000 +0900
+++ linux-2.6.7/drivers/acpi/numa.c	2004-07-28 22:07:45.154962520 +0900
@@ -51,6 +51,7 @@
 	switch (header->type) {
 
 	case ACPI_SRAT_PROCESSOR_AFFINITY:
+#ifdef ACPI_DEBUG_OUTPUT
 	{
 		struct acpi_table_processor_affinity *p =
 			(struct acpi_table_processor_affinity*) header;
@@ -58,9 +59,11 @@
 		       p->apic_id, p->lsapic_eid, p->proximity_domain,
 		       p->flags.enabled?"enabled":"disabled"));
 	}
+#endif /* ACPI_DEBUG_OUTPUT */
 		break;
 
 	case ACPI_SRAT_MEMORY_AFFINITY:
+#ifdef ACPI_DEBUG_OUTPUT
 	{
 		struct acpi_table_memory_affinity *p =
 			(struct acpi_table_memory_affinity*) header;
@@ -70,6 +73,7 @@
 		       p->flags.enabled ? "enabled" : "disabled",
 		       p->flags.hot_pluggable ? " hot-pluggable" : ""));
 	}
+#endif /* ACPI_DEBUG_OUTPUT */
 		break;
 
 	default:
@@ -103,7 +107,9 @@
 
 
 static int __init
-acpi_parse_processor_affinity (acpi_table_entry_header *header)
+acpi_parse_processor_affinity (
+	acpi_table_entry_header *header,
+	const unsigned long end)
 {
 	struct acpi_table_processor_affinity *processor_affinity;
 
@@ -121,7 +127,9 @@
 
 
 static int __init
-acpi_parse_memory_affinity (acpi_table_entry_header *header)
+acpi_parse_memory_affinity (
+	acpi_table_entry_header *header,
+	const unsigned long end)
 {
 	struct acpi_table_memory_affinity *memory_affinity;
 


-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=4721&alloc_id=10040&op=click

Re: 2.6.8-rc2 acpi numa warnings

[Len Brown]

Applied.

thanks,
-Len

On Wed, 2004-07-28 at 21:44, Takayoshi Kochi wrote:
> Hi Len,
> 
> Please apply the attached patch to prevent warning messages
> in drivers/acpi/numa.c.  Reported by Keith Owens.
> This applies to 2.6.8-rc2 or 2.6.8-rc2-mm1.
> 
> From: Keith Owens <kaos-sJ/iWh9BUns@public.gmane.org>
> Subject: 2.6.8-rc2 acpi numa warnings
> Date: Sun, 18 Jul 2004 18:55:21 +1000
> 
> > Building 2.6.8-rc2 for ia64 NUMA gets these warnings.
> > 
> > drivers/acpi/numa.c: In function `acpi_table_print_srat_entry':
> > drivers/acpi/numa.c:55: warning: unused variable `p'
> > drivers/acpi/numa.c:65: warning: unused variable `p'
> > drivers/acpi/numa.c: In function `acpi_numa_init':
> > drivers/acpi/numa.c:179: warning: passing arg 2 of
> `acpi_table_parse_srat' from incompatible pointer type
> > drivers/acpi/numa.c:182: warning: passing arg 2 of
> `acpi_table_parse_srat' from incompatible pointer type
> > 
> 
> Signed-off-by: Takayoshi Kochi <t-kochi-UDFczIW9X1d8UrSeD/g0lQ@public.gmane.org>
> 
> --- linux-2.6.7.orig/drivers/acpi/numa.c        2004-07-28
> 21:55:43.694641000 +0900
> +++ linux-2.6.7/drivers/acpi/numa.c     2004-07-28 22:07:45.154962520
> +0900
> @@ -51,6 +51,7 @@
>         switch (header->type) {
>  
>         case ACPI_SRAT_PROCESSOR_AFFINITY:
> +#ifdef ACPI_DEBUG_OUTPUT
>         {
>                 struct acpi_table_processor_affinity *p =
>                         (struct acpi_table_processor_affinity*)
> header;
> @@ -58,9 +59,11 @@
>                        p->apic_id, p->lsapic_eid, p->proximity_domain,
>                        p->flags.enabled?"enabled":"disabled"));
>         }
> +#endif /* ACPI_DEBUG_OUTPUT */
>                 break;
>  
>         case ACPI_SRAT_MEMORY_AFFINITY:
> +#ifdef ACPI_DEBUG_OUTPUT
>         {
>                 struct acpi_table_memory_affinity *p =
>                         (struct acpi_table_memory_affinity*) header;
> @@ -70,6 +73,7 @@
>                        p->flags.enabled ? "enabled" : "disabled",
>                        p->flags.hot_pluggable ? " hot-pluggable" :
> ""));
>         }
> +#endif /* ACPI_DEBUG_OUTPUT */
>                 break;
>  
>         default:
> @@ -103,7 +107,9 @@
>  
>  
>  static int __init
> -acpi_parse_processor_affinity (acpi_table_entry_header *header)
> +acpi_parse_processor_affinity (
> +       acpi_table_entry_header *header,
> +       const unsigned long end)
>  {
>         struct acpi_table_processor_affinity *processor_affinity;
>  
> @@ -121,7 +127,9 @@
>  
>  
>  static int __init
> -acpi_parse_memory_affinity (acpi_table_entry_header *header)
> +acpi_parse_memory_affinity (
> +       acpi_table_entry_header *header,
> +       const unsigned long end)
>  {
>         struct acpi_table_memory_affinity *memory_affinity;
>  
> 



-------------------------------------------------------
SF.Net email is sponsored by Shop4tech.com-Lowest price on Blank Media
100pk Sonic DVD-R 4x for only $29 -100pk Sonic DVD+R for only $33
Save 50% off Retail on Ink & Toner - Free Shipping and Free Gift.
http://www.shop4tech.com/z/Inkjet_Cartridges/9_108_r285