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

Commit 562e74fe authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'cris-for-3.14' of git://jni.nu/cris 

Pull cris changes from Jesper Nilsson:
 "Mostly removal of deprecated or old code, but also a long promised
  update of the CRIS syscalls"

* tag 'cris-for-3.14' of git://jni.nu/cris:
  Drop code for CRISv10 CPU simulator
  Cleanup whitespace, remove old author tag
  CRIS: Add missing syscalls
  cris: sync_serial: remove interruptible_sleep_on
  cris: remove deprecated IRQF_DISABLED
parents 77d143de e269a869

arch/cris/Kconfig

+0 −6
Original line number Diff line number Diff line
@@ -122,12 +122,6 @@ config ETRAX100LX_V2 
	help

	  Support version 2 of the ETRAX 100LX.



config SVINTO_SIM

	bool "ETRAX-100LX-for-xsim-simulator"

	select ARCH_USES_GETTIMEOFFSET

	help

	  Support the xsim ETRAX Simulator.



config ETRAXFS

	bool "ETRAX-FS-V32"

	help

arch/cris/arch-v10/drivers/gpio.c

+2 −2
Original line number Diff line number Diff line
@@ -838,13 +838,13 @@ static int __init gpio_init(void) 
	 * in some tests.

	 */

	res = request_irq(TIMER0_IRQ_NBR, gpio_poll_timer_interrupt,

		IRQF_SHARED | IRQF_DISABLED, "gpio poll", gpio_name);

		IRQF_SHARED, "gpio poll", gpio_name);

	if (res) {

		printk(KERN_CRIT "err: timer0 irq for gpio\n");

		return res;

	}

	res = request_irq(PA_IRQ_NBR, gpio_interrupt,

		IRQF_SHARED | IRQF_DISABLED, "gpio PA", gpio_name);

		IRQF_SHARED, "gpio PA", gpio_name);

	if (res)

		printk(KERN_CRIT "err: PA irq for gpio\n");

arch/cris/arch-v10/drivers/sync_serial.c

+5 −3
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <linux/init.h>

#include <linux/mutex.h>

#include <linux/timer.h>

#include <linux/wait.h>

#include <asm/irq.h>

#include <asm/dma.h>

#include <asm/io.h>
@@ -580,7 +581,7 @@ static int sync_serial_open(struct inode *inode, struct file *file) 
			if (port == &ports[0]) {

				if (request_irq(8,

						manual_interrupt,

						IRQF_SHARED | IRQF_DISABLED,

						IRQF_SHARED,

						"synchronous serial manual irq",

						&ports[0])) {

					printk(KERN_CRIT "Can't alloc "
@@ -590,7 +591,7 @@ static int sync_serial_open(struct inode *inode, struct file *file) 
			} else if (port == &ports[1]) {

				if (request_irq(8,

						manual_interrupt,

						IRQF_SHARED | IRQF_DISABLED,

						IRQF_SHARED,

						"synchronous serial manual irq",

						&ports[1])) {

					printk(KERN_CRIT "Can't alloc "
@@ -1136,7 +1137,8 @@ static ssize_t sync_serial_read(struct file *file, char *buf, 
		if (file->f_flags & O_NONBLOCK)

			return -EAGAIN;



		interruptible_sleep_on(&port->in_wait_q);

		wait_event_interruptible(port->in_wait_q,

					 !(start == end && !port->full));

		if (signal_pending(current))

			return -EINTR;

arch/cris/arch-v10/kernel/Makefile

+0 −1
Original line number Diff line number Diff line 
# $Id: Makefile,v 1.6 2004/12/13 12:21:51 starvik Exp $

#

# Makefile for the linux kernel.

#

arch/cris/arch-v10/kernel/debugport.c

+0 −7
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
#include <linux/delay.h>

#include <linux/tty.h>

#include <arch/svinto.h>

#include <asm/io.h>             /* Get SIMCOUT. */



extern void reset_watchdog(void);
@@ -318,12 +317,6 @@ console_write(struct console *co, const char *buf, unsigned int len) 
	if (!port)

		return;



#ifdef CONFIG_SVINTO_SIM

	/* no use to simulate the serial debug output */

	SIMCOUT(buf, len);

	return;

#endif



        console_write_direct(co, buf, len);

}