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

Commit c13cf371 authored by Prarit Bhargava's avatar Prarit Bhargava Committed by Tony Luck
Browse files

[IA64] hotplug/ia64: SN Hotplug Driver: moving of header files 



This patch moves header files out of the arch/ia64/sn directories and into
include/asm-ia64/sn.  These files were being included by other subsystems
and should be under include/asm-ia64/sn.

Signed-off-by: default avatarPrarit Bhargava <prarit@sgi.com>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent cb4cb2cb

arch/ia64/sn/include/xtalk/hubdev.h

+2 −0
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ 
#ifndef _ASM_IA64_SN_XTALK_HUBDEV_H

#define _ASM_IA64_SN_XTALK_HUBDEV_H



#include "xtalk/xwidgetdev.h"



#define HUB_WIDGET_ID_MAX 0xf

#define DEV_PER_WIDGET (2*2*8)

#define IIO_ITTE_WIDGET_BITS    4       /* size of widget field */

arch/ia64/sn/kernel/io_init.c

+7 −7
Original line number Diff line number Diff line
@@ -9,17 +9,17 @@ 
#include <linux/bootmem.h>

#include <linux/nodemask.h>

#include <asm/sn/types.h>

#include <asm/sn/sn_sal.h>

#include <asm/sn/addrs.h>

#include <asm/sn/pcibus_provider_defs.h>

#include <asm/sn/pcidev.h>

#include "pci/pcibr_provider.h"

#include "xtalk/xwidgetdev.h"

#include <asm/sn/geo.h>

#include "xtalk/hubdev.h"

#include <asm/sn/io.h>

#include <asm/sn/pcibr_provider.h>

#include <asm/sn/pcibus_provider_defs.h>

#include <asm/sn/pcidev.h>

#include <asm/sn/simulator.h>

#include <asm/sn/sn_sal.h>

#include <asm/sn/tioca_provider.h>

#include "xtalk/hubdev.h"

#include "xtalk/xwidgetdev.h"



nasid_t master_nasid = INVALID_NASID;	/* Partition Master */
@@ -226,7 +226,7 @@ static void sn_fixup_ionodes(void) 
 * from our PCI provider include PIO maps to BAR space and interrupt

 * objects.

 */

static void sn_pci_fixup_slot(struct pci_dev *dev)

void sn_pci_fixup_slot(struct pci_dev *dev)

{

	int idx;

	int segment = 0;

arch/ia64/sn/kernel/irq.c

+2 −3
Original line number Diff line number Diff line
@@ -10,13 +10,12 @@ 


#include <linux/irq.h>

#include <linux/spinlock.h>

#include <asm/sn/intr.h>

#include <asm/sn/addrs.h>

#include <asm/sn/arch.h>

#include "xtalk/xwidgetdev.h"

#include <asm/sn/intr.h>

#include <asm/sn/pcibr_provider.h>

#include <asm/sn/pcibus_provider_defs.h>

#include <asm/sn/pcidev.h>

#include "pci/pcibr_provider.h"

#include <asm/sn/shub_mmr.h>

#include <asm/sn/sn_sal.h>

arch/ia64/sn/pci/pci_dma.c

+2 −1
Original line number Diff line number Diff line
@@ -11,9 +11,10 @@ 


#include <linux/module.h>

#include <asm/dma.h>

#include <asm/sn/sn_sal.h>

#include <asm/sn/pcibr_provider.h>

#include <asm/sn/pcibus_provider_defs.h>

#include <asm/sn/pcidev.h>

#include <asm/sn/sn_sal.h>



#define SG_ENT_VIRT_ADDRESS(sg)	(page_address((sg)->page) + (sg)->offset)

#define SG_ENT_PHYS_ADDRESS(SG)	virt_to_phys(SG_ENT_VIRT_ADDRESS(SG))

arch/ia64/sn/pci/pcibr/pcibr_ate.c

+1 −1
Original line number Diff line number Diff line
@@ -8,9 +8,9 @@ 


#include <linux/types.h>

#include <asm/sn/sn_sal.h>

#include <asm/sn/pcibr_provider.h>

#include <asm/sn/pcibus_provider_defs.h>

#include <asm/sn/pcidev.h>

#include "pci/pcibr_provider.h"



int pcibr_invalidate_ate = 0;	/* by default don't invalidate ATE on free */