Commit af9db1d6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'm68k-for-v5.10-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k 

Pull m68k updates from Geert Uytterhoeven:

  - Conversion of the Mac IDE driver to a platform driver

  - Minor cleanups and fixes

* tag 'm68k-for-v5.10-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  ide/macide: Convert Mac IDE driver to platform driver
  m68k: Replace HTTP links with HTTPS ones
  m68k: mm: Remove superfluous memblock_alloc*() casts
  m68k: mm: Use PAGE_ALIGNED() helper
  m68k: Sort selects in main Kconfig
  m68k: amiga: Clean up Amiga hardware configuration
  m68k: Revive _TIF_* masks
  m68k: Correct some typos in comments
  m68k: Use get_kernel_nofault() in show_registers()
  zorro: Fix address space collision message with RAM expansion boards
  m68k: amiga: Fix Denise detection on OCS
parents 024fb667 50c5feee

arch/m68k/Kconfig

+12 −12
Original line number Diff line number Diff line
@@ -6,32 +6,32 @@ config M68K 
	select ARCH_HAS_BINFMT_FLAT

	select ARCH_HAS_DMA_PREP_COHERENT if HAS_DMA && MMU && !COLDFIRE

	select ARCH_HAS_SYNC_DMA_FOR_DEVICE if HAS_DMA

	select ARCH_HAVE_NMI_SAFE_CMPXCHG if RMW_INSNS

	select ARCH_MIGHT_HAVE_PC_PARPORT if ISA

	select ARCH_NO_PREEMPT if !COLDFIRE

	select ARCH_WANT_IPC_PARSE_VERSION

	select BINFMT_FLAT_ARGVP_ENVP_ON_STACK

	select DMA_DIRECT_REMAP if HAS_DMA && MMU && !COLDFIRE

	select HAVE_IDE

	select HAVE_AOUT if MMU

	select HAVE_ASM_MODVERSIONS

	select HAVE_DEBUG_BUGVERBOSE

	select GENERIC_IRQ_SHOW

	select GENERIC_ATOMIC64

	select NO_DMA if !MMU && !COLDFIRE

	select HAVE_UID16

	select VIRT_TO_BUS

	select ARCH_HAVE_NMI_SAFE_CMPXCHG if RMW_INSNS

	select GENERIC_CPU_DEVICES

	select GENERIC_IOMAP

	select GENERIC_IRQ_SHOW

	select GENERIC_STRNCPY_FROM_USER if MMU

	select GENERIC_STRNLEN_USER if MMU

	select ARCH_WANT_IPC_PARSE_VERSION

	select HAVE_AOUT if MMU

	select HAVE_ASM_MODVERSIONS

	select HAVE_DEBUG_BUGVERBOSE

	select HAVE_FUTEX_CMPXCHG if MMU && FUTEX

	select HAVE_IDE

	select HAVE_MOD_ARCH_SPECIFIC

	select HAVE_UID16

	select MMU_GATHER_NO_RANGE if MMU

	select MODULES_USE_ELF_REL

	select MODULES_USE_ELF_RELA

	select OLD_SIGSUSPEND3

	select NO_DMA if !MMU && !COLDFIRE

	select OLD_SIGACTION

	select MMU_GATHER_NO_RANGE if MMU

	select OLD_SIGSUSPEND3

	select VIRT_TO_BUS



config CPU_BIG_ENDIAN

	def_bool y

arch/m68k/amiga/config.c

