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

Commit 190045d5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus 

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] VSMP: Fix initialization ordering bug.
  [MIPS] Add whitelists for checksyscalls.sh
  [MIPS] die(): Properly declare as non-returning
  [MIPS] Fix include wrapper symbol definitions in IP32 code.
parents e2baf4ed 8c976e34

arch/mips/kernel/smp-mt.c

+2 −2
Original line number Diff line number Diff line
@@ -236,8 +236,6 @@ void __init plat_smp_setup(void) 
	dvpe();

	dmt();



	mips_mt_set_cpuoptions();



	/* Put MVPE's into 'configuration state' */

	set_c0_mvpcontrol(MVPCONTROL_VPC);
@@ -263,6 +261,8 @@ void __init plat_smp_setup(void) 


void __init plat_prepare_cpus(unsigned int max_cpus)

{

	mips_mt_set_cpuoptions();



	/* set up ipi interrupts */

	if (cpu_has_vint) {

		set_vi_handler(MIPS_CPU_IPI_RESCHED_IRQ, ipi_resched_dispatch);

include/asm-mips/mach-ip32/dma-coherence.h

+3 −3
Original line number Diff line number Diff line
@@ -6,8 +6,8 @@ 
 * Copyright (C) 2006  Ralf Baechle <ralf@linux-mips.org>

 *

 */

#ifndef __ASM_MACH_IP35_DMA_COHERENCE_H

#define __ASM_MACH_IP35_DMA_COHERENCE_H

#ifndef __ASM_MACH_IP32_DMA_COHERENCE_H

#define __ASM_MACH_IP32_DMA_COHERENCE_H



#include <asm/ip32/crime.h>
@@ -69,4 +69,4 @@ static inline int plat_device_is_coherent(struct device *dev) 
	return 0;		/* IP32 is non-cohernet */

}



#endif /* __ASM_MACH_IP35_DMA_COHERENCE_H */
 
#endif /* __ASM_MACH_IP32_DMA_COHERENCE_H */

include/asm-mips/ptrace.h

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ struct pt_regs { 


extern asmlinkage void do_syscall_trace(struct pt_regs *regs, int entryexit);



extern NORET_TYPE void die(const char *, struct pt_regs *);

extern NORET_TYPE void die(const char *, struct pt_regs *) ATTRIB_NORET;



static inline void die_if_kernel(const char *str, struct pt_regs *regs)

{

include/asm-mips/unistd.h

+16 −0
Original line number Diff line number Diff line
@@ -977,6 +977,22 @@ 
#  define __ARCH_WANT_COMPAT_SYS_TIME

# endif



/* whitelists for checksyscalls */

#define __IGNORE_select

#define __IGNORE_vfork

#define __IGNORE_time

#define __IGNORE_uselib

#define __IGNORE_fadvise64_64

#define __IGNORE_getdents64

#if _MIPS_SIM == _MIPS_SIM_NABI32

#define __IGNORE_truncate64

#define __IGNORE_ftruncate64

#define __IGNORE_stat64

#define __IGNORE_lstat64

#define __IGNORE_fstat64

#define __IGNORE_fstatat64

#endif



#endif /* !__ASSEMBLY__ */



/*