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

Commit 4f179d12 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86, numaq: cleanups 



Also move xquad_portio over to where it's allocated.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 9d45cf9e

arch/x86/include/asm/numaq.h

+2 −0
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ 
extern int found_numaq;

extern int get_memcfg_numaq(void);



extern void *xquad_portio;



/*

 * SYS_CFG_DATA_PRIV_ADDR, struct eachquadmem, and struct sys_cfg_data are the

 */

arch/x86/kernel/numaq_32.c

+18 −15
Original line number Diff line number Diff line
@@ -23,17 +23,18 @@ 
 * Send feedback to <gone@us.ibm.com>

 */



#include <linux/mm.h>

#include <linux/nodemask.h>

#include <linux/bootmem.h>

#include <linux/mmzone.h>

#include <linux/module.h>

#include <linux/nodemask.h>

#include <asm/numaq.h>

#include <asm/topology.h>

#include <linux/mm.h>



#include <asm/processor.h>

#include <asm/topology.h>

#include <asm/genapic.h>

#include <asm/e820.h>

#include <asm/numaq.h>

#include <asm/setup.h>

#include <asm/e820.h>



#define	MB_TO_PAGES(addr) ((addr) << (20 - PAGE_SHIFT))
@@ -91,6 +92,7 @@ static int __init numaq_pre_time_init(void) 
}



int found_numaq;



/*

 * Have to match translation table entries to main table entries by counter

 * hence the mpc_record variable .... can't see a less disgusting way of
@@ -444,7 +446,8 @@ static inline physid_mask_t numaq_apicid_to_cpu_present(int logical_apicid) 
	return physid_mask_of_physid(cpu + 4*node);

}



extern void *xquad_portio;

/* Where the IO area was mapped on multiquad, always 0 otherwise */

void *xquad_portio;



static inline int numaq_check_phys_apicid_present(int boot_cpu_physical_apicid)

{

arch/x86/pci/numaq_32.c

+0 −4
Original line number Diff line number Diff line
@@ -18,10 +18,6 @@ 


#define QUADLOCAL2BUS(quad,local) (quad_local_to_mp_bus_id[quad][local])



/* Where the IO area was mapped on multiquad, always 0 otherwise */

void *xquad_portio;

EXPORT_SYMBOL(xquad_portio);



#define XQUAD_PORT_ADDR(port, quad) (xquad_portio + (XQUAD_PORTIO_QUAD*quad) + port)



#define PCI_CONF1_MQ_ADDRESS(bus, devfn, reg) \