Commit 8e268f33 authored by Linus Torvalds's avatar Linus Torvalds

Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6:
  sh64: Kill off virt_to_bus()/bus_to_virt().
  sh64: Fix irq_intc build failure.
  sh64: Fix fs.h removal from mm.h regressions.
parents cbdd3deb 75c46162
...@@ -47,6 +47,9 @@ config ARCH_HAS_ILOG2_U64 ...@@ -47,6 +47,9 @@ config ARCH_HAS_ILOG2_U64
bool bool
default n default n
config ARCH_NO_VIRT_TO_BUS
def_bool y
source init/Kconfig source init/Kconfig
menu "System type" menu "System type"
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/init_task.h> #include <linux/init_task.h>
#include <linux/mqueue.h> #include <linux/mqueue.h>
#include <linux/fs.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
*/ */
#include <linux/init.h> #include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/stddef.h> #include <linux/stddef.h>
......
...@@ -30,7 +30,7 @@ void *consistent_alloc(struct pci_dev *hwdev, size_t size, ...@@ -30,7 +30,7 @@ void *consistent_alloc(struct pci_dev *hwdev, size_t size,
if (vp != NULL) { if (vp != NULL) {
memset(vp, 0, size); memset(vp, 0, size);
*dma_handle = virt_to_bus(ret); *dma_handle = virt_to_phys(ret);
dma_cache_wback_inv((unsigned long)ret, size); dma_cache_wback_inv((unsigned long)ret, size);
} }
...@@ -42,7 +42,7 @@ void consistent_free(struct pci_dev *hwdev, size_t size, ...@@ -42,7 +42,7 @@ void consistent_free(struct pci_dev *hwdev, size_t size,
{ {
void *alloc; void *alloc;
alloc = bus_to_virt((unsigned long)dma_handle); alloc = phys_to_virt((unsigned long)dma_handle);
free_pages((unsigned long)alloc, get_order(size)); free_pages((unsigned long)alloc, get_order(size));
iounmap(vaddr); iounmap(vaddr);
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
* This file handles the architecture-dependent parts of process handling.. * This file handles the architecture-dependent parts of process handling..
*/ */
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/fs.h>
#include <linux/ptrace.h> #include <linux/ptrace.h>
#include <linux/reboot.h> #include <linux/reboot.h>
#include <linux/init.h> #include <linux/init.h>
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#include <linux/rwsem.h> #include <linux/rwsem.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/fs.h>
#include <linux/smp.h> #include <linux/smp.h>
#include <linux/sem.h> #include <linux/sem.h>
#include <linux/msg.h> #include <linux/msg.h>
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/fs.h>
#include <asm/mmu_context.h> #include <asm/mmu_context.h>
typedef u64 regType_t; typedef u64 regType_t;
......
...@@ -51,11 +51,11 @@ static inline dma_addr_t dma_map_single(struct device *dev, ...@@ -51,11 +51,11 @@ static inline dma_addr_t dma_map_single(struct device *dev,
{ {
#if defined(CONFIG_PCI) && !defined(CONFIG_SH_PCIDMA_NONCOHERENT) #if defined(CONFIG_PCI) && !defined(CONFIG_SH_PCIDMA_NONCOHERENT)
if (dev->bus == &pci_bus_type) if (dev->bus == &pci_bus_type)
return virt_to_bus(ptr); return virt_to_phys(ptr);
#endif #endif
dma_cache_sync(dev, ptr, size, dir); dma_cache_sync(dev, ptr, size, dir);
return virt_to_bus(ptr); return virt_to_phys(ptr);
} }
#define dma_unmap_single(dev, addr, size, dir) do { } while (0) #define dma_unmap_single(dev, addr, size, dir) do { } while (0)
...@@ -98,7 +98,7 @@ static inline void dma_sync_single(struct device *dev, dma_addr_t dma_handle, ...@@ -98,7 +98,7 @@ static inline void dma_sync_single(struct device *dev, dma_addr_t dma_handle,
if (dev->bus == &pci_bus_type) if (dev->bus == &pci_bus_type)
return; return;
#endif #endif
dma_cache_sync(dev, bus_to_virt(dma_handle), size, dir); dma_cache_sync(dev, phys_to_virt(dma_handle), size, dir);
} }
static inline void dma_sync_single_range(struct device *dev, static inline void dma_sync_single_range(struct device *dev,
...@@ -110,7 +110,7 @@ static inline void dma_sync_single_range(struct device *dev, ...@@ -110,7 +110,7 @@ static inline void dma_sync_single_range(struct device *dev,
if (dev->bus == &pci_bus_type) if (dev->bus == &pci_bus_type)
return; return;
#endif #endif
dma_cache_sync(dev, bus_to_virt(dma_handle) + offset, size, dir); dma_cache_sync(dev, phys_to_virt(dma_handle) + offset, size, dir);
} }
static inline void dma_sync_sg(struct device *dev, struct scatterlist *sg, static inline void dma_sync_sg(struct device *dev, struct scatterlist *sg,
......
...@@ -31,10 +31,6 @@ ...@@ -31,10 +31,6 @@
#include <asm/page.h> #include <asm/page.h>
#include <asm-generic/iomap.h> #include <asm-generic/iomap.h>
#define virt_to_bus virt_to_phys
#define bus_to_virt phys_to_virt
#define page_to_bus page_to_phys
/* /*
* Nothing overly special here.. instead of doing the same thing * Nothing overly special here.. instead of doing the same thing
* over and over again, we just define a set of sh64_in/out functions * over and over again, we just define a set of sh64_in/out functions
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment