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

Commit 808c783e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

parents 52aa536f 8db41685

arch/mips/configs/ip27_defconfig

+9 −4
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.15-rc2

# Thu Nov 24 01:06:21 2005

# Linux kernel version: 2.6.16-rc4

# Tue Feb 21 13:44:31 2006

#

CONFIG_MIPS=y
@@ -144,7 +144,6 @@ CONFIG_PREEMPT_BKL=y 
# Code maturity level options

#

CONFIG_EXPERIMENTAL=y

CONFIG_CLEAN_COMPILE=y

CONFIG_LOCK_KERNEL=y

CONFIG_INIT_ENV_ARG_LIMIT=32
@@ -250,6 +249,7 @@ CONFIG_NET=y 
#

# Networking options

#

# CONFIG_NETDEBUG is not set

CONFIG_PACKET=y

CONFIG_PACKET_MMAP=y

CONFIG_UNIX=y
@@ -289,6 +289,7 @@ CONFIG_TCP_CONG_BIC=y 
# SCTP Configuration (EXPERIMENTAL)

#

# CONFIG_IP_SCTP is not set



# CONFIG_ATM is not set

# CONFIG_BRIDGE is not set

# CONFIG_VLAN_8021Q is not set
@@ -448,7 +449,7 @@ CONFIG_SCSI_SAS_ATTRS=m 
#

# SCSI low-level drivers

#

CONFIG_ISCSI_TCP=m

# CONFIG_ISCSI_TCP is not set

# CONFIG_BLK_DEV_3W_XXXX_RAID is not set

# CONFIG_SCSI_3W_9XXX is not set

# CONFIG_SCSI_ACARD is not set
@@ -773,6 +774,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y 
# SN Devices

#



#

# EDAC - error detection and reporting (RAS)

#



#

# File systems

#

arch/mips/kernel/binfmt_elfn32.c

+3 −2
Original line number Diff line number Diff line
@@ -103,8 +103,9 @@ jiffies_to_compat_timeval(unsigned long jiffies, struct compat_timeval *value) 
	 * one divide.

	 */

	u64 nsec = (u64)jiffies * TICK_NSEC;

	value->tv_sec = div_long_long_rem(nsec, NSEC_PER_SEC, &value->tv_usec);

	value->tv_usec /= NSEC_PER_USEC;

	long rem;

	value->tv_sec = div_long_long_rem(nsec, NSEC_PER_SEC, &rem);

	value->tv_usec = rem / NSEC_PER_USEC;

}



#define ELF_CORE_EFLAGS EF_MIPS_ABI2

arch/mips/kernel/binfmt_elfo32.c

+3 −2
Original line number Diff line number Diff line
@@ -105,8 +105,9 @@ jiffies_to_compat_timeval(unsigned long jiffies, struct compat_timeval *value) 
	 * one divide.

	 */

	u64 nsec = (u64)jiffies * TICK_NSEC;

	value->tv_sec = div_long_long_rem(nsec, NSEC_PER_SEC, &value->tv_usec);

	value->tv_usec /= NSEC_PER_USEC;

	long rem;

	value->tv_sec = div_long_long_rem(nsec, NSEC_PER_SEC, &rem);

	value->tv_usec = rem / NSEC_PER_USEC;

}



#undef ELF_CORE_COPY_REGS

arch/mips/kernel/linux32.c

+3 −19
Original line number Diff line number Diff line
@@ -230,6 +230,9 @@ sysn32_waitid(int which, compat_pid_t pid, 
	long ret;

	mm_segment_t old_fs = get_fs();



	if (!access_ok(VERIFY_WRITE, uinfo, sizeof(*uinfo)))

		return -EFAULT;



	set_fs (KERNEL_DS);

	ret = sys_waitid(which, pid, uinfo, options,

			 uru ? (struct rusage __user *) &ru : NULL);
@@ -1450,25 +1453,6 @@ sys32_timer_create(u32 clock, struct sigevent32 __user *se32, timer_t __user *ti 
	return sys_timer_create(clock, p, timer_id);

}



asmlinkage long

sysn32_rt_sigtimedwait(const sigset_t __user *uthese,

		       siginfo_t __user *uinfo,

		       const struct compat_timespec __user *uts32,

		       size_t sigsetsize)

{

	struct timespec __user *uts = NULL;



	if (uts32) {

		struct timespec ts;

		uts = compat_alloc_user_space(sizeof(struct timespec));

		if (get_user(ts.tv_sec, &uts32->tv_sec) ||

		    get_user(ts.tv_nsec, &uts32->tv_nsec) ||

		    copy_to_user (uts, &ts, sizeof (ts)))

			return -EFAULT;

	}

	return sys_rt_sigtimedwait(uthese, uinfo, uts, sigsetsize);

}



save_static_function(sys32_clone);

__attribute_used__ noinline static int

_sys32_clone(nabi_no_regargs struct pt_regs regs)

arch/mips/kernel/scall64-n32.S

+2 −2
Original line number Diff line number Diff line
@@ -245,9 +245,9 @@ EXPORT(sysn32_call_table) 
	PTR	sys_capget

	PTR	sys_capset

	PTR	sys32_rt_sigpending		/* 6125 */

	PTR	sysn32_rt_sigtimedwait

	PTR	compat_sys_rt_sigtimedwait

	PTR	sys_rt_sigqueueinfo

	PTR	sys32_rt_sigsuspend

	PTR	sysn32_rt_sigsuspend

	PTR	sys32_sigaltstack

	PTR	compat_sys_utime		/* 6130 */

	PTR	sys_mknod