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

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

Merge tag 'parisc-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6 

Pull misc parisc updates from James Bottomley:
 "This is a couple of updates to complete our fixes and one to fix a
  compile failure caused during the merge window.  Additionally, we now
  switch to the generic strncopy_from_user."

* tag 'parisc-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6:
  [PARISC] update parisc to use generic strncpy_from_user()
  [PARISC] Fix parisc compile failure after smp: Add task_struct argument to __cpu_up()
  [PARISC] fix TLB fault path on PA2.0 narrow systems
  [PARISC] fix boot failure on 32-bit systems caused by branch stubs placed before .text
parents 0c6be871 b1195c0e

arch/parisc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ config PARISC 
	select IRQ_PER_CPU

	select ARCH_HAVE_NMI_SAFE_CMPXCHG

	select GENERIC_SMP_IDLE_THREAD

	select GENERIC_STRNCPY_FROM_USER



	help

	  The PA-RISC microprocessor is designed by Hewlett-Packard and used

arch/parisc/include/asm/smp.h

+0 −2
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ typedef unsigned long address_t; 
#define cpu_number_map(cpu)	(cpu)

#define cpu_logical_map(cpu)	(cpu)



extern void smp_send_reschedule(int cpu);

extern void smp_send_all_nop(void);



extern void arch_send_call_function_single_ipi(int cpu);
@@ -50,6 +49,5 @@ static inline void __cpu_die (unsigned int cpu) { 
  while(1)

    ;

}

extern int __cpu_up (unsigned int cpu);



#endif /*  __ASM_SMP_H */

arch/parisc/include/asm/uaccess.h

+2 −3
Original line number Diff line number Diff line
@@ -218,15 +218,14 @@ struct exception_data { 
extern unsigned long lcopy_to_user(void __user *, const void *, unsigned long);

extern unsigned long lcopy_from_user(void *, const void __user *, unsigned long);

extern unsigned long lcopy_in_user(void __user *, const void __user *, unsigned long);

extern long lstrncpy_from_user(char *, const char __user *, long);

extern long strncpy_from_user(char *, const char __user *, long);

extern unsigned lclear_user(void __user *,unsigned long);

extern long lstrnlen_user(const char __user *,long);



/*

 * Complex access routines -- macros

 */

#define user_addr_max() (~0UL)



#define strncpy_from_user lstrncpy_from_user

#define strnlen_user lstrnlen_user

#define strlen_user(str) lstrnlen_user(str, 0x7fffffffL)

#define clear_user lclear_user

arch/parisc/kernel/entry.S

+17 −13
Original line number Diff line number Diff line
@@ -552,7 +552,7 @@ 
	 * entry (identifying the physical page) and %r23 up with

	 * the from tlb entry (or nothing if only a to entry---for

	 * clear_user_page_asm) */

	.macro		do_alias	spc,tmp,tmp1,va,pte,prot,fault

	.macro		do_alias	spc,tmp,tmp1,va,pte,prot,fault,patype

	cmpib,COND(<>),n 0,\spc,\fault

	ldil		L%(TMPALIAS_MAP_START),\tmp

#if defined(CONFIG_64BIT) && (TMPALIAS_MAP_START >= 0x80000000)
@@ -581,11 +581,15 @@ 
	 */

	cmpiclr,=	0x01,\tmp,%r0

	ldi		(_PAGE_DIRTY|_PAGE_READ|_PAGE_WRITE),\prot

#ifdef CONFIG_64BIT

.ifc \patype,20

	depd,z		\prot,8,7,\prot

#else

.else

.ifc \patype,11

	depw,z		\prot,8,7,\prot

#endif

.else

	.error "undefined PA type to do_alias"

.endif

.endif

	/*

	 * OK, it is in the temp alias region, check whether "from" or "to".

	 * Check "subtle" note in pacache.S re: r23/r26.
@@ -1189,7 +1193,7 @@ dtlb_miss_20w: 
	nop



dtlb_check_alias_20w:

	do_alias	spc,t0,t1,va,pte,prot,dtlb_fault

	do_alias	spc,t0,t1,va,pte,prot,dtlb_fault,20



	idtlbt          pte,prot
@@ -1213,7 +1217,7 @@ nadtlb_miss_20w: 
	nop



nadtlb_check_alias_20w:

	do_alias	spc,t0,t1,va,pte,prot,nadtlb_emulate

	do_alias	spc,t0,t1,va,pte,prot,nadtlb_emulate,20



	idtlbt          pte,prot
@@ -1245,7 +1249,7 @@ dtlb_miss_11: 
	nop



dtlb_check_alias_11:

	do_alias	spc,t0,t1,va,pte,prot,dtlb_fault

	do_alias	spc,t0,t1,va,pte,prot,dtlb_fault,11



	idtlba          pte,(va)

	idtlbp          prot,(va)
@@ -1277,7 +1281,7 @@ nadtlb_miss_11: 
	nop



nadtlb_check_alias_11:

	do_alias	spc,t0,t1,va,pte,prot,nadtlb_emulate

	do_alias	spc,t0,t1,va,pte,prot,nadtlb_emulate,11



	idtlba          pte,(va)

	idtlbp          prot,(va)
@@ -1304,7 +1308,7 @@ dtlb_miss_20: 
	nop



dtlb_check_alias_20:

	do_alias	spc,t0,t1,va,pte,prot,dtlb_fault

	do_alias	spc,t0,t1,va,pte,prot,dtlb_fault,20

	

	idtlbt          pte,prot
@@ -1330,7 +1334,7 @@ nadtlb_miss_20: 
	nop



nadtlb_check_alias_20:

	do_alias	spc,t0,t1,va,pte,prot,nadtlb_emulate

	do_alias	spc,t0,t1,va,pte,prot,nadtlb_emulate,20



	idtlbt          pte,prot
@@ -1457,7 +1461,7 @@ naitlb_miss_20w: 
	nop



naitlb_check_alias_20w:

	do_alias	spc,t0,t1,va,pte,prot,naitlb_fault

	do_alias	spc,t0,t1,va,pte,prot,naitlb_fault,20



	iitlbt		pte,prot
@@ -1511,7 +1515,7 @@ naitlb_miss_11: 
	nop



naitlb_check_alias_11:

	do_alias	spc,t0,t1,va,pte,prot,itlb_fault

	do_alias	spc,t0,t1,va,pte,prot,itlb_fault,11



	iitlba          pte,(%sr0, va)

	iitlbp          prot,(%sr0, va)
@@ -1557,7 +1561,7 @@ naitlb_miss_20: 
	nop



naitlb_check_alias_20:

	do_alias	spc,t0,t1,va,pte,prot,naitlb_fault

	do_alias	spc,t0,t1,va,pte,prot,naitlb_fault,20



	iitlbt          pte,prot

arch/parisc/kernel/parisc_ksyms.c

+0 −1
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ EXPORT_SYMBOL(__cmpxchg_u64); 
#endif



#include <asm/uaccess.h>

EXPORT_SYMBOL(lstrncpy_from_user);

EXPORT_SYMBOL(lclear_user);

EXPORT_SYMBOL(lstrnlen_user);