diff options
| author |   FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2008-12-14 11:44:37 +0900 |
|---|---|---|
| committer |   Kyle McMartin <kyle@mcmartin.ca> | 2009-01-05 18:15:25 +0000 |
| commit | 0063507787ee7b385a8cbe7521469acf33341eb6 (patch) | |
| tree | 9f8662ba49377a71bca7e30d8c64b11f019df90e /arch/parisc/kernel/setup.c | |
| parent | parisc: set_time() catch errors (diff) | |
| download | linux-dev-0063507787ee7b385a8cbe7521469acf33341eb6.tar.xz linux-dev-0063507787ee7b385a8cbe7521469acf33341eb6.zip | |
parisc: remove dead BIO_VMERGE_BOUNDARY and BIO_VMERGE_MAX_SIZE definitions
The block layer dropped the virtual merge feature
(b8b3e16cfe6435d961f6aaebcfd52a1ff2a988c5). 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>
Diffstat (limited to 'arch/parisc/kernel/setup.c')
| -rw-r--r-- | arch/parisc/kernel/setup.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/parisc/kernel/setup.c b/arch/parisc/kernel/setup.c index 7d27853ff8c8..8d8b0248a4a9 100644 --- a/arch/parisc/kernel/setup.c +++ b/arch/parisc/kernel/setup.c @@ -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[]; |