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

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

arch/sh64/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -47,6 +47,9 @@ config ARCH_HAS_ILOG2_U64 
	bool

	default n



config ARCH_NO_VIRT_TO_BUS

	def_bool y



source init/Kconfig



menu "System type"

arch/sh64/kernel/init_task.c

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
#include <linux/sched.h>

#include <linux/init_task.h>

#include <linux/mqueue.h>



#include <linux/fs.h>

#include <asm/uaccess.h>

#include <asm/pgtable.h>

arch/sh64/kernel/irq_intc.c

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
 */



#include <linux/init.h>

#include <linux/interrupt.h>

#include <linux/irq.h>

#include <linux/kernel.h>

#include <linux/stddef.h>

arch/sh64/kernel/pci-dma.c

+2 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ void *consistent_alloc(struct pci_dev *hwdev, size_t size, 


	if (vp != NULL) {

		memset(vp, 0, size);

		*dma_handle = virt_to_bus(ret);

		*dma_handle = virt_to_phys(ret);

		dma_cache_wback_inv((unsigned long)ret, size);

	}
@@ -42,7 +42,7 @@ void consistent_free(struct pci_dev *hwdev, size_t size, 
{

	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));



	iounmap(vaddr);

arch/sh64/kernel/process.c

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
 * This file handles the architecture-dependent parts of process handling..

 */

#include <linux/mm.h>

#include <linux/fs.h>

#include <linux/ptrace.h>

#include <linux/reboot.h>

#include <linux/init.h>