Merge branch 'acpica' into release (985f3878) · Commits · 戴 / test

arch/ia64/hp/common/sba_iommu.c

+2 −5

Original line number	Diff line number	Diff line
		@@ -2026,24 +2026,21 @@ acpi_sba_ioc_add(struct acpi_device *device)
		struct ioc *ioc;
		acpi_status status;
		u64 hpa, length;
		struct acpi_buffer buffer;
		struct acpi_device_info *dev_info;

		status = hp_acpi_csr_space(device->handle, &hpa, &length);
		if (ACPI_FAILURE(status))
		return 1;

		buffer.length = ACPI_ALLOCATE_LOCAL_BUFFER;
		status = acpi_get_object_info(device->handle, &buffer);
		status = acpi_get_object_info(device->handle, &dev_info);
		if (ACPI_FAILURE(status))
		return 1;
		dev_info = buffer.pointer;

		/*
		* For HWP0001, only SBA appears in ACPI namespace. It encloses the PCI
		* root bridges, and its CSR space includes the IOC function.
		*/
		if (strncmp("HWP0001", dev_info->hardware_id.value, 7) == 0) {
		if (strncmp("HWP0001", dev_info->hardware_id.string, 7) == 0) {
		hpa += ZX1_IOC_OFFSET;
		/* zx1 based systems default to kernel page size iommu pages */
		if (!iovp_shift)

+4 −7

Original line number	Diff line number	Diff line
		@@ -481,26 +481,23 @@ static acpi_status is_memory_device(acpi_handle handle)
		{
		char *hardware_id;
		acpi_status status;
		struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
		struct acpi_device_info *info;


		status = acpi_get_object_info(handle, &buffer);
		status = acpi_get_object_info(handle, &info);
		if (ACPI_FAILURE(status))
		return status;

		info = buffer.pointer;
		if (!(info->valid & ACPI_VALID_HID)) {
		kfree(buffer.pointer);
		kfree(info);
		return AE_ERROR;
		}

		hardware_id = info->hardware_id.value;
		hardware_id = info->hardware_id.string;
		if ((hardware_id == NULL) \|\|
		(strcmp(hardware_id, ACPI_MEMORY_DEVICE_HID)))
		status = AE_ERROR;

		kfree(buffer.pointer);
		kfree(info);
		return status;
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -28,7 +28,7 @@ acpi-$(ACPI_FUTURE_USAGE) += hwtimer.o
		acpi-y += nsaccess.o nsload.o nssearch.o nsxfeval.o \
		nsalloc.o nseval.o nsnames.o nsutils.o nsxfname.o \
		nsdump.o nsinit.o nsobject.o nswalk.o nsxfobj.o \
		nsparse.o nspredef.o
		nsparse.o nspredef.o nsrepair.o

		acpi-$(ACPI_FUTURE_USAGE) += nsdumpdv.o

		@@ -44,4 +44,4 @@ acpi-y += tbxface.o tbinstal.o tbutils.o tbfind.o tbfadt.o tbxfroot.o

		acpi-y += utalloc.o utdebug.o uteval.o utinit.o utmisc.o utxface.o \
		utcopy.o utdelete.o utglobal.o utmath.o utobject.o \
		utstate.o utmutex.o utobject.o utresrc.o utlock.o
		utstate.o utmutex.o utobject.o utresrc.o utlock.o utids.o

+8 −2

Original line number	Diff line number	Diff line
		@@ -183,7 +183,7 @@

		/* Operation regions */

		#define ACPI_NUM_PREDEFINED_REGIONS 8
		#define ACPI_NUM_PREDEFINED_REGIONS 9
		#define ACPI_USER_REGION_BEGIN 0x80

		/* Maximum space_ids for Operation Regions */
		@@ -199,9 +199,15 @@
		#define ACPI_RSDP_CHECKSUM_LENGTH 20
		#define ACPI_RSDP_XCHECKSUM_LENGTH 36

		/* SMBus bidirectional buffer size */
		/* SMBus and IPMI bidirectional buffer size */

		#define ACPI_SMBUS_BUFFER_SIZE 34
		#define ACPI_IPMI_BUFFER_SIZE 66

		/* _sx_d and _sx_w control methods */

		#define ACPI_NUM_sx_d_METHODS 4
		#define ACPI_NUM_sx_w_METHODS 5

		/******************************************************************************
		*

+0 −4

Original line number	Diff line number	Diff line
		@@ -154,10 +154,6 @@ void
		acpi_db_display_argument_object(union acpi_operand_object *obj_desc,
		struct acpi_walk_state *walk_state);

		void acpi_db_check_predefined_names(void);

		void acpi_db_batch_execute(void);

		/*
		* dbexec - debugger control method execution
		*/