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

Commit 23344cb3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC]: Wire up sys_sync_file_range() into syscall tables.
  [SPARC]: Wire up sys_splice() into the syscall tables.
  [SPARC64]: Update defconfig.
  [SPARC64]: Align address in huge_pte_alloc().
  [SPARC64]: Document the instruction checks we do in do_sparc64_fault().
  [SPARC64]: Make tsb_sync() mm comparison more precise.
parents bacd3add 289eee6f

arch/sparc/kernel/systbls.S

+2 −2
Original line number Diff line number Diff line
@@ -64,13 +64,13 @@ sys_call_table: 
/*215*/	.long sys_ipc, sys_sigreturn, sys_clone, sys_ioprio_get, sys_adjtimex

/*220*/	.long sys_sigprocmask, sys_ni_syscall, sys_delete_module, sys_ni_syscall, sys_getpgid

/*225*/	.long sys_bdflush, sys_sysfs, sys_nis_syscall, sys_setfsuid16, sys_setfsgid16

/*230*/	.long sys_select, sys_time, sys_nis_syscall, sys_stime, sys_statfs64

/*230*/	.long sys_select, sys_time, sys_splice, sys_stime, sys_statfs64

					  /* "We are the Knights of the Forest of Ni!!" */

/*235*/	.long sys_fstatfs64, sys_llseek, sys_mlock, sys_munlock, sys_mlockall

/*240*/	.long sys_munlockall, sys_sched_setparam, sys_sched_getparam, sys_sched_setscheduler, sys_sched_getscheduler

/*245*/	.long sys_sched_yield, sys_sched_get_priority_max, sys_sched_get_priority_min, sys_sched_rr_get_interval, sys_nanosleep

/*250*/	.long sparc_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_nfsservctl

/*255*/	.long sys_nis_syscall, sys_clock_settime, sys_clock_gettime, sys_clock_getres, sys_clock_nanosleep

/*255*/	.long sys_sync_file_range, sys_clock_settime, sys_clock_gettime, sys_clock_getres, sys_clock_nanosleep

/*260*/	.long sys_sched_getaffinity, sys_sched_setaffinity, sys_timer_settime, sys_timer_gettime, sys_timer_getoverrun

/*265*/	.long sys_timer_delete, sys_timer_create, sys_nis_syscall, sys_io_setup, sys_io_destroy

/*270*/	.long sys_io_submit, sys_io_cancel, sys_io_getevents, sys_mq_open, sys_mq_unlink

arch/sparc64/defconfig

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

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.16

# Sun Mar 26 14:58:11 2006

# Fri Mar 31 01:40:57 2006

#

CONFIG_SPARC=y

CONFIG_SPARC64=y
@@ -180,6 +180,7 @@ CONFIG_SYN_COOKIES=y 
CONFIG_INET_AH=y

CONFIG_INET_ESP=y

CONFIG_INET_IPCOMP=y

CONFIG_INET_XFRM_TUNNEL=y

CONFIG_INET_TUNNEL=y

CONFIG_INET_DIAG=y

CONFIG_INET_TCP_DIAG=y
@@ -203,6 +204,7 @@ CONFIG_IPV6_ROUTE_INFO=y 
CONFIG_INET6_AH=m

CONFIG_INET6_ESP=m

CONFIG_INET6_IPCOMP=m

CONFIG_INET6_XFRM_TUNNEL=m

CONFIG_INET6_TUNNEL=m

CONFIG_IPV6_TUNNEL=m

# CONFIG_NETFILTER is not set
@@ -308,7 +310,6 @@ CONFIG_BLK_DEV_NBD=m 
# CONFIG_BLK_DEV_SX8 is not set

CONFIG_BLK_DEV_UB=m

# CONFIG_BLK_DEV_RAM is not set

CONFIG_BLK_DEV_RAM_COUNT=16

# CONFIG_BLK_DEV_INITRD is not set

