Commit 8c04bddc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'm68knommu-for-v6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu 

Pull m68knommu updates from Greg Ungerer:
 "A few changes, most of them related to fixing warnings when compiling
  with "W=1". These follow up Geert's recent changes for M68K for this
  too. These ones complete the fixes for the nommu and ColdFire specific
  code.

  Also a couple of other fixes to improve ROM default addressing and
  compiling for the Cleopatra boards.

  Summary:

   - improve default Kconfig ROM section settings

   - fix compilation for some Cleopatra boards

   - fixes and cleanups for warnings compiling with 'W=1'"

* tag 'm68knommu-for-v6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68k: 68000: fix warning in timer code
  m68k: 68000: fix warnings in 68000 interrupt handling
  m68k: coldfire: remove unused variable in MMU code
  m68k: coldfire: fix warnings in uboot argument processing
  m68k: coldfire: make mcf_maskimr() static
  m68k: coldfire: ensure gpio prototypes visible
  m68k: coldfire: add and use "vectors.h"
  m68knommu: fix compilation for ColdFire/Cleopatra boards
  m68knommu: improve config ROM setting defaults
parents 43468456 2508b608

arch/m68k/68000/ints.c

+4 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/init.h>

#include <linux/interrupt.h>

#include <linux/irq.h>

#include <linux/cpu.h>

#include <asm/traps.h>

#include <asm/io.h>

#include <asm/machdep.h>
@@ -26,6 +27,8 @@ 
#include <asm/MC68328.h>

#endif



#include "ints.h"



/* assembler routines */

asmlinkage void system_call(void);

asmlinkage void buserr(void);
@@ -74,7 +77,7 @@ asmlinkage irqreturn_t inthandler7(void); 
 * into one vector and look in the blasted mask register...

 * This code is designed to be fast, almost constant time, not clean!

 */

void process_int(int vec, struct pt_regs *fp)

asmlinkage void process_int(int vec, struct pt_regs *fp)

{

	int irq;

	int mask;

arch/m68k/68000/ints.h

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



#include <linux/linkage.h>



struct pt_regs;



asmlinkage void process_int(int vec, struct pt_regs *fp);

arch/m68k/68000/timers.c

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

#include <asm/MC68VZ328.h>



#include "m68328.h"



/***************************************************************************/



#if defined(CONFIG_DRAGEN2)

arch/m68k/Kconfig.machine

+2 −2
Original line number Diff line number Diff line
@@ -441,7 +441,7 @@ config ROM 


config ROMVEC

	hex "Address of the base of the ROM vectors"

	default "0"

	default "0x10c10000"

	depends on ROM

	help

	  This is almost always the same as the base of the ROM. Since on all
@@ -450,7 +450,7 @@ config ROMVEC 


config ROMSTART

	hex "Address of the base of system image in ROM"

	default "0x400"

	default "0x10c10400"

	depends on ROM

	help

	  Define the start address of the system image in ROM. Commonly this

arch/m68k/coldfire/intc.c

+2 −2
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ void mcf_clrimr(int index) 
	__raw_writew(imr & ~(0x1 << index), MCFSIM_IMR);

}



void mcf_maskimr(unsigned int mask)

static void mcf_maskimr(unsigned int mask)

{

	u16 imr;

	imr = __raw_readw(MCFSIM_IMR);
@@ -80,7 +80,7 @@ void mcf_clrimr(int index) 
	__raw_writel(imr & ~(0x1 << index), MCFSIM_IMR);

}



void mcf_maskimr(unsigned int mask)

static void mcf_maskimr(unsigned int mask)

{

	u32 imr;

	imr = __raw_readl(MCFSIM_IMR);