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

Commit 1e8a8cc5 authored by David S. Miller's avatar David S. Miller
Browse files

[SPARC64]: Internalize pci_memspace_mask. 



The only user was bus_dvma_to_mem() which is no longer used
by any driver, so kill that, and the export of pci_memspace_mask.

The only user now is the PCI mmap support code.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a2fb23af

arch/sparc64/kernel/pci.c

+2 −0
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ 
#include <asm/isa.h>

#include <asm/prom.h>



#include "pci_impl.h"



unsigned long pci_memspace_mask = 0xffffffffUL;



#ifndef CONFIG_PCI

arch/sparc64/kernel/pci_impl.h

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <asm/prom.h>



extern struct pci_controller_info *pci_controller_root;

extern unsigned long pci_memspace_mask;



extern int pci_num_controllers;

arch/sparc64/kernel/sparc64_ksyms.c

+0 −1
Original line number Diff line number Diff line
@@ -212,7 +212,6 @@ EXPORT_SYMBOL(insl); 
#ifdef CONFIG_PCI

EXPORT_SYMBOL(ebus_chain);

EXPORT_SYMBOL(isa_chain);

EXPORT_SYMBOL(pci_memspace_mask);

EXPORT_SYMBOL(pci_alloc_consistent);

EXPORT_SYMBOL(pci_free_consistent);

EXPORT_SYMBOL(pci_map_single);

include/asm-sparc64/io.h

+0 −8
Original line number Diff line number Diff line
@@ -24,14 +24,6 @@ extern unsigned long kern_base, kern_size; 
#define page_to_phys(page)	(page_to_pfn(page) << PAGE_SHIFT)

#define BIO_VMERGE_BOUNDARY	8192



/* Different PCI controllers we support have their PCI MEM space

 * mapped to an either 2GB (Psycho) or 4GB (Sabre) aligned area,

 * so need to chop off the top 33 or 32 bits.

 */

extern unsigned long pci_memspace_mask;



#define bus_dvma_to_mem(__vaddr) ((__vaddr) & pci_memspace_mask)



static __inline__ u8 _inb(unsigned long addr)

{

	u8 ret;