Commit 7187adbf 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:
  Revert "MIPS: Print irq handler description"
  MIPS: CVE-2009-0029: Enable syscall wrappers.
  MIPS: Alchemy: In plat_time_init() t reaches -1, tested: 0
  MIPS: Only allow Cavium OCTEON to be configured for boards that support it
parents 535d8e8f 5312dc6b

arch/mips/Kconfig

+7 −2
Original line number Diff line number Diff line
@@ -603,7 +603,7 @@ config CAVIUM_OCTEON_SIMULATOR 
	select SYS_SUPPORTS_64BIT_KERNEL

	select SYS_SUPPORTS_BIG_ENDIAN

	select SYS_SUPPORTS_HIGHMEM

	select CPU_CAVIUM_OCTEON

	select SYS_HAS_CPU_CAVIUM_OCTEON

	help

	  The Octeon simulator is software performance model of the Cavium

	  Octeon Processor. It supports simulating Octeon processors on x86
@@ -618,7 +618,7 @@ config CAVIUM_OCTEON_REFERENCE_BOARD 
	select SYS_SUPPORTS_BIG_ENDIAN

	select SYS_SUPPORTS_HIGHMEM

	select SYS_HAS_EARLY_PRINTK

	select CPU_CAVIUM_OCTEON

	select SYS_HAS_CPU_CAVIUM_OCTEON

	select SWAP_IO_SPACE

	help

	  This option supports all of the Octeon reference boards from Cavium
@@ -1234,6 +1234,7 @@ config CPU_SB1 


config CPU_CAVIUM_OCTEON

	bool "Cavium Octeon processor"

	depends on SYS_HAS_CPU_CAVIUM_OCTEON

	select IRQ_CPU

	select IRQ_CPU_OCTEON

	select CPU_HAS_PREFETCH
@@ -1314,6 +1315,9 @@ config SYS_HAS_CPU_RM9000 
config SYS_HAS_CPU_SB1

	bool



config SYS_HAS_CPU_CAVIUM_OCTEON

	bool



#

# CPU may reorder R->R, R->W, W->R, W->W

# Reordering beyond LL and SC is handled in WEAK_REORDERING_BEYOND_LLSC
@@ -1387,6 +1391,7 @@ config 32BIT 
config 64BIT

	bool "64-bit kernel"

	depends on CPU_SUPPORTS_64BIT_KERNEL && SYS_SUPPORTS_64BIT_KERNEL

	select HAVE_SYSCALL_WRAPPERS

	help

	  Select this option if you want to build a 64-bit kernel.

arch/mips/alchemy/common/time.c

+3 −3
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ void __init plat_time_init(void) 
	 * setup counter 1 (RTC) to tick at full speed

	 */

	t = 0xffffff;

	while ((au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_T1S) && t--)

	while ((au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_T1S) && --t)

		asm volatile ("nop");

	if (!t)

		goto cntr_err;
@@ -127,7 +127,7 @@ void __init plat_time_init(void) 
	au_sync();



	t = 0xffffff;

	while ((au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_C1S) && t--)

	while ((au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_C1S) && --t)

		asm volatile ("nop");

	if (!t)

		goto cntr_err;
@@ -135,7 +135,7 @@ void __init plat_time_init(void) 
	au_sync();



	t = 0xffffff;

	while ((au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_C1S) && t--)

	while ((au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_C1S) && --t)

		asm volatile ("nop");

	if (!t)

		goto cntr_err;

arch/mips/kernel/irq.c

+0 −1
Original line number Diff line number Diff line
@@ -111,7 +111,6 @@ int show_interrupts(struct seq_file *p, void *v) 
			seq_printf(p, "%10u ", kstat_cpu(j).irqs[i]);

#endif

		seq_printf(p, " %14s", irq_desc[i].chip->name);

		seq_printf(p, "-%-8s", irq_desc[i].name);

		seq_printf(p, "  %s", action->name);



		for (action=action->next; action; action = action->next)

arch/mips/kernel/linux32.c

+39 −30
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include <linux/module.h>

#include <linux/binfmts.h>

#include <linux/security.h>

#include <linux/syscalls.h>

#include <linux/compat.h>

#include <linux/vfs.h>

#include <linux/ipc.h>
@@ -63,9 +64,9 @@ 
#define merge_64(r1, r2) ((((r2) & 0xffffffffUL) << 32) + ((r1) & 0xffffffffUL))

