Commit 3b1b7195 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: (30 commits)
  m68k: Fix --build-id breakage for sun3
  m68k: Wire up sys_restart_syscall
  fbdev: Kill Atari vblank cursor blinking
  m68k: zorro - Use %pR to print resources
  m68k: dio - Kill resource_size_t format warnings
  m68k: dmasound - Kill warn_unused_result warnings
  m68k: zorro - Kill warn_unused_result warnings
  m68k: dio - Kill warn_unused_result warnings
  m68k: atafb - Kill warn_unused_result warnings
  m68k: amiserial - Kill warn_unused_result warnings
  m68k: ser_a2232 - Kill warn_unused_result warnings
  m68k: vme_scc - Kill warn_unused_result warnings
  m68k: sun3 core - Kill warn_unused_result warnings
  m68k: mvme147 core - Kill warn_unused_result warnings
  m68k: mac core - Kill warn_unused_result warnings
  m68k: hp300 core - Kill warn_unused_result warnings
  m68k: atari core - Kill warn_unused_result warnings
  m68k: apollo core - Kill warn_unused_result warnings
  m68k: amiga core - Kill warn_unused_result warnings
  m68k: Kill several external declarations in source files
  ...
parents c69e8839 877d5243

arch/m68k/amiga/amiints.c

+8 −4
Original line number Diff line number Diff line
@@ -72,10 +72,14 @@ static struct irq_controller amiga_irq_controller = { 


void __init amiga_init_IRQ(void)

{

	request_irq(IRQ_AUTO_1, ami_int1, 0, "int1", NULL);

	request_irq(IRQ_AUTO_3, ami_int3, 0, "int3", NULL);

	request_irq(IRQ_AUTO_4, ami_int4, 0, "int4", NULL);

	request_irq(IRQ_AUTO_5, ami_int5, 0, "int5", NULL);

	if (request_irq(IRQ_AUTO_1, ami_int1, 0, "int1", NULL))

		pr_err("Couldn't register int%d\n", 1);

	if (request_irq(IRQ_AUTO_3, ami_int3, 0, "int3", NULL))

		pr_err("Couldn't register int%d\n", 3);

	if (request_irq(IRQ_AUTO_4, ami_int4, 0, "int4", NULL))

		pr_err("Couldn't register int%d\n", 4);

	if (request_irq(IRQ_AUTO_5, ami_int5, 0, "int5", NULL))

		pr_err("Couldn't register int%d\n", 5);



	m68k_setup_irq_controller(&amiga_irq_controller, IRQ_USER, AMI_STD_IRQS);

arch/m68k/amiga/cia.c

+3 −1
Original line number Diff line number Diff line
@@ -176,5 +176,7 @@ void __init cia_init_IRQ(struct ciabase *base) 
	/* override auto int and install CIA handler */

	m68k_setup_irq_controller(&auto_irq_controller, base->handler_irq, 1);

	m68k_irq_startup(base->handler_irq);

	request_irq(base->handler_irq, cia_handler, IRQF_SHARED, base->name, base);

	if (request_irq(base->handler_irq, cia_handler, IRQF_SHARED,

			base->name, base))

		pr_err("Couldn't register %s interrupt\n", base->name);

}

arch/m68k/amiga/config.c

+2 −1
Original line number Diff line number Diff line
@@ -493,7 +493,8 @@ static void __init amiga_sched_init(irq_handler_t timer_routine) 
	 * Please don't change this to use ciaa, as it interferes with the

	 * SCSI code. We'll have to take a look at this later

	 */

	request_irq(IRQ_AMIGA_CIAB_TA, timer_routine, 0, "timer", NULL);

	if (request_irq(IRQ_AMIGA_CIAB_TA, timer_routine, 0, "timer", NULL))

		pr_err("Couldn't register timer interrupt\n");

	/* start timer */

	ciab.cra |= 0x11;

}

arch/m68k/apollo/config.c

+2 −5
Original line number Diff line number Diff line
@@ -31,10 +31,6 @@ extern unsigned long dn_gettimeoffset(void); 
extern int dn_dummy_hwclk(int, struct rtc_time *);

extern int dn_dummy_set_clock_mmss(unsigned long);

extern void dn_dummy_reset(void);

extern void dn_dummy_waitbut(void);

extern struct fb_info *dn_fb_init(long *);

extern void dn_dummy_debug_init(void);

extern irqreturn_t dn_process_int(int irq, struct pt_regs *fp);

#ifdef CONFIG_HEARTBEAT

static void dn_heartbeat(int on);

#endif
@@ -204,7 +200,8 @@ void dn_sched_init(irq_handler_t timer_routine) 
	printk("*(0x10803) %02x\n",*(volatile unsigned char *)(timer+0x3));

#endif



	request_irq(IRQ_APOLLO, dn_timer_int, 0, "time", timer_routine);

	if (request_irq(IRQ_APOLLO, dn_timer_int, 0, "time", timer_routine))

		pr_err("Couldn't register timer interrupt\n");

}



unsigned long dn_gettimeoffset(void) {

arch/m68k/atari/atakeyb.c

+7 −3
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 
#include <asm/atari_joystick.h>

#include <asm/irq.h>



extern unsigned int keymap_count;



/* Hook for MIDI serial driver */

void (*atari_MIDI_interrupt_hook) (void);
@@ -567,14 +566,19 @@ static int atari_keyb_done = 0; 


int atari_keyb_init(void)

{

	int error;



	if (atari_keyb_done)

		return 0;



	kb_state.state = KEYBOARD;

	kb_state.len = 0;



	request_irq(IRQ_MFP_ACIA, atari_keyboard_interrupt, IRQ_TYPE_SLOW,

		    "keyboard/mouse/MIDI", atari_keyboard_interrupt);

	error = request_irq(IRQ_MFP_ACIA, atari_keyboard_interrupt,

			    IRQ_TYPE_SLOW, "keyboard/mouse/MIDI",

			    atari_keyboard_interrupt);

	if (error)

		return error;



	atari_turnoff_irq(IRQ_MFP_ACIA);

	do {

CRA Git | Maintained and supported by SUSTech CRA and CCSE