[PATCH] Make ACPI compile again on 64bit/gcc 3.3

[PATCH] Make ACPI compile again on 64bit/gcc 3.3

[Andi Kleen]

Without this patch ACPI in BK-CVS current does not compile on AMD64/gcc 3.3.

-Andi


Index: linux/include/acpi/acpiosxf.h
===================================================================
RCS file: /home/cvs/linux-2.5/include/acpi/acpiosxf.h,v
retrieving revision 1.7
diff -u -u -r1.7 acpiosxf.h
--- linux/include/acpi/acpiosxf.h	24 May 2003 01:49:28 -0000	1.7
+++ linux/include/acpi/acpiosxf.h	24 May 2003 07:32:37 -0000
@@ -287,15 +287,15 @@
  * Miscellaneous
  */
 
-u8
+BOOLEAN
 acpi_os_readable (
 	void                            *pointer,
-	acpi_size                       length);
+	u32                       	length);
 
-u8
+BOOLEAN
 acpi_os_writable (
 	void                            *pointer,
-	acpi_size                       length);
+	u32                       	length);
 
 u32
 acpi_os_get_timer (

Re: [PATCH] Make ACPI compile again on 64bit/gcc 3.3

[Andi Kleen]

On Sat, May 24, 2003 at 01:55:26PM -0700, Grover, Andrew wrote:
> Actually, I think osl.c should be changed to match the header as it
> stands. Could you try that and see if that also fixes things?

Yes it does of course.

BTW FYI these are the warnings I see in ACPI when compiling with gcc 3.3 for
64bit:

drivers/acpi/processor.c: In function `acpi_processor_add_fs':
drivers/acpi/processor.c:1518: warning: assignment from incompatible pointer typ e
drivers/acpi/processor.c:1531: warning: assignment from incompatible pointer typ e
drivers/acpi/thermal.c:187: warning: initialization from incompatible pointer ty pe
drivers/acpi/thermal.c:195: warning: initialization from incompatible pointer ty poe
  drivers/acpi/thermal.c:203: warning: initialization from incompatible pointer type
drivers/acpi/utils.c: In function `acpi_evaluate_reference':
drivers/acpi/utils.c:351: warning: unsigned int format, different type arg (arg 
5)

-Andi


Index: linux/drivers/acpi/osl.c
===================================================================
RCS file: /home/cvs/linux-2.5/drivers/acpi/osl.c,v
retrieving revision 1.27
diff -u -u -r1.27 osl.c
--- linux/drivers/acpi/osl.c	24 May 2003 01:49:28 -0000	1.27
+++ linux/drivers/acpi/osl.c	24 May 2003 21:12:05 -0000
@@ -952,14 +952,14 @@
  * We just have to assume we're dealing with valid memory
  */
 
-BOOLEAN
-acpi_os_readable(void *ptr, u32 len)
+u8
+acpi_os_readable(void *ptr, acpi_size len)
 {
 	return 1;
 }
 
-BOOLEAN
-acpi_os_writable(void *ptr, u32 len)
+u8
+acpi_os_writable(void *ptr, acpi_size len)
 {
 	return 1;
 }
> 

RE: [PATCH] Make ACPI compile again on 64bit/gcc 3.3

[Grover, Andrew]

Actually, I think osl.c should be changed to match the header as it
stands. Could you try that and see if that also fixes things?

Thanks -- Regards -- Andy

> From: Andi Kleen [mailto:ak@suse.de] 
> Without this patch ACPI in BK-CVS current does not compile on 
> AMD64/gcc 3.3.
> 
> -Andi
> 
> 
> Index: linux/include/acpi/acpiosxf.h
> ===================================================================
> RCS file: /home/cvs/linux-2.5/include/acpi/acpiosxf.h,v
> retrieving revision 1.7
> diff -u -u -r1.7 acpiosxf.h
> --- linux/include/acpi/acpiosxf.h	24 May 2003 01:49:28 
> -0000	1.7
> +++ linux/include/acpi/acpiosxf.h	24 May 2003 07:32:37 -0000
> @@ -287,15 +287,15 @@
>   * Miscellaneous
>   */
>  
> -u8
> +BOOLEAN
>  acpi_os_readable (
>  	void                            *pointer,
> -	acpi_size                       length);
> +	u32                       	length);
>  
> -u8
> +BOOLEAN
>  acpi_os_writable (
>  	void                            *pointer,
> -	acpi_size                       length);
> +	u32                       	length);
>  
>  u32
>  acpi_os_get_timer (
>