+58 −60
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ static void __init amiga_identify(void) 


	switch (amiga_model) {

	case AMI_UNKNOWN:

		goto Generic;

		break;



	case AMI_600:

	case AMI_1200:
@@ -227,7 +227,7 @@ static void __init amiga_identify(void) 
	case AMI_2000:

	case AMI_2500:

		AMIGAHW_SET(A2000_CLK);	/* Is this correct for all models? */

		goto Generic;

		break;



	case AMI_3000:

	case AMI_3000T:
@@ -238,7 +238,7 @@ static void __init amiga_identify(void) 
		AMIGAHW_SET(A3000_SCSI);

		AMIGAHW_SET(A3000_CLK);

		AMIGAHW_SET(ZORRO3);

		goto Generic;

		break;



	case AMI_4000T:

		AMIGAHW_SET(A4000_SCSI);
@@ -247,15 +247,21 @@ static void __init amiga_identify(void) 
		AMIGAHW_SET(A4000_IDE);

		AMIGAHW_SET(A3000_CLK);

		AMIGAHW_SET(ZORRO3);

		goto Generic;

		break;



	case AMI_CDTV:

	case AMI_CD32:

		AMIGAHW_SET(CD_ROM);

		AMIGAHW_SET(A2000_CLK);             /* Is this correct? */

		goto Generic;

		break;



	case AMI_DRACO:

		panic("No support for Draco yet");



	default:

		panic("Unknown Amiga Model");

	}



	Generic:

	AMIGAHW_SET(AMI_VIDEO);

	AMIGAHW_SET(AMI_BLITTER);

	AMIGAHW_SET(AMI_AUDIO);
@@ -278,12 +284,12 @@ static void __init amiga_identify(void) 
		case 0x08:

			AMIGAHW_SET(LISA);

			break;

			}

			break;

		default:

			AMIGAHW_SET(DENISE);

			break;

		}

		break;

	}

	switch ((amiga_custom.vposr>>8) & 0x7f) {

	case 0x00:

		AMIGAHW_SET(AGNUS_PAL);
@@ -309,14 +315,6 @@ static void __init amiga_identify(void) 
		break;

	}

	AMIGAHW_SET(ZORRO);

		break;



	case AMI_DRACO:

		panic("No support for Draco yet");



	default:

		panic("Unknown Amiga Model");

	}



#define AMIGAHW_ANNOUNCE(name, str)		\

	if (AMIGAHW_PRESENT(name))		\

arch/m68k/configs/mac_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -317,6 +317,7 @@ CONFIG_DUMMY_IRQ=m 
CONFIG_IDE=y

CONFIG_IDE_GD_ATAPI=y

CONFIG_BLK_DEV_IDECD=y

CONFIG_BLK_DEV_PLATFORM=y

CONFIG_BLK_DEV_MAC_IDE=y

CONFIG_RAID_ATTRS=m

CONFIG_SCSI=y

arch/m68k/configs/multi_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -346,6 +346,7 @@ CONFIG_DUMMY_IRQ=m 
CONFIG_IDE=y

CONFIG_IDE_GD_ATAPI=y

CONFIG_BLK_DEV_IDECD=y

CONFIG_BLK_DEV_PLATFORM=y

CONFIG_BLK_DEV_GAYLE=y

CONFIG_BLK_DEV_BUDDHA=y

CONFIG_BLK_DEV_FALCON_IDE=y

arch/m68k/include/asm/thread_info.h

+8 −0
Original line number Diff line number Diff line
@@ -68,4 +68,12 @@ static inline struct thread_info *current_thread_info(void) 
#define TIF_MEMDIE		16	/* is terminating due to OOM killer */

#define TIF_RESTORE_SIGMASK	18	/* restore signal mask in do_signal */



#define _TIF_NOTIFY_RESUME	(1 << TIF_NOTIFY_RESUME)

#define _TIF_SIGPENDING		(1 << TIF_SIGPENDING)

#define _TIF_NEED_RESCHED	(1 << TIF_NEED_RESCHED)

#define _TIF_DELAYED_TRACE	(1 << TIF_DELAYED_TRACE)

#define _TIF_SYSCALL_TRACE	(1 << TIF_SYSCALL_TRACE)

#define _TIF_MEMDIE		(1 << TIF_MEMDIE)

#define _TIF_RESTORE_SIGMASK	(1 << TIF_RESTORE_SIGMASK)



#endif	/* _ASM_M68K_THREAD_INFO_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE