Skip to content

Commit d3876ff

Browse files
committed
Merge tag 'm68knommu-for-v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
Pull m68knommu updates from Greg Ungerer: "A collection of fixes for 5.10: - switch to using asm-generic uaccess code - fix sparse warnings in signal code - fix compilation of ColdFire MMC support - support sysrq in ColdFire serial driver" * tag 'm68knommu-for-v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: serial: mcf: add sysrq capability m68knommu: include SDHC support only when hardware has it m68knommu: fix sparse warnings in signal code m68knommu: switch to using asm-generic/uaccess.h
2 parents bbe8502 + 9f5fd80 commit d3876ff

File tree

6 files changed

+402
-559
lines changed

6 files changed

+402
-559
lines changed

arch/m68k/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ config M68K
3131
select NO_DMA if !MMU && !COLDFIRE
3232
select OLD_SIGACTION
3333
select OLD_SIGSUSPEND3
34+
select UACCESS_MEMCPY if !MMU
3435
select VIRT_TO_BUS
3536

3637
config CPU_BIG_ENDIAN

arch/m68k/coldfire/device.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -554,7 +554,7 @@ static struct platform_device mcf_edma = {
554554
};
555555
#endif /* IS_ENABLED(CONFIG_MCF_EDMA) */
556556

557-
#if IS_ENABLED(CONFIG_MMC)
557+
#ifdef MCFSDHC_BASE
558558
static struct mcf_esdhc_platform_data mcf_esdhc_data = {
559559
.max_bus_width = 4,
560560
.cd_type = ESDHC_CD_NONE,
@@ -579,7 +579,7 @@ static struct platform_device mcf_esdhc = {
579579
.resource = mcf_esdhc_resources,
580580
.dev.platform_data = &mcf_esdhc_data,
581581
};
582-
#endif /* IS_ENABLED(CONFIG_MMC) */
582+
#endif /* MCFSDHC_BASE */
583583

584584
static struct platform_device *mcf_devices[] __initdata = {
585585
&mcf_uart,
@@ -613,7 +613,7 @@ static struct platform_device *mcf_devices[] __initdata = {
613613
#if IS_ENABLED(CONFIG_MCF_EDMA)
614614
&mcf_edma,
615615
#endif
616-
#if IS_ENABLED(CONFIG_MMC)
616+
#ifdef MCFSDHC_BASE
617617
&mcf_esdhc,
618618
#endif
619619
};

0 commit comments

Comments
 (0)