#endif



asmlinkage unsigned long

sys32_mmap2(unsigned long addr, unsigned long len, unsigned long prot,

         unsigned long flags, unsigned long fd, unsigned long pgoff)

SYSCALL_DEFINE6(32_mmap2, unsigned long, addr, unsigned long, len,

	unsigned long, prot, unsigned long, flags, unsigned long, fd,

	unsigned long, pgoff)

{

	struct file * file = NULL;

	unsigned long error;
@@ -121,21 +122,21 @@ struct rlimit32 { 
	int	rlim_max;

};



asmlinkage long sys32_truncate64(const char __user * path,

	unsigned long __dummy, int a2, int a3)

SYSCALL_DEFINE4(32_truncate64, const char __user *, path,

	unsigned long, __dummy, unsigned long, a2, unsigned long, a3)

{

	return sys_truncate(path, merge_64(a2, a3));

}



asmlinkage long sys32_ftruncate64(unsigned int fd, unsigned long __dummy,

	int a2, int a3)

SYSCALL_DEFINE4(32_ftruncate64, unsigned long, fd, unsigned long, __dummy,

	unsigned long, a2, unsigned long, a3)

{

	return sys_ftruncate(fd, merge_64(a2, a3));

}



asmlinkage int sys32_llseek(unsigned int fd, unsigned int offset_high,

			    unsigned int offset_low, loff_t __user * result,

			    unsigned int origin)

SYSCALL_DEFINE5(32_llseek, unsigned long, fd, unsigned long, offset_high,

	unsigned long, offset_low, loff_t __user *, result,

	unsigned long, origin)

{

	return sys_llseek(fd, offset_high, offset_low, result, origin);

}
@@ -144,20 +145,20 @@ asmlinkage int sys32_llseek(unsigned int fd, unsigned int offset_high, 
   lseek back to original location.  They fail just like lseek does on

   non-seekable files.  */



asmlinkage ssize_t sys32_pread(unsigned int fd, char __user * buf,

			       size_t count, u32 unused, u64 a4, u64 a5)

SYSCALL_DEFINE6(32_pread, unsigned long, fd, char __user *, buf, size_t, count,

	unsigned long, unused, unsigned long, a4, unsigned long, a5)

{

	return sys_pread64(fd, buf, count, merge_64(a4, a5));

}



asmlinkage ssize_t sys32_pwrite(unsigned int fd, const char __user * buf,

			        size_t count, u32 unused, u64 a4, u64 a5)

SYSCALL_DEFINE6(32_pwrite, unsigned int, fd, const char __user *, buf,

	size_t, count, u32, unused, u64, a4, u64, a5)

{

	return sys_pwrite64(fd, buf, count, merge_64(a4, a5));

}



asmlinkage int sys32_sched_rr_get_interval(compat_pid_t pid,

	struct compat_timespec __user *interval)

SYSCALL_DEFINE2(32_sched_rr_get_interval, compat_pid_t, pid,

	struct compat_timespec __user *, interval)

{

	struct timespec t;

	int ret;
@@ -174,8 +175,8 @@ asmlinkage int sys32_sched_rr_get_interval(compat_pid_t pid, 


#ifdef CONFIG_SYSVIPC



asmlinkage long

sys32_ipc(u32 call, int first, int second, int third, u32 ptr, u32 fifth)

SYSCALL_DEFINE6(32_ipc, u32, call, long, first, long, second, long, third,

	unsigned long, ptr, unsigned long, fifth)

{

	int version, err;
@@ -233,8 +234,8 @@ sys32_ipc(u32 call, int first, int second, int third, u32 ptr, u32 fifth) 


#else



asmlinkage long

sys32_ipc(u32 call, int first, int second, int third, u32 ptr, u32 fifth)

SYSCALL_DEFINE6(32_ipc, u32, call, int, first, int, second, int, third,

	u32, ptr, u32 fifth)

{

	return -ENOSYS;

}
@@ -242,7 +243,7 @@ sys32_ipc(u32 call, int first, int second, int third, u32 ptr, u32 fifth) 
#endif /* CONFIG_SYSVIPC */



#ifdef CONFIG_MIPS32_N32

asmlinkage long sysn32_semctl(int semid, int semnum, int cmd, u32 arg)

SYSCALL_DEFINE4(n32_semctl, int, semid, int, semnum, int, cmd, u32, arg)

{

	/* compat_sys_semctl expects a pointer to union semun */

	u32 __user *uptr = compat_alloc_user_space(sizeof(u32));
@@ -251,13 +252,14 @@ asmlinkage long sysn32_semctl(int semid, int semnum, int cmd, u32 arg) 
	return compat_sys_semctl(semid, semnum, cmd, uptr);

}



asmlinkage long sysn32_msgsnd(int msqid, u32 msgp, unsigned msgsz, int msgflg)

SYSCALL_DEFINE4(n32_msgsnd, int, msqid, u32, msgp, unsigned int, msgsz,

	int, msgflg)

{

	return compat_sys_msgsnd(msqid, msgsz, msgflg, compat_ptr(msgp));

}



asmlinkage long sysn32_msgrcv(int msqid, u32 msgp, size_t msgsz, int msgtyp,

			      int msgflg)

SYSCALL_DEFINE5(n32_msgrcv, int, msqid, u32, msgp, size_t, msgsz,

	int, msgtyp, int, msgflg)

{

	return compat_sys_msgrcv(msqid, msgsz, msgtyp, msgflg, IPC_64,

				 compat_ptr(msgp));
@@ -277,7 +279,7 @@ struct sysctl_args32 


#ifdef CONFIG_SYSCTL_SYSCALL



asmlinkage long sys32_sysctl(struct sysctl_args32 __user *args)

SYSCALL_DEFINE1(32_sysctl, struct sysctl_args32 __user *, args)

{

	struct sysctl_args32 tmp;

	int error;
@@ -316,9 +318,16 @@ asmlinkage long sys32_sysctl(struct sysctl_args32 __user *args) 
	return error;

}



#else



SYSCALL_DEFINE1(32_sysctl, struct sysctl_args32 __user *, args)

{

	return -ENOSYS;

}



#endif /* CONFIG_SYSCTL_SYSCALL */



asmlinkage long sys32_newuname(struct new_utsname __user * name)

SYSCALL_DEFINE1(32_newuname, struct new_utsname __user *, name)

{

	int ret = 0;
@@ -334,7 +343,7 @@ asmlinkage long sys32_newuname(struct new_utsname __user * name) 
	return ret;

}



asmlinkage int sys32_personality(unsigned long personality)

SYSCALL_DEFINE1(32_personality, unsigned long, personality)

{

	int ret;

	personality &= 0xffffffff;
@@ -357,7 +366,7 @@ struct ustat32 { 


extern asmlinkage long sys_ustat(dev_t dev, struct ustat __user * ubuf);



asmlinkage int sys32_ustat(dev_t dev, struct ustat32 __user * ubuf32)

SYSCALL_DEFINE2(32_ustat, dev_t, dev, struct ustat32 __user *, ubuf32)

{

	int err;

	struct ustat tmp;
@@ -381,8 +390,8 @@ out: 
	return err;

}



asmlinkage int sys32_sendfile(int out_fd, int in_fd, compat_off_t __user *offset,

	s32 count)

SYSCALL_DEFINE4(32_sendfile, long, out_fd, long, in_fd,

	compat_off_t __user *, offset, s32, count)

{

	mm_segment_t old_fs = get_fs();

	int ret;

arch/mips/kernel/scall32-o32.S

+2 −2
Original line number Diff line number Diff line
@@ -399,7 +399,7 @@ einval: li v0, -ENOSYS 
	sys	sys_swapon		2

	sys	sys_reboot		3

	sys	sys_old_readdir		3

	sys	old_mmap		6	/* 4090 */

	sys	sys_mips_mmap		6	/* 4090 */

	sys	sys_munmap		2

	sys	sys_truncate		2

	sys	sys_ftruncate		2
@@ -519,7 +519,7 @@ einval: li v0, -ENOSYS 
	sys	sys_sendfile		4

	sys	sys_ni_syscall		0

	sys	sys_ni_syscall		0

	sys	sys_mmap2		6	/* 4210 */

	sys	sys_mips_mmap2		6	/* 4210 */

	sys	sys_truncate64		4

	sys	sys_ftruncate64		4

	sys	sys_stat64		2

CRA Git | Maintained and supported by SUSTech CRA and CCSE