diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2007-07-18 03:09:30 -0400 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-07-18 04:20:22 -0400 |
| commit | 0785b9dcdc3d93e67529e4bd819a427776d3a07e (patch) | |
| tree | c9c3d556ba4f10352c50d6d137cc68f50802885f | |
| parent | d762acdbd3b2bd9a714ace47d7b0c76133d7b295 (diff) | |
[SPARC]: Mark sparc and sparc64 as not having virt_to_bus
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | arch/sparc/Kconfig | 3 | ||||
| -rw-r--r-- | arch/sparc64/Kconfig | 3 | ||||
| -rw-r--r-- | include/asm-sparc64/io.h | 5 |
3 files changed, 6 insertions, 5 deletions
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index 73df7115325b..603d83ad65c8 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig | |||
| @@ -21,6 +21,9 @@ config GENERIC_ISA_DMA | |||
| 21 | bool | 21 | bool |
| 22 | default y | 22 | default y |
| 23 | 23 | ||
| 24 | config ARCH_NO_VIRT_TO_BUS | ||
| 25 | def_bool y | ||
| 26 | |||
| 24 | source "init/Kconfig" | 27 | source "init/Kconfig" |
| 25 | 28 | ||
| 26 | menu "General machine setup" | 29 | menu "General machine setup" |
diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig index b84b6af1241e..df6ee71894d1 100644 --- a/arch/sparc64/Kconfig +++ b/arch/sparc64/Kconfig | |||
| @@ -62,6 +62,9 @@ config AUDIT_ARCH | |||
| 62 | bool | 62 | bool |
| 63 | default y | 63 | default y |
| 64 | 64 | ||
| 65 | config ARCH_NO_VIRT_TO_BUS | ||
| 66 | def_bool y | ||
| 67 | |||
| 65 | choice | 68 | choice |
| 66 | prompt "Kernel page size" | 69 | prompt "Kernel page size" |
| 67 | default SPARC64_PAGE_SIZE_8KB | 70 | default SPARC64_PAGE_SIZE_8KB |
diff --git a/include/asm-sparc64/io.h b/include/asm-sparc64/io.h index ad595b679842..9565a892801e 100644 --- a/include/asm-sparc64/io.h +++ b/include/asm-sparc64/io.h | |||
| @@ -14,11 +14,6 @@ | |||
| 14 | #define __SLOW_DOWN_IO do { } while (0) | 14 | #define __SLOW_DOWN_IO do { } while (0) |
| 15 | #define SLOW_DOWN_IO do { } while (0) | 15 | #define SLOW_DOWN_IO do { } while (0) |
| 16 | 16 | ||
| 17 | extern unsigned long virt_to_bus_not_defined_use_pci_map(volatile void *addr); | ||
| 18 | #define virt_to_bus virt_to_bus_not_defined_use_pci_map | ||
| 19 | extern unsigned long bus_to_virt_not_defined_use_pci_map(volatile void *addr); | ||
| 20 | #define bus_to_virt bus_to_virt_not_defined_use_pci_map | ||
| 21 | |||
| 22 | /* BIO layer definitions. */ | 17 | /* BIO layer definitions. */ |
| 23 | extern unsigned long kern_base, kern_size; | 18 | extern unsigned long kern_base, kern_size; |
| 24 | #define page_to_phys(page) (page_to_pfn(page) << PAGE_SHIFT) | 19 | #define page_to_phys(page) (page_to_pfn(page) << PAGE_SHIFT) |
