diff options
| author | Matthew Wilcox <willy@parisc-linux.org> | 2005-03-09 20:54:09 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-03-09 20:54:09 -0800 |
| commit | 8196fb920f3ddfdadd304e2da67e9ce2ec5155d1 (patch) | |
| tree | b2386b2d4b87ec4a71a800671c0ed87928bd22dd /arch | |
| parent | ac6cd4374e0735801af400476a24561e50200e5f (diff) | |
[PATCH] PA-RISC IOMMU-related fixes
- PCI_DMA_BUS_IS_PHYS is only true if we don't have an IOMMU. Getting this
wrong results in system panics when we run out of bounce buffers.
- parisc_vmerge_boundary and parisc_vmerge_max_size need to be available on
all machines, not just ones with GSC.
Signed-off-by: Grant Grundler <grundler@parisc-linux.org>
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/parisc/kernel/setup.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/parisc/kernel/setup.c b/arch/parisc/kernel/setup.c index 40fc427b5d54..3379a08628e0 100644 --- a/arch/parisc/kernel/setup.c +++ b/arch/parisc/kernel/setup.c @@ -53,6 +53,15 @@ struct proc_dir_entry * proc_runway_root = NULL; struct proc_dir_entry * proc_gsc_root = NULL; struct proc_dir_entry * proc_mckinley_root = NULL; +#if !defined(CONFIG_PA20) && (defined(CONFIG_IOMMU_CCIO) || defined(CONFIG_IOMMU_SBA)) +int parisc_bus_is_phys = 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) { |