From: Steven Rostedt There are some places in ACPI that save flags as a u32 instead of a unsigned long. This is done indirectly by calling acpi_os_acquire_lock, which uses unsigned long, but the flags returned are saved in the acpi code as a u32. Since today's archs that use acpi, only care about the LS 32 bits of the word, this is not really an issue. But if there is an arch in the future that changes that assumption, or (as RT does) some internal change in the kernel that looks at the MSB of flags on a restore, this will be broken for 64 bit machines. This patch is just to make the ACPI code "clean". That is, to use the proper type for flags. Signed-off-by: Steven Rostedt Cc: "Brown, Len" Signed-off-by: Andrew Morton --- drivers/acpi/events/evgpe.c | 2 +- drivers/acpi/events/evgpeblk.c | 10 +++++----- drivers/acpi/events/evxface.c | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff -puN drivers/acpi/events/evgpeblk.c~acpi-cleanup-u32-flags-in-spin_lock-calls drivers/acpi/events/evgpeblk.c --- devel/drivers/acpi/events/evgpeblk.c~acpi-cleanup-u32-flags-in-spin_lock-calls 2005-10-11 20:43:48.000000000 -0700 +++ devel-akpm/drivers/acpi/events/evgpeblk.c 2005-10-11 20:43:48.000000000 -0700 @@ -136,7 +136,7 @@ acpi_status acpi_ev_walk_gpe_list(ACPI_G struct acpi_gpe_block_info *gpe_block; struct acpi_gpe_xrupt_info *gpe_xrupt_info; acpi_status status = AE_OK; - u32 flags; + unsigned long flags; ACPI_FUNCTION_TRACE("ev_walk_gpe_list"); @@ -479,7 +479,7 @@ static struct acpi_gpe_xrupt_info *acpi_ struct acpi_gpe_xrupt_info *next_gpe_xrupt; struct acpi_gpe_xrupt_info *gpe_xrupt; acpi_status status; - u32 flags; + unsigned long flags; ACPI_FUNCTION_TRACE("ev_get_gpe_xrupt_block"); @@ -553,7 +553,7 @@ static acpi_status acpi_ev_delete_gpe_xrupt(struct acpi_gpe_xrupt_info *gpe_xrupt) { acpi_status status; - u32 flags; + unsigned long flags; ACPI_FUNCTION_TRACE("ev_delete_gpe_xrupt"); @@ -610,7 +610,7 @@ acpi_ev_install_gpe_block(struct acpi_gp struct acpi_gpe_block_info *next_gpe_block; struct acpi_gpe_xrupt_info *gpe_xrupt_block; acpi_status status; - u32 flags; + unsigned long flags; ACPI_FUNCTION_TRACE("ev_install_gpe_block"); @@ -663,7 +663,7 @@ acpi_ev_install_gpe_block(struct acpi_gp acpi_status acpi_ev_delete_gpe_block(struct acpi_gpe_block_info *gpe_block) { acpi_status status; - u32 flags; + unsigned long flags; ACPI_FUNCTION_TRACE("ev_install_gpe_block"); diff -puN drivers/acpi/events/evgpe.c~acpi-cleanup-u32-flags-in-spin_lock-calls drivers/acpi/events/evgpe.c --- devel/drivers/acpi/events/evgpe.c~acpi-cleanup-u32-flags-in-spin_lock-calls 2005-10-11 20:43:48.000000000 -0700 +++ devel-akpm/drivers/acpi/events/evgpe.c 2005-10-11 20:43:48.000000000 -0700 @@ -377,7 +377,7 @@ u32 acpi_ev_gpe_detect(struct acpi_gpe_x struct acpi_gpe_register_info *gpe_register_info; u32 status_reg; u32 enable_reg; - u32 flags; + unsigned long flags; acpi_status status; struct acpi_gpe_block_info *gpe_block; acpi_native_uint i; diff -puN drivers/acpi/events/evxface.c~acpi-cleanup-u32-flags-in-spin_lock-calls drivers/acpi/events/evxface.c --- devel/drivers/acpi/events/evxface.c~acpi-cleanup-u32-flags-in-spin_lock-calls 2005-10-11 20:43:48.000000000 -0700 +++ devel-akpm/drivers/acpi/events/evxface.c 2005-10-11 20:43:48.000000000 -0700 @@ -562,7 +562,7 @@ acpi_install_gpe_handler(acpi_handle gpe struct acpi_gpe_event_info *gpe_event_info; struct acpi_handler_info *handler; acpi_status status; - u32 flags; + unsigned long flags; ACPI_FUNCTION_TRACE("acpi_install_gpe_handler"); @@ -653,7 +653,7 @@ acpi_remove_gpe_handler(acpi_handle gpe_ struct acpi_gpe_event_info *gpe_event_info; struct acpi_handler_info *handler; acpi_status status; - u32 flags; + unsigned long flags; ACPI_FUNCTION_TRACE("acpi_remove_gpe_handler"); _