Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 (e945e849) · Commits · 戴 / test

arch/sparc/kernel/process.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -357,8 +357,6 @@ void flush_thread(void)
		{
		current_thread_info()->w_saved = 0;

		/* No new signal delivery by default */
		current->thread.new_signal = 0;
		#ifndef CONFIG_SMP
		if(last_task_used_math == current) {
		#else

arch/sparc/kernel/signal.c

+20 −240

Original line number	Diff line number	Diff line
		/* $Id: signal.c,v 1.110 2002/02/08 03:57:14 davem Exp $
		* linux/arch/sparc/kernel/signal.c
		/* linux/arch/sparc/kernel/signal.c
		*
		* Copyright (C) 1991, 1992 Linus Torvalds
		* Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
		@@ -32,37 +31,7 @@ extern void fpsave(unsigned long fpregs, unsigned long fsr,
		void fpqueue, unsigned long fpqdepth);
		extern void fpload(unsigned long fpregs, unsigned long fsr);

		/* Signal frames: the original one (compatible with SunOS):
		*
		* Set up a signal frame... Make the stack look the way SunOS
		* expects it to look which is basically:
		*
		* ---------------------------------- <-- %sp at signal time
		* Struct sigcontext
		* Signal address
		* Ptr to sigcontext area above
		* Signal code
		* The signal number itself
		* One register window
		* ---------------------------------- <-- New %sp
		*/
		struct signal_sframe {
		struct reg_window sig_window;
		int sig_num;
		int sig_code;
		struct sigcontext __user *sig_scptr;
		int sig_address;
		struct sigcontext sig_context;
		unsigned int extramask[_NSIG_WORDS - 1];
		};

		/*
		* And the new one, intended to be used for Linux applications only
		* (we have enough in there to work with clone).
		* All the interesting bits are in the info field.
		*/

		struct new_signal_frame {
		struct signal_frame {
		struct sparc_stackf ss;
		__siginfo_t info;
		__siginfo_fpu_t __user *fpu_save;
		@@ -85,8 +54,7 @@ struct rt_signal_frame {
		};

		/* Align macros */
		#define SF_ALIGNEDSZ (((sizeof(struct signal_sframe) + 7) & (~7)))
		#define NF_ALIGNEDSZ (((sizeof(struct new_signal_frame) + 7) & (~7)))
		#define SF_ALIGNEDSZ (((sizeof(struct signal_frame) + 7) & (~7)))
		#define RT_ALIGNEDSZ (((sizeof(struct rt_signal_frame) + 7) & (~7)))

		static int _sigpause_common(old_sigset_t set)
		@@ -141,15 +109,20 @@ restore_fpu_state(struct pt_regs regs, __siginfo_fpu_t __user fpu)
		return err;
		}

		static inline void do_new_sigreturn (struct pt_regs *regs)
		asmlinkage void do_sigreturn(struct pt_regs *regs)
		{
		struct new_signal_frame __user *sf;
		struct signal_frame __user *sf;
		unsigned long up_psr, pc, npc;
		sigset_t set;
		__siginfo_fpu_t __user *fpu_save;
		int err;

		sf = (struct new_signal_frame __user *) regs->u_regs[UREG_FP];
		/* Always make any pending restarted system calls return -EINTR */
		current_thread_info()->restart_block.fn = do_no_restart_syscall;

		synchronize_user_stack();

		sf = (struct signal_frame __user *) regs->u_regs[UREG_FP];

		/* 1. Make sure we are not getting garbage from the user */
		if (!access_ok(VERIFY_READ, sf, sizeof(*sf)))
		@@ -198,73 +171,6 @@ segv_and_exit:
		force_sig(SIGSEGV, current);
		}

		asmlinkage void do_sigreturn(struct pt_regs *regs)
		{
		struct sigcontext __user *scptr;
		unsigned long pc, npc, psr;
		sigset_t set;
		int err;

		/* Always make any pending restarted system calls return -EINTR */
		current_thread_info()->restart_block.fn = do_no_restart_syscall;

		synchronize_user_stack();

		if (current->thread.new_signal) {
		do_new_sigreturn(regs);
		return;
		}

		scptr = (struct sigcontext __user *) regs->u_regs[UREG_I0];

		/* Check sanity of the user arg. */
		if (!access_ok(VERIFY_READ, scptr, sizeof(struct sigcontext)) \|\|
		(((unsigned long) scptr) & 3))
		goto segv_and_exit;

		err = __get_user(pc, &scptr->sigc_pc);
		err \|= __get_user(npc, &scptr->sigc_npc);

		if ((pc \| npc) & 3)
		goto segv_and_exit;

		/* This is pretty much atomic, no amount locking would prevent
		* the races which exist anyways.
		*/
		err \|= __get_user(set.sig[0], &scptr->sigc_mask);
		/* Note that scptr + 1 points to extramask */
		err \|= __copy_from_user(&set.sig[1], scptr + 1,
		(_NSIG_WORDS - 1) * sizeof(unsigned int));

		if (err)
		goto segv_and_exit;

		sigdelsetmask(&set, ~_BLOCKABLE);
		spin_lock_irq(&current->sighand->siglock);
		current->blocked = set;
		recalc_sigpending();
		spin_unlock_irq(&current->sighand->siglock);

		regs->pc = pc;
		regs->npc = npc;

		err = __get_user(regs->u_regs[UREG_FP], &scptr->sigc_sp);
		err \|= __get_user(regs->u_regs[UREG_I0], &scptr->sigc_o0);
		err \|= __get_user(regs->u_regs[UREG_G1], &scptr->sigc_g1);

		/* User can only change condition codes in %psr. */
		err \|= __get_user(psr, &scptr->sigc_psr);
		if (err)
		goto segv_and_exit;

		regs->psr &= ~(PSR_ICC);
		regs->psr \|= (psr & PSR_ICC);
		return;

		segv_and_exit:
		force_sig(SIGSEGV, current);
		}

		asmlinkage void do_rt_sigreturn(struct pt_regs *regs)
		{
		struct rt_signal_frame __user *sf;
		@@ -351,128 +257,6 @@ static inline void __user get_sigframe(struct sigaction sa, struct pt_regs *re
		return (void __user *)(sp - framesize);
		}

		static inline void
		setup_frame(struct sigaction sa, struct pt_regs regs, int signr, sigset_t oldset, siginfo_t info)
		{
		struct signal_sframe __user *sframep;
		struct sigcontext __user *sc;
		int window = 0, err;
		unsigned long pc = regs->pc;
		unsigned long npc = regs->npc;
		struct thread_info *tp = current_thread_info();
		void __user *sig_address;
		int sig_code;

		synchronize_user_stack();
		sframep = (struct signal_sframe __user *)
		get_sigframe(sa, regs, SF_ALIGNEDSZ);
		if (invalid_frame_pointer(sframep, sizeof(*sframep))){
		/* Don't change signal code and address, so that
		* post mortem debuggers can have a look.
		*/
		goto sigill_and_return;
		}

		sc = &sframep->sig_context;

		/* We've already made sure frame pointer isn't in kernel space... */
		err = __put_user((sas_ss_flags(regs->u_regs[UREG_FP]) == SS_ONSTACK),
		&sc->sigc_onstack);
		err \|= __put_user(oldset->sig[0], &sc->sigc_mask);
		err \|= __copy_to_user(sframep->extramask, &oldset->sig[1],
		(_NSIG_WORDS - 1) * sizeof(unsigned int));
		err \|= __put_user(regs->u_regs[UREG_FP], &sc->sigc_sp);
		err \|= __put_user(pc, &sc->sigc_pc);
		err \|= __put_user(npc, &sc->sigc_npc);
		err \|= __put_user(regs->psr, &sc->sigc_psr);
		err \|= __put_user(regs->u_regs[UREG_G1], &sc->sigc_g1);
		err \|= __put_user(regs->u_regs[UREG_I0], &sc->sigc_o0);
		err \|= __put_user(tp->w_saved, &sc->sigc_oswins);
		if (tp->w_saved)
		for (window = 0; window < tp->w_saved; window++) {
		put_user((char *)tp->rwbuf_stkptrs[window],
		&sc->sigc_spbuf[window]);
		err \|= __copy_to_user(&sc->sigc_wbuf[window],
		&tp->reg_window[window],
		sizeof(struct reg_window));
		}
		else
		err \|= __copy_to_user(sframep, (char *) regs->u_regs[UREG_FP],
		sizeof(struct reg_window));

		tp->w_saved = 0; /* So process is allowed to execute. */

		err \|= __put_user(signr, &sframep->sig_num);
		sig_address = NULL;
		sig_code = 0;
		if (SI_FROMKERNEL (info) && (info->si_code & __SI_MASK) == __SI_FAULT) {
		sig_address = info->si_addr;
		switch (signr) {
		case SIGSEGV:
		switch (info->si_code) {
		case SEGV_MAPERR: sig_code = SUBSIG_NOMAPPING; break;
		default: sig_code = SUBSIG_PROTECTION; break;
		}
		break;
		case SIGILL:
		switch (info->si_code) {
		case ILL_ILLOPC: sig_code = SUBSIG_ILLINST; break;
		case ILL_PRVOPC: sig_code = SUBSIG_PRIVINST; break;
		case ILL_ILLTRP: sig_code = SUBSIG_BADTRAP(info->si_trapno); break;
		default: sig_code = SUBSIG_STACK; break;
		}
		break;
		case SIGFPE:
		switch (info->si_code) {
		case FPE_INTDIV: sig_code = SUBSIG_IDIVZERO; break;
		case FPE_INTOVF: sig_code = SUBSIG_FPINTOVFL; break;
		case FPE_FLTDIV: sig_code = SUBSIG_FPDIVZERO; break;
		case FPE_FLTOVF: sig_code = SUBSIG_FPOVFLOW; break;
		case FPE_FLTUND: sig_code = SUBSIG_FPUNFLOW; break;
		case FPE_FLTRES: sig_code = SUBSIG_FPINEXACT; break;
		case FPE_FLTINV: sig_code = SUBSIG_FPOPERROR; break;
		default: sig_code = SUBSIG_FPERROR; break;
		}
		break;
		case SIGBUS:
		switch (info->si_code) {
		case BUS_ADRALN: sig_code = SUBSIG_ALIGNMENT; break;
		case BUS_ADRERR: sig_code = SUBSIG_MISCERROR; break;
		default: sig_code = SUBSIG_BUSTIMEOUT; break;
		}
		break;
		case SIGEMT:
		switch (info->si_code) {
		case EMT_TAGOVF: sig_code = SUBSIG_TAG; break;
		}
		break;
		case SIGSYS:
		if (info->si_code == (__SI_FAULT\|0x100)) {
		sig_code = info->si_trapno;
		break;
		}
		default:
		sig_address = NULL;
		}
		}
		err \|= __put_user((unsigned long)sig_address, &sframep->sig_address);
		err \|= __put_user(sig_code, &sframep->sig_code);
		err \|= __put_user(sc, &sframep->sig_scptr);
		if (err)
		goto sigsegv;

		regs->u_regs[UREG_FP] = (unsigned long) sframep;
		regs->pc = (unsigned long) sa->sa_handler;
		regs->npc = (regs->pc + 4);
		return;

		sigill_and_return:
		do_exit(SIGILL);
		sigsegv:
		force_sigsegv(signr, current);
		}


		static inline int
		save_fpu_state(struct pt_regs regs, __siginfo_fpu_t __user fpu)
		{
		@@ -508,21 +292,20 @@ save_fpu_state(struct pt_regs regs, __siginfo_fpu_t __user fpu)
		return err;
		}

		static inline void
		new_setup_frame(struct k_sigaction ka, struct pt_regs regs,
		static void setup_frame(struct k_sigaction ka, struct pt_regs regs,
		int signo, sigset_t *oldset)
		{
		struct new_signal_frame __user *sf;
		struct signal_frame __user *sf;
		int sigframe_size, err;

		/* 1. Make sure everything is clean */
		synchronize_user_stack();

		sigframe_size = NF_ALIGNEDSZ;
		sigframe_size = SF_ALIGNEDSZ;
		if (!used_math())
		sigframe_size -= sizeof(__siginfo_fpu_t);

		sf = (struct new_signal_frame __user *)
		sf = (struct signal_frame __user *)
		get_sigframe(&ka->sa, regs, sigframe_size);

		if (invalid_frame_pointer(sf, sigframe_size))
		@@ -586,8 +369,7 @@ sigsegv:
		force_sigsegv(signo, current);
		}

		static inline void
		new_setup_rt_frame(struct k_sigaction ka, struct pt_regs regs,
		static void setup_rt_frame(struct k_sigaction ka, struct pt_regs regs,
		int signo, sigset_t oldset, siginfo_t info)
		{
		struct rt_signal_frame __user *sf;
		@@ -674,11 +456,9 @@ handle_signal(unsigned long signr, struct k_sigaction *ka,
		siginfo_t info, sigset_t oldset, struct pt_regs *regs)
		{
		if (ka->sa.sa_flags & SA_SIGINFO)
		new_setup_rt_frame(ka, regs, signr, oldset, info);
		else if (current->thread.new_signal)
		new_setup_frame(ka, regs, signr, oldset);
		setup_rt_frame(ka, regs, signr, oldset, info);
		else
		setup_frame(&ka->sa, regs, signr, oldset, info);
		setup_frame(ka, regs, signr, oldset);

		spin_lock_irq(&current->sighand->siglock);
		sigorsets(&current->blocked,&current->blocked,&ka->sa.sa_mask);

arch/sparc/kernel/sys_sparc.c

+3 −11

Original line number	Diff line number	Diff line
		/* $Id: sys_sparc.c,v 1.70 2001/04/14 01:12:02 davem Exp $
		* linux/arch/sparc/kernel/sys_sparc.c
		/* linux/arch/sparc/kernel/sys_sparc.c
		*
		* This file contains various random system calls that
		* have a non-standard calling sequence on the Linux/sparc
		@@ -395,10 +394,8 @@ sparc_sigaction (int sig, const struct old_sigaction __user *act,
		struct k_sigaction new_ka, old_ka;
		int ret;

		if (sig < 0) {
		current->thread.new_signal = 1;
		WARN_ON_ONCE(sig >= 0);
		sig = -sig;
		}

		if (act) {
		unsigned long mask;
		@@ -446,11 +443,6 @@ sys_rt_sigaction(int sig,
		if (sigsetsize != sizeof(sigset_t))
		return -EINVAL;

		/* All tasks which use RT signals (effectively) use
		* new style signals.
		*/
		current->thread.new_signal = 1;

		if (act) {
		new_ka.ka_restorer = restorer;
		if (copy_from_user(&new_ka.sa, act, sizeof(*act)))

arch/sparc64/Kconfig

+15 −70

Original line number	Diff line number	Diff line
		# $Id: config.in,v 1.158 2002/01/24 22:14:44 davem Exp $
		# For a description of the syntax of this configuration file,
		# see the Configure script.
		#

		mainmenu "Linux/UltraSPARC Kernel Configuration"
		# sparc64 configuration
		mainmenu "Linux Kernel Configuration for 64-bit SPARC"

		config SPARC
		bool
		@@ -17,12 +13,6 @@ config SPARC64
		default y
		select HAVE_IDE
		select HAVE_LMB
		help
		SPARC is a family of RISC microprocessors designed and marketed by
		Sun Microsystems, incorporated. This port covers the newer 64-bit
		UltraSPARC. The UltraLinux project maintains both the SPARC32 and
		SPARC64 ports; its web page is available at
		<http://www.ultralinux.org/>.

		config GENERIC_TIME
		bool
		@@ -97,7 +87,7 @@ config SPARC64_PAGE_SIZE_8KB
		help
		This lets you select the page size of the kernel.

		8KB and 64KB work quite well, since Sparc ELF sections
		8KB and 64KB work quite well, since SPARC ELF sections
		provide for up to 64KB alignment.

		Therefore, 512KB and 4MB are for expert hackers only.
		@@ -138,7 +128,7 @@ config HOTPLUG_CPU
		bool "Support for hot-pluggable CPUs"
		depends on SMP
		select HOTPLUG
		---help---
		help
		Say Y here to experiment with turning CPUs off and on. CPUs
		can be controlled through /sys/devices/system/cpu/cpu#.
		Say N if you want to disable CPU hotplug.
		@@ -155,23 +145,16 @@ source "kernel/time/Kconfig"

		config SMP
		bool "Symmetric multi-processing support"
		---help---
		help
		This enables support for systems with more than one CPU. If you have
		a system with only one CPU, say N. If you have a system with more than
		one CPU, say Y.

		If you say N here, the kernel will run on single and multiprocessor
		machines, but will use only one CPU of a multiprocessor machine. If
		you say Y here, the kernel will run on many, but not all,
		singleprocessor machines. On a singleprocessor machine, the kernel
		will run faster if you say N here.

		People using multiprocessor machines who say Y here should also say
		Y to "Enhanced Real Time Clock Support", below. The "Advanced Power
		Management" code will be disabled if you say Y here.

		See also <file:Documentation/nmi_watchdog.txt> and the SMP-HOWTO
		available at <http://www.tldp.org/docs.html#howto>.
		you say Y here, the kernel will run on single-processor machines.
		On a single-processor machine, the kernel will run faster if you say
		N here.

		If you don't know what to do here, say N.

		@@ -284,50 +267,19 @@ source "mm/Kconfig"

		config ISA
		bool
		help
		Find out whether you have ISA slots on your motherboard. ISA is the
		name of a bus system, i.e. the way the CPU talks to the other stuff
		inside your box. Other bus systems are PCI, EISA, MicroChannel
		(MCA) or VESA. ISA is an older system, now being displaced by PCI;
		newer boards don't support it. If you have ISA, say Y, otherwise N.

		config ISAPNP
		bool
		help
		Say Y here if you would like support for ISA Plug and Play devices.
		Some information is in <file:Documentation/isapnp.txt>.

		To compile this driver as a module, choose M here: the
		module will be called isapnp.

		If unsure, say Y.

		config EISA
		bool
		---help---
		The Extended Industry Standard Architecture (EISA) bus was
		developed as an open alternative to the IBM MicroChannel bus.

		The EISA bus provided some of the features of the IBM MicroChannel
		bus while maintaining backward compatibility with cards made for
		the older ISA bus. The EISA bus saw limited use between 1988 and
		1995 when it was made obsolete by the PCI bus.

		Say Y here if you are building a kernel for an EISA-based machine.

		Otherwise, say N.

		config MCA
		bool
		help
		MicroChannel Architecture is found in some IBM PS/2 machines and
		laptops. It is a bus system similar to PCI or ISA. See
		<file:Documentation/mca.txt> (and especially the web page given
		there) before attempting to build an MCA bus kernel.

		config PCMCIA
		tristate
		---help---
		help
		Say Y here if you want to attach PCMCIA- or PC-cards to your Linux
		computer. These are credit-card size devices such as network cards,
		modems or hard drives often used with laptops computers. There are
		@@ -369,10 +321,10 @@ config PCI
		bool "PCI support"
		select ARCH_SUPPORTS_MSI
		help
		Find out whether you have a PCI motherboard. PCI is the name of a
		bus system, i.e. the way the CPU talks to the other stuff inside
		your box. Other bus systems are ISA, EISA, MicroChannel (MCA) or
		VESA. If you have PCI, say Y, otherwise N.
		Find out whether your system includes a PCI bus. PCI is the name of
		a bus system, i.e. the way the CPU talks to the other stuff inside
		your box. If you say Y here, the kernel will include drivers and
		infrastructure code to support PCI bus devices.

		config PCI_DOMAINS
		def_bool PCI
		@@ -396,15 +348,8 @@ menu "Executable file formats"

		source "fs/Kconfig.binfmt"

		config SPARC32_COMPAT
		bool "Kernel support for Linux/Sparc 32bit binary compatibility"
		help
		This allows you to run 32-bit binaries on your Ultra.
		Everybody wants this; say Y.

		config COMPAT
		bool
		depends on SPARC32_COMPAT
		default y
		select COMPAT_BINFMT_ELF

		@@ -421,8 +366,8 @@ config SCHED_SMT
		default y
		help
		SMT scheduler support improves the CPU scheduler's decision making
		when dealing with UltraSPARC cpus at a cost of slightly increased
		overhead in some places. If unsure say N here.
		when dealing with SPARC cpus at a cost of slightly increased overhead
		in some places. If unsure say N here.

		config SCHED_MC
		bool "Multi-core scheduler support"

arch/sparc64/defconfig

+9 −14

Original line number	Diff line number	Diff line
		#
		# Automatically generated make config: don't edit
		# Linux kernel version: 2.6.25-numa
		# Wed Apr 23 04:49:08 2008
		# Linux kernel version: 2.6.25
		# Sat Apr 26 03:11:06 2008
		#
		CONFIG_SPARC=y
		CONFIG_SPARC64=y
		@@ -152,7 +152,9 @@ CONFIG_GENERIC_CALIBRATE_DELAY=y
		CONFIG_HUGETLB_PAGE_SIZE_4MB=y
		# CONFIG_HUGETLB_PAGE_SIZE_512K is not set
		# CONFIG_HUGETLB_PAGE_SIZE_64K is not set
		# CONFIG_NUMA is not set
		CONFIG_NUMA=y
		CONFIG_NODES_SHIFT=4
		CONFIG_NODES_SPAN_OTHER_NODES=y
		CONFIG_ARCH_POPULATES_NODE_MAP=y
		CONFIG_ARCH_SELECT_MEMORY_MODEL=y
		CONFIG_ARCH_SPARSEMEM_ENABLE=y
		@@ -162,12 +164,14 @@ CONFIG_SELECT_MEMORY_MODEL=y
		# CONFIG_DISCONTIGMEM_MANUAL is not set
		CONFIG_SPARSEMEM_MANUAL=y
		CONFIG_SPARSEMEM=y
		CONFIG_NEED_MULTIPLE_NODES=y
		CONFIG_HAVE_MEMORY_PRESENT=y
		# CONFIG_SPARSEMEM_STATIC is not set
		CONFIG_SPARSEMEM_EXTREME=y
		CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
		CONFIG_SPARSEMEM_VMEMMAP=y
		CONFIG_SPLIT_PTLOCK_CPUS=4
		CONFIG_MIGRATION=y
		CONFIG_RESOURCES_64BIT=y
		CONFIG_ZONE_DMA_FLAG=0
		CONFIG_NR_QUICK=1
		@@ -191,7 +195,6 @@ CONFIG_SUN_OPENPROMFS=m
		CONFIG_BINFMT_ELF=y
		CONFIG_COMPAT_BINFMT_ELF=y
		CONFIG_BINFMT_MISC=m
		CONFIG_SPARC32_COMPAT=y
		CONFIG_COMPAT=y
		CONFIG_SYSVIPC_COMPAT=y
		CONFIG_SCHED_SMT=y
		@@ -746,13 +749,7 @@ CONFIG_DEVPORT=y
		CONFIG_I2C=y
		CONFIG_I2C_BOARDINFO=y
		# CONFIG_I2C_CHARDEV is not set

		#
		# I2C Algorithms
		#
		CONFIG_I2C_ALGOBIT=y
		# CONFIG_I2C_ALGOPCF is not set
		# CONFIG_I2C_ALGOPCA is not set

		#
		# I2C Hardware Bus support
		@@ -780,6 +777,7 @@ CONFIG_I2C_ALGOBIT=y
		# CONFIG_I2C_VIA is not set
		# CONFIG_I2C_VIAPRO is not set
		# CONFIG_I2C_VOODOO3 is not set
		# CONFIG_I2C_PCA_PLATFORM is not set

		#
		# Miscellaneous I2C Chip support
		@@ -1026,6 +1024,7 @@ CONFIG_SND_ALI5451=m
		# CONFIG_SND_AU8810 is not set
		# CONFIG_SND_AU8820 is not set
		# CONFIG_SND_AU8830 is not set
		# CONFIG_SND_AW2 is not set
		# CONFIG_SND_AZT3328 is not set
		# CONFIG_SND_BT87X is not set
		# CONFIG_SND_CA0106 is not set
		@@ -1096,10 +1095,6 @@ CONFIG_SND_SUN_CS4231=m
		#
		# CONFIG_SND_SOC is not set

		#
		# SoC Audio support for SuperH
		#

		#
		# ALSA SoC audio for Freescale SOCs
		#

Admin message