Commit 979ff1e5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull m68k updates from Geert Uytterhoeven:

 - misc aesthetical improvements for the floating point emulator

 - remove the last user of strlcpy()

 - use kernel's generic libgcc functions

 - misc fixes for W=1 builds

 - misc indentation fixes

 - misc fixes and improvements

 - defconfig updates

* tag 'm68k-for-v6.7-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: (72 commits)
  m68k: lib: Include <linux/libgcc.h> for __muldi3()
  m68k: fpsp040: Fix indentation by 5 spaces
  m68k: Fix indentation by 2 or 5 spaces in <asm/page_mm.h>
  m68k: kernel: Fix indentation by 7 spaces in traps.c
  m68k: sun3: Fix indentation by 5 or 7 spaces
  m68k: Fix indentation by 7 spaces in <asm/io_mm.h>
  m68k: defconfig: Update virt_defconfig for v6.6-rc3
  m68k: defconfig: Update defconfigs for v6.6-rc1
  m68k: io: Mark mmio read addresses as const
  m68k: Replace GPL 2.0+ README.legal boilerplate with SPDX
  m68k: sun3: Change led_pattern[] to unsigned char
  m68k: Add missing types to asm/irq.h
  m68k: sun3/3x: Add and use "sun3.h"
  m68k: sun3x: Make dvma_print() static
  m68k: sun3x: Make sun3x_halt() static
  m68k: sun3x: Do not mark dvma_map_iommu() inline
  m68k: sun3x: Fix signature of sun3_leds()
  m68k: sun3: Make sun3_platform_init() static
  m68k: sun3: Make print_pte() static
  m68k: sun3: Annotate prom_printf() with __printf()
  ...
parents 56ec8e4c 03191fb3

arch/m68k/68000/entry.S

+2 −5
Original line number Diff line number Diff line 
/*

/* SPDX-License-Identifier: GPL-2.0-or-later

 *

 *  entry.S -- non-mmu 68000 interrupt and exception entry points

 *

 *  Copyright (C) 1991, 1992  Linus Torvalds

 *

 * This file is subject to the terms and conditions of the GNU General Public

 * License.  See the file README.legal in the main directory of this archive

 * for more details.

 *

 * Linux/m68k support by Hamish Macdonald

 */

arch/m68k/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -19,6 +19,9 @@ config M68K 
	select GENERIC_CPU_DEVICES

	select GENERIC_IOMAP

	select GENERIC_IRQ_SHOW

	select GENERIC_LIB_ASHLDI3

	select GENERIC_LIB_ASHRDI3

	select GENERIC_LIB_LSHRDI3

	select HAS_IOPORT if PCI || ISA || ATARI_ROM_ISA

	select HAVE_ARCH_SECCOMP

	select HAVE_ARCH_SECCOMP_FILTER

arch/m68k/amiga/amiga.h

0 → 100644
+5 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */



/* amisound.c */

void amiga_init_sound(void);

void amiga_mksound(unsigned int hz, unsigned int ticks);

arch/m68k/amiga/amisound.c

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


#include <asm/amigahw.h>



#include "amiga.h"



static unsigned short *snd_data;

static const signed char sine_data[] = {

	0,  39,  75,  103,  121,  127,  121,  103,  75,  39,

arch/m68k/amiga/config.c

+2 −2
Original line number Diff line number Diff line
@@ -39,6 +39,8 @@ 
#include <asm/io.h>

#include <asm/config.h>



#include "amiga.h"



static unsigned long amiga_model;



unsigned long amiga_eclock;
@@ -96,9 +98,7 @@ static char amiga_model_name[13] = "Amiga "; 
static void amiga_sched_init(void);

static void amiga_get_model(char *model);

static void amiga_get_hardware_list(struct seq_file *m);

extern void amiga_mksound(unsigned int count, unsigned int ticks);

static void amiga_reset(void);

extern void amiga_init_sound(void);

static void amiga_mem_console_write(struct console *co, const char *b,

				    unsigned int count);

#ifdef CONFIG_HEARTBEAT