CONFIG_CDROM_PKTCDVD=m

CONFIG_CDROM_PKTCDVD_BUFFERS=8
@@ -449,6 +450,7 @@ CONFIG_MD_RAID0=m 
CONFIG_MD_RAID1=m

CONFIG_MD_RAID10=m

CONFIG_MD_RAID5=m

# CONFIG_MD_RAID5_RESHAPE is not set

CONFIG_MD_RAID6=m

CONFIG_MD_MULTIPATH=m

# CONFIG_MD_FAULTY is not set
@@ -741,9 +743,7 @@ CONFIG_I2C_ALGOBIT=y 
# CONFIG_SENSORS_PCF8574 is not set

# CONFIG_SENSORS_PCA9539 is not set

# CONFIG_SENSORS_PCF8591 is not set

# CONFIG_SENSORS_RTC8564 is not set

# CONFIG_SENSORS_MAX6875 is not set

# CONFIG_RTC_X1205_I2C is not set

# CONFIG_I2C_DEBUG_CORE is not set

# CONFIG_I2C_DEBUG_ALGO is not set

# CONFIG_I2C_DEBUG_BUS is not set
@@ -826,6 +826,7 @@ CONFIG_FB_CFB_FILLRECT=y 
CONFIG_FB_CFB_COPYAREA=y

CONFIG_FB_CFB_IMAGEBLIT=y

# CONFIG_FB_MACMODES is not set

# CONFIG_FB_FIRMWARE_EDID is not set

CONFIG_FB_MODE_HELPERS=y

CONFIG_FB_TILEBLITTING=y

# CONFIG_FB_CIRRUS is not set
@@ -1116,6 +1117,11 @@ CONFIG_USB_HIDDEV=y 
# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)

#



#

# Real Time Clock

#

# CONFIG_RTC_CLASS is not set



#

# Misc Linux/SPARC drivers

#

arch/sparc64/kernel/smp.c

+8 −1
Original line number Diff line number Diff line
@@ -830,9 +830,16 @@ void smp_call_function_client(int irq, struct pt_regs *regs) 


static void tsb_sync(void *info)

{

	struct trap_per_cpu *tp = &trap_block[raw_smp_processor_id()];

	struct mm_struct *mm = info;



	if (current->active_mm == mm)

	/* It is not valid to test "currrent->active_mm == mm" here.

	 *

	 * The value of "current" is not changed atomically with

	 * switch_mm().  But that's OK, we just need to check the

	 * current cpu's trap block PGD physical address.

	 */

	if (tp->pgd_paddr == __pa(mm->pgd))

		tsb_context_switch(mm);

}

arch/sparc64/kernel/sys32.S

+2 −0
Original line number Diff line number Diff line
@@ -136,6 +136,8 @@ SIGN1(sys32_getpeername, sys_getpeername, %o0) 
SIGN1(sys32_getsockname, sys_getsockname, %o0)

SIGN2(sys32_ioprio_get, sys_ioprio_get, %o0, %o1)

SIGN3(sys32_ioprio_set, sys_ioprio_set, %o0, %o1, %o2)

SIGN2(sys32_splice, sys_splice, %o0, %o1)

SIGN2(sys32_sync_file_range, compat_sync_file_range, %o0, %o5)



	.globl		sys32_mmap2

sys32_mmap2:

arch/sparc64/kernel/sys_sparc32.c

+8 −0
Original line number Diff line number Diff line
@@ -1069,3 +1069,11 @@ long sys32_lookup_dcookie(unsigned long cookie_high, 
	return sys_lookup_dcookie((cookie_high << 32) | cookie_low,

				  buf, len);

}



long compat_sync_file_range(int fd, unsigned long off_high, unsigned long off_low, unsigned long nb_high, unsigned long nb_low, int flags)

{

	return sys_sync_file_range(fd,

				   (off_high << 32) | off_low,

				   (nb_high << 32) | nb_low,

				   flags);

}