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

Commit f47e2db4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'parisc-4.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux 

Pull parisc fixes and cleanups from Helge Deller:
 "Nothing really important in this patchset: fix resource leaks in error
  paths, coding style cleanups and code removal"

* 'parisc-4.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: Remove flush_user_dcache_range and flush_user_icache_range
  parisc: fix a printk
  parisc: ccio-dma: Handle return NULL error from ioremap_nocache
  parisc: Define access_ok() as macro
  parisc: eisa: Fix resource leaks in error paths
  parisc: eisa: Remove coding style errors
parents 606ed721 ef470a60

arch/parisc/include/asm/cacheflush.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -27,8 +27,6 @@ void flush_user_dcache_range_asm(unsigned long, unsigned long); 
void flush_kernel_dcache_range_asm(unsigned long, unsigned long);

void flush_kernel_dcache_range_asm(unsigned long, unsigned long);

void flush_kernel_dcache_page_asm(void *);

void flush_kernel_dcache_page_asm(void *);

void flush_kernel_icache_page(void *);

void flush_kernel_icache_page(void *);

void flush_user_dcache_range(unsigned long, unsigned long);

void flush_user_icache_range(unsigned long, unsigned long);





/* Cache flush operations */

/* Cache flush operations */

arch/parisc/include/asm/uaccess.h

+1 −5
Original line number Original line Diff line number Diff line
@@ -32,11 +32,7 @@ 
 * that put_user is the same as __put_user, etc.

 * that put_user is the same as __put_user, etc.

 */

 */





static inline long access_ok(int type, const void __user * addr,

#define access_ok(type, uaddr, size) (1)

		unsigned long size)

{

	return 1;

}





#define put_user __put_user

#define put_user __put_user

#define get_user __get_user

#define get_user __get_user

arch/parisc/kernel/cache.c

+0 −18
Original line number Original line Diff line number Diff line
@@ -574,24 +574,6 @@ void flush_cache_mm(struct mm_struct *mm) 
	}

	}

}

}





void

flush_user_dcache_range(unsigned long start, unsigned long end)

{

	if ((end - start) < parisc_cache_flush_threshold)

		flush_user_dcache_range_asm(start,end);

	else

		flush_data_cache();

}



void

flush_user_icache_range(unsigned long start, unsigned long end)

{

	if ((end - start) < parisc_cache_flush_threshold)

		flush_user_icache_range_asm(start,end);

	else

		flush_instruction_cache();

}



void flush_cache_range(struct vm_area_struct *vma,

void flush_cache_range(struct vm_area_struct *vma,

		unsigned long start, unsigned long end)

		unsigned long start, unsigned long end)

{

{

arch/parisc/kernel/signal.c

+7 −6
Original line number Original line Diff line number Diff line
@@ -233,6 +233,7 @@ setup_rt_frame(struct ksignal *ksig, sigset_t *set, struct pt_regs *regs, 
	struct rt_sigframe __user *frame;

	struct rt_sigframe __user *frame;

	unsigned long rp, usp;

	unsigned long rp, usp;

	unsigned long haddr, sigframe_size;

	unsigned long haddr, sigframe_size;

	unsigned long start, end;

	int err = 0;

	int err = 0;

#ifdef CONFIG_64BIT

#ifdef CONFIG_64BIT

	struct compat_rt_sigframe __user * compat_frame;

	struct compat_rt_sigframe __user * compat_frame;
@@ -300,10 +301,10 @@ setup_rt_frame(struct ksignal *ksig, sigset_t *set, struct pt_regs *regs, 
	}

	}

#endif

#endif





	flush_user_dcache_range((unsigned long) &frame->tramp[0],

	start = (unsigned long) &frame->tramp[0];

			   (unsigned long) &frame->tramp[TRAMP_SIZE]);

	end = (unsigned long) &frame->tramp[TRAMP_SIZE];

	flush_user_icache_range((unsigned long) &frame->tramp[0],

	flush_user_dcache_range_asm(start, end);

			   (unsigned long) &frame->tramp[TRAMP_SIZE]);

	flush_user_icache_range_asm(start, end);





	/* TRAMP Words 0-4, Length 5 = SIGRESTARTBLOCK_TRAMP

	/* TRAMP Words 0-4, Length 5 = SIGRESTARTBLOCK_TRAMP

	 * TRAMP Words 5-9, Length 4 = SIGRETURN_TRAMP

	 * TRAMP Words 5-9, Length 4 = SIGRETURN_TRAMP
@@ -549,8 +550,8 @@ insert_restart_trampoline(struct pt_regs *regs) 
		WARN_ON(err);

		WARN_ON(err);





		/* flush data/instruction cache for new insns */

		/* flush data/instruction cache for new insns */

		flush_user_dcache_range(start, end);

		flush_user_dcache_range_asm(start, end);

		flush_user_icache_range(start, end);

		flush_user_icache_range_asm(start, end);





		regs->gr[31] = regs->gr[30] + 8;

		regs->gr[31] = regs->gr[30] + 8;

		return;

		return;

arch/parisc/mm/fault.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -239,7 +239,7 @@ show_signal_msg(struct pt_regs *regs, unsigned long code, 
		vma ? ',':'\n');

		vma ? ',':'\n');





	if (vma)

	if (vma)

		pr_warn(KERN_CONT " vm_start = 0x%08lx, vm_end = 0x%08lx\n",

		pr_cont(" vm_start = 0x%08lx, vm_end = 0x%08lx\n",

			vma->vm_start, vma->vm_end);

			vma->vm_start, vma->vm_end);





	show_regs(regs);

	show_regs(regs);