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

x86/pci: merge: moving mp_bus_to_node.c to 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 42a4b427

arch/x86/pci/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ pci-y := fixup.o 
# legacy/irq.o

pci-$(CONFIG_ACPI)		+= acpi.o

pci-y				+= legacy.o irq.o

pci-$(CONFIG_NUMA)		+= mp_bus_to_node.o



# Careful: VISWS overrule the pci-y above. The colons are

# therefor correct. This needs a proper fix by distangling the code.

arch/x86/pci/amd_bus.c

+29 −3
Original line number Diff line number Diff line 
#include <linux/init.h>

#include <linux/pci.h>

#include <linux/topology.h>

#include "pci.h"



#ifdef CONFIG_X86_64



#include <asm/pci-direct.h>

#include <asm/mpspec.h>

#include <linux/cpumask.h>

#include <linux/topology.h>

#endif



/*

 * This discovers the pcibus <-> node mapping on AMD K8.
@@ -18,6 +18,8 @@ 


#define BUS_NR 256



#ifdef CONFIG_X86_64



static int mp_bus_to_node[BUS_NR];



void set_mp_bus_to_node(int busnum, int node)
@@ -45,7 +47,31 @@ int get_mp_bus_to_node(int busnum) 
	return node;

}



#endif

#else /* CONFIG_X86_32 */



static unsigned char mp_bus_to_node[BUS_NR];



void set_mp_bus_to_node(int busnum, int node)

{

	if (busnum >= 0 &&  busnum < BUS_NR)

	mp_bus_to_node[busnum] = (unsigned char) node;

}



int get_mp_bus_to_node(int busnum)

{

	int node;



	if (busnum < 0 || busnum > (BUS_NR - 1))

		return 0;

	node = mp_bus_to_node[busnum];

	return node;

}



#endif /* CONFIG_X86_32 */



#endif /* CONFIG_NUMA */



#ifdef CONFIG_X86_64



/*

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

arch/x86/pci/mp_bus_to_node.c

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line 
#include <linux/pci.h>

#include <linux/init.h>

#include <linux/topology.h>



#define BUS_NR 256



static unsigned char mp_bus_to_node[BUS_NR];



void set_mp_bus_to_node(int busnum, int node)

{

	if (busnum >= 0 &&  busnum < BUS_NR)

	mp_bus_to_node[busnum] = (unsigned char) node;

}



int get_mp_bus_to_node(int busnum)

{

	int node;



	if (busnum < 0 || busnum > (BUS_NR - 1))

		return 0;

	node = mp_bus_to_node[busnum];

	return node;

}