Commit 647fb47d authored by Len Brown's avatar Len Brown
Browse files

ACPICA: reduce conflicts with Altix patch series 



Syntax only -- no functional changes.

Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent defad230

arch/ia64/sn/kernel/io_common.c

+12 −6
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include "xtalk/xwidgetdev.h"

#include <linux/acpi.h>

#include <asm/sn/sn2/sn_hwperf.h>

#include <asm/sn/acpi.h>



extern void sn_init_cpei_timer(void);

extern void register_sn_procfs(void);
@@ -36,6 +37,7 @@ extern void sn_legacy_pci_window_fixup(struct pci_controller *, u64, u64); 
extern void sn_io_acpi_init(void);

extern void sn_io_init(void);





static struct list_head sn_sysdata_list;



/* sysdata list struct */
@@ -48,7 +50,7 @@ int sn_ioif_inited; /* SN I/O infrastructure initialized? */ 


struct sn_pcibus_provider *sn_pci_provider[PCIIO_ASIC_MAX_TYPES];	/* indexed by asic type */



int sn_acpi_base_support()

int sn_acpi_base_support(void)

{

	struct acpi_table_header *header;

	(void)acpi_get_table_by_index(ACPI_TABLE_INDEX_DSDT, &header);
@@ -293,7 +295,7 @@ void sn_pci_fixup_slot(struct pci_dev *dev) 
	list_add_tail(&pcidev_info->pdi_list,

		      &(SN_PLATFORM_DATA(dev->bus)->pcidev_info));



	if (sn_acpi_base_support())

	if (SN_ACPI_BASE_SUPPORT())

		sn_acpi_slot_fixup(dev, pcidev_info);

	else

		sn_more_slot_fixup(dev, pcidev_info);
@@ -505,7 +507,7 @@ void __devinit 
sn_pci_fixup_bus(struct pci_bus *bus)

{



	if (sn_acpi_base_support())

	if (SN_ACPI_BASE_SUPPORT())

		sn_acpi_bus_fixup(bus);

	else

		sn_bus_fixup(bus);
@@ -551,9 +553,13 @@ sn_io_early_init(void) 
	register_sn_procfs();

#endif



	{

		struct acpi_table_header *header;

		(void)acpi_get_table_by_index(ACPI_TABLE_INDEX_DSDT, &header);

		printk(KERN_INFO "ACPI  DSDT OEM Rev 0x%x\n",

	       acpi_gbl_DSDT->oem_revision);

	if (sn_acpi_base_support())

			header->oem_revision);

	}

	if (SN_ACPI_BASE_SUPPORT())

		sn_io_acpi_init();

	else

		sn_io_init();

arch/ia64/sn/kernel/iomv.c

+2 −3
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <asm/sn/pda.h>

#include <asm/sn/sn_cpuid.h>

#include <asm/sn/shub_mmr.h>

#include <asm/sn/acpi.h>



#define IS_LEGACY_VGA_IOPORT(p) \

	(((p) >= 0x3b0 && (p) <= 0x3bb) || ((p) >= 0x3c0 && (p) <= 0x3df))
@@ -29,8 +30,6 @@ 
 * SN i/o address.  Used by sn_in*() and sn_out*().

 */



extern int sn_acpi_base_support();



void *sn_io_addr(unsigned long port)

{

	if (!IS_RUNNING_ON_SIMULATOR()) {
@@ -39,7 +38,7 @@ void *sn_io_addr(unsigned long port) 
		/* On sn2, legacy I/O ports don't point at anything */

		if (port < (64 * 1024))

			return NULL;

		if (sn_acpi_base_support())

		if (SN_ACPI_BASE_SUPPORT())

			return (__ia64_mk_io_addr(port));

		else

			return ((void *)(port | __IA64_UNCACHED_OFFSET));

include/asm-ia64/sn/acpi.h

0 → 100644
+18 −0
Original line number Diff line number Diff line 
/*

 * This file is subject to the terms and conditions of the GNU General Public

 * License.  See the file "COPYING" in the main directory of this archive

 * for more details.

 *

 * Copyright (C) 2006 Silicon Graphics, Inc. All rights reserved.

 */



#ifndef _ASM_IA64_SN_ACPI_H

#define _ASM_IA64_SN_ACPI_H



#include "acpi/acglobal.h"



#define SN_ACPI_BASE_SUPPORT()   sn_acpi_base_support()



extern int sn_acpi_base_support(void);



#endif /* _ASM_IA64_SN_ACPI_H */