parisc: remove dead BIO_VMERGE_BOUNDARY and BIO_VMERGE_MAX_SIZE definitions
The block layer dropped the virtual merge feature
(b8b3e16cfe
). BIO_VMERGE_BOUNDARY and
BIO_VMERGE_MAX_SIZE definitions are meaningless now.
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Acked-by: Grant Grundler <grundler@parisc-linux.org>
Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
This commit is contained in:
parent
022b769045
commit
0063507787
@ -4,12 +4,6 @@
|
||||
#include <linux/types.h>
|
||||
#include <asm/pgtable.h>
|
||||
|
||||
extern unsigned long parisc_vmerge_boundary;
|
||||
extern unsigned long parisc_vmerge_max_size;
|
||||
|
||||
#define BIO_VMERGE_BOUNDARY parisc_vmerge_boundary
|
||||
#define BIO_VMERGE_MAX_SIZE parisc_vmerge_max_size
|
||||
|
||||
#define virt_to_phys(a) ((unsigned long)__pa(a))
|
||||
#define phys_to_virt(a) __va(a)
|
||||
#define virt_to_bus virt_to_phys
|
||||
|
@ -58,11 +58,6 @@ int parisc_bus_is_phys __read_mostly = 1; /* Assume no IOMMU is present */
|
||||
EXPORT_SYMBOL(parisc_bus_is_phys);
|
||||
#endif
|
||||
|
||||
/* This sets the vmerge boundary and size, it's here because it has to
|
||||
* be available on all platforms (zero means no-virtual merging) */
|
||||
unsigned long parisc_vmerge_boundary = 0;
|
||||
unsigned long parisc_vmerge_max_size = 0;
|
||||
|
||||
void __init setup_cmdline(char **cmdline_p)
|
||||
{
|
||||
extern unsigned int boot_args[];
|
||||
|
@ -1578,8 +1578,6 @@ static int __init ccio_probe(struct parisc_device *dev)
|
||||
|
||||
ioc_count++;
|
||||
|
||||
parisc_vmerge_boundary = IOVP_SIZE;
|
||||
parisc_vmerge_max_size = BITS_PER_LONG * IOVP_SIZE;
|
||||
parisc_has_iommu();
|
||||
return 0;
|
||||
}
|
||||
|
@ -1978,8 +1978,6 @@ static int sba_driver_callback(struct parisc_device *dev)
|
||||
proc_create("sba_iommu-bitmap", 0, root, &sba_proc_bitmap_fops);
|
||||
#endif
|
||||
|
||||
parisc_vmerge_boundary = IOVP_SIZE;
|
||||
parisc_vmerge_max_size = IOVP_SIZE * BITS_PER_LONG;
|
||||
parisc_has_iommu();
|
||||
return 0;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user