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

Commit 0a759b24 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 

Pull m68k updates from Geert Uytterhoeven:
 "Summary:
   - __put_user_unaligned may/will be used by btrfs
   - m68k part of a global cleanup"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: Remove deprecated IRQF_DISABLED
  m68k/m68knommu: Implement __get_user_unaligned/__put_user_unaligned()
parents 78d4a420 77a42796

arch/m68k/include/asm/floppy.h

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ static int fd_request_irq(void) 
{

	if(MACH_IS_Q40)

		return request_irq(FLOPPY_IRQ, floppy_hardint,

				   IRQF_DISABLED, "floppy", floppy_hardint);

				   0, "floppy", floppy_hardint);

	else if(MACH_IS_SUN3X)

		return sun3xflop_request_irq();

	return -ENXIO;

arch/m68k/include/asm/sun3xflop.h

+1 −1
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ static int sun3xflop_request_irq(void) 
	if(!once) {

		once = 1;

		error = request_irq(FLOPPY_IRQ, sun3xflop_hardint,

				    IRQF_DISABLED, "floppy", NULL);

				    0, "floppy", NULL);

		return ((error == 0) ? 0 : -1);

	} else return 0;

}

arch/m68k/include/asm/uaccess.h

+7 −0
Original line number Diff line number Diff line
@@ -3,3 +3,10 @@ 
#else

#include <asm/uaccess_mm.h>

#endif



#ifdef CONFIG_CPU_HAS_NO_UNALIGNED

#include <asm-generic/uaccess-unaligned.h>

#else

#define __get_user_unaligned(x, ptr)	__get_user((x), (ptr))

#define __put_user_unaligned(x, ptr)	__put_user((x), (ptr))

#endif

arch/m68k/platform/68000/timers.c

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ static irqreturn_t hw_tick(int irq, void *dummy) 


static struct irqaction m68328_timer_irq = {

	.name	 = "timer",

	.flags	 = IRQF_DISABLED | IRQF_TIMER,

	.flags	 = IRQF_TIMER,

	.handler = hw_tick,

};

arch/m68k/platform/68360/config.c

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ static irqreturn_t hw_tick(int irq, void *dummy) 


static struct irqaction m68360_timer_irq = {

	.name	 = "timer",

	.flags	 = IRQF_DISABLED | IRQF_TIMER,

	.flags	 = IRQF_TIMER,

	.handler = hw_tick,

};