leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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()
This commit is contained in:
Linus Torvalds 2013-11-11 18:17:07 +09:00
commit 0a759b2466
8 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/m68k/include/asm/floppy.h
View File

@ -85,7 +85,7 @@ static int fd_request_irq(void)
{ {
if(MACH_IS_Q40) if(MACH_IS_Q40)
return request_irq(FLOPPY_IRQ, floppy_hardint, return request_irq(FLOPPY_IRQ, floppy_hardint,
IRQF_DISABLED, "floppy", floppy_hardint); 0, "floppy", floppy_hardint);
else if(MACH_IS_SUN3X) else if(MACH_IS_SUN3X)
return sun3xflop_request_irq(); return sun3xflop_request_irq();
return -ENXIO; return -ENXIO;

2
arch/m68k/include/asm/sun3xflop.h
View File

@ -207,7 +207,7 @@ static int sun3xflop_request_irq(void)
if(!once) { if(!once) {
once = 1; once = 1;
error = request_irq(FLOPPY_IRQ, sun3xflop_hardint, error = request_irq(FLOPPY_IRQ, sun3xflop_hardint,
IRQF_DISABLED, "floppy", NULL); 0, "floppy", NULL);
return ((error == 0) ? 0 : -1); return ((error == 0) ? 0 : -1);
} else return 0; } else return 0;
} }

7
arch/m68k/include/asm/uaccess.h
View File

@ -3,3 +3,10 @@
#else #else
#include <asm/uaccess_mm.h> #include <asm/uaccess_mm.h>
#endif #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

2
arch/m68k/platform/68000/timers.c
View File

@ -70,7 +70,7 @@ static irqreturn_t hw_tick(int irq, void *dummy)
static struct irqaction m68328_timer_irq = { static struct irqaction m68328_timer_irq = {
.name = "timer", .name = "timer",
.flags = IRQF_DISABLED | IRQF_TIMER, .flags = IRQF_TIMER,
.handler = hw_tick, .handler = hw_tick,
}; };

2
arch/m68k/platform/68360/config.c
View File

@ -59,7 +59,7 @@ static irqreturn_t hw_tick(int irq, void *dummy)
static struct irqaction m68360_timer_irq = { static struct irqaction m68360_timer_irq = {
.name = "timer", .name = "timer",
.flags = IRQF_DISABLED | IRQF_TIMER, .flags = IRQF_TIMER,
.handler = hw_tick, .handler = hw_tick,
}; };

2
arch/m68k/platform/coldfire/pit.c
View File

@ -118,7 +118,7 @@ static irqreturn_t pit_tick(int irq, void *dummy)
static struct irqaction pit_irq = { static struct irqaction pit_irq = {
.name = "timer", .name = "timer",
.flags = IRQF_DISABLED | IRQF_TIMER, .flags = IRQF_TIMER,
.handler = pit_tick, .handler = pit_tick,
}; };

4
arch/m68k/platform/coldfire/sltimers.c
View File

@ -51,7 +51,7 @@ irqreturn_t mcfslt_profile_tick(int irq, void *dummy)
static struct irqaction mcfslt_profile_irq = { static struct irqaction mcfslt_profile_irq = {
.name = "profile timer", .name = "profile timer",
.flags = IRQF_DISABLED | IRQF_TIMER, .flags = IRQF_TIMER,
.handler = mcfslt_profile_tick, .handler = mcfslt_profile_tick,
}; };
@ -93,7 +93,7 @@ static irqreturn_t mcfslt_tick(int irq, void *dummy)
static struct irqaction mcfslt_timer_irq = { static struct irqaction mcfslt_timer_irq = {
.name = "timer", .name = "timer",
.flags = IRQF_DISABLED | IRQF_TIMER, .flags = IRQF_TIMER,
.handler = mcfslt_tick, .handler = mcfslt_tick,
}; };

4
arch/m68k/platform/coldfire/timers.c
View File

@ -83,7 +83,7 @@ static irqreturn_t mcftmr_tick(int irq, void *dummy)
static struct irqaction mcftmr_timer_irq = { static struct irqaction mcftmr_timer_irq = {
.name = "timer", .name = "timer",
.flags = IRQF_DISABLED | IRQF_TIMER, .flags = IRQF_TIMER,
.handler = mcftmr_tick, .handler = mcftmr_tick,
}; };
@ -171,7 +171,7 @@ irqreturn_t coldfire_profile_tick(int irq, void *dummy)
static struct irqaction coldfire_profile_irq = { static struct irqaction coldfire_profile_irq = {
.name = "profile timer", .name = "profile timer",
.flags = IRQF_DISABLED | IRQF_TIMER, .flags = IRQF_TIMER,
.handler = coldfire_profile_tick, .handler = coldfire_profile_tick,
}; };