Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc535154 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 

* 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
  ACPI: replace acpi_integer by u64
  ACPICA: Update version to 20100121.
  ACPICA: Remove unused uint32_struct type
  ACPICA: Disassembler: Remove obsolete "Integer64" field in parse object
  ACPICA: Remove obsolete ACPI_INTEGER (acpi_integer) type
  ACPICA: Predefined name repair: fix NULL package elements
  ACPICA: AcpiGetDevices: Eliminate unnecessary _STA calls
  ACPICA: Update all ACPICA copyrights and signons to 2010
  ACPICA: Update for new gcc-4 warning options
parents d03ab7ff 439913ff

arch/ia64/hp/common/aml_nfw.c

+3 −3
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ static void aml_nfw_execute(struct ia64_nfw_context *c) 
		     c->arg[4], c->arg[5], c->arg[6], c->arg[7]);

}



static void aml_nfw_read_arg(u8 *offset, u32 bit_width, acpi_integer *value)

static void aml_nfw_read_arg(u8 *offset, u32 bit_width, u64 *value)

{

	switch (bit_width) {

	case 8:
@@ -95,7 +95,7 @@ static void aml_nfw_read_arg(u8 *offset, u32 bit_width, acpi_integer *value) 
	}

}



static void aml_nfw_write_arg(u8 *offset, u32 bit_width, acpi_integer *value)

static void aml_nfw_write_arg(u8 *offset, u32 bit_width, u64 *value)

{

	switch (bit_width) {

	case 8:
@@ -114,7 +114,7 @@ static void aml_nfw_write_arg(u8 *offset, u32 bit_width, acpi_integer *value) 
}



static acpi_status aml_nfw_handler(u32 function, acpi_physical_address address,

	u32 bit_width, acpi_integer *value, void *handler_context,

	u32 bit_width, u64 *value, void *handler_context,

	void *region_context)

{

	struct ia64_nfw_context *context = handler_context;

arch/x86/kernel/cpu/cpufreq/powernow-k8.c

+3 −3
Original line number Diff line number Diff line
@@ -806,7 +806,7 @@ static int find_psb_table(struct powernow_k8_data *data) 
static void powernow_k8_acpi_pst_values(struct powernow_k8_data *data,

		unsigned int index)

{

	acpi_integer control;

	u64 control;



	if (!data->acpi_data.state_count || (cpu_family == CPU_HW_PSTATE))

		return;
@@ -824,7 +824,7 @@ static int powernow_k8_cpu_init_acpi(struct powernow_k8_data *data) 
{

	struct cpufreq_frequency_table *powernow_table;

	int ret_val = -ENODEV;

	acpi_integer control, status;

	u64 control, status;



	if (acpi_processor_register_performance(&data->acpi_data, data->cpu)) {

		dprintk("register performance failed: bad ACPI data\n");
@@ -948,7 +948,7 @@ static int fill_powernow_table_fidvid(struct powernow_k8_data *data, 
		u32 fid;

		u32 vid;

		u32 freq, index;

		acpi_integer status, control;

		u64 status, control;



		if (data->exttype) {

			status =  data->acpi_data.states[i].status;

drivers/acpi/acpica/accommon.h

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *****************************************************************************/



/*

 * Copyright (C) 2000 - 2008, Intel Corp.

 * Copyright (C) 2000 - 2010, Intel Corp.

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without

drivers/acpi/acpica/acconfig.h

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *****************************************************************************/



/*

 * Copyright (C) 2000 - 2008, Intel Corp.

 * Copyright (C) 2000 - 2010, Intel Corp.

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without

drivers/acpi/acpica/acdebug.h

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *****************************************************************************/



/*

 * Copyright (C) 2000 - 2008, Intel Corp.

 * Copyright (C) 2000 - 2010, Intel Corp.

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without