Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 288a60cf authored by Chris Zankel's avatar Chris Zankel Committed by Linus Torvalds
Browse files

[PATCH] xtensa: remove io_remap_page_range and minor clean-ups 



Remove io_remap_page_range() from all of Linux 2.6.x (as requested and
suggested by Randy Dunlap) and minor clean-ups.

Signed-off-by: default avatarChris Zankel <chris@zankel.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent fac97ae0

arch/xtensa/kernel/pci.c

+2 −2
Original line number Diff line number Diff line
@@ -402,7 +402,7 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, 
	__pci_mmap_set_flags(dev, vma, mmap_state);

	__pci_mmap_set_pgprot(dev, vma, mmap_state, write_combine);



	ret = io_remap_page_range(vma, vma->vm_start, vma->vm_pgoff<<PAGE_SHIFT,

	ret = io_remap_pfn_range(vma, vma->vm_start, vma->vm_pgoff,

			         vma->vm_end - vma->vm_start,vma->vm_page_prot);



	return ret;

arch/xtensa/kernel/platform.c

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ _F(int, pcibios_fixup, (void), { return 0; }); 
_F(int, get_rtc_time, (time_t* t), { return 0; });

_F(int, set_rtc_time, (time_t t), { return 0; });



#if CONFIG_XTENSA_CALIBRATE_CCOUNT

#ifdef CONFIG_XTENSA_CALIBRATE_CCOUNT

_F(void, calibrate_ccount, (void),

{

  printk ("ERROR: Cannot calibrate cpu frequency! Assuming 100MHz.\n");

arch/xtensa/kernel/process.c

+1 −1
Original line number Diff line number Diff line
@@ -457,7 +457,7 @@ int 
dump_task_fpu(struct pt_regs *regs, struct task_struct *task, elf_fpregset_t *r)

{

/* see asm/coprocessor.h for this magic number 16 */

#if TOTAL_CPEXTRA_SIZE > 16

#if XTENSA_CP_EXTRA_SIZE > 16

	do_save_fpregs (r, regs, task);



	/*  For now, bit 16 means some extra state may be present:  */

arch/xtensa/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -304,7 +304,7 @@ void __init setup_arch(char **cmdline_p) 
# endif

#endif



#if CONFIG_PCI

#ifdef CONFIG_PCI

	platform_pcibios_init();

#endif

}

arch/xtensa/kernel/signal.c

+1 −1
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ restore_cpextra (struct _cpstate *buf) 


	struct task_struct *tsk = current;

	release_all_cp(tsk);

	return __copy_from_user(tsk->thread.cpextra, buf, TOTAL_CPEXTRA_SIZE);

	return __copy_from_user(tsk->thread.cpextra, buf, XTENSA_CP_EXTRA_SIZE);

#endif

	return 0;

}