Commit 42a4b427 authored by Robert Richter's avatar Robert Richter Committed by Ingo Molnar
Browse files

x86/pci: mp_bus_to_node merge: moving code in amd_bus.c 



Signed-off-by: default avatarRobert Richter <robert.richter@amd.com>
Acked-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 8eefc664

arch/x86/pci/amd_bus.c

+21 −21
Original line number Diff line number Diff line
@@ -14,27 +14,6 @@ 
 * also get peer root bus resource for io,mmio

 */





/*

 * sub bus (transparent) will use entres from 3 to store extra from root,

 * so need to make sure have enought slot there, increase PCI_BUS_NUM_RESOURCES?

 */

#define RES_NUM 16

struct pci_root_info {

	char name[12];

	unsigned int res_num;

	struct resource res[RES_NUM];

	int bus_min;

	int bus_max;

	int node;

	int link;

};



/* 4 at this time, it may become to 32 */

#define PCI_ROOT_NR 4

static int pci_root_num;

static struct pci_root_info pci_root_info[PCI_ROOT_NR];



#ifdef CONFIG_NUMA



#define BUS_NR 256
@@ -65,8 +44,29 @@ int get_mp_bus_to_node(int busnum) 


	return node;

}



#endif



/*

 * sub bus (transparent) will use entres from 3 to store extra from root,

 * so need to make sure have enought slot there, increase PCI_BUS_NUM_RESOURCES?

 */

#define RES_NUM 16

struct pci_root_info {

	char name[12];

	unsigned int res_num;

	struct resource res[RES_NUM];

	int bus_min;

	int bus_max;

	int node;

	int link;

};



/* 4 at this time, it may become to 32 */

#define PCI_ROOT_NR 4

static int pci_root_num;

static struct pci_root_info pci_root_info[PCI_ROOT_NR];



void set_pci_bus_resources_arch_default(struct pci_bus *b)

{

	int i;