Commit 4496d937 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: irq_node.handler() should return irqreturn_t
  m68k: section mismatch fixes: Atari SCSI
  m68k: section mismatch fixes: DMAsound for Atari
  MAINTAINERS: Replace dead link to m68k CVS repository by link to new git repository
  m68k: mac - Add SWIM floppy support
  m68k: mac - Add a new entry in mac_model to identify the floppy controller type.
  m68k: Add install target
parents 8e9d2089 4b2873ba

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -2845,7 +2845,7 @@ P: Roman Zippel 
M:	zippel@linux-m68k.org

L:	linux-m68k@lists.linux-m68k.org

W:	http://www.linux-m68k.org/

W:	http://linux-m68k-cvs.ubb.ca/

T:	git git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git

S:	Maintained



M68K ON APPLE MACINTOSH

arch/m68k/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -117,3 +117,6 @@ endif 


archclean:

	rm -f vmlinux.gz vmlinux.bz2



install:

	sh $(srctree)/arch/m68k/install.sh $(KERNELRELEASE) vmlinux.gz System.map "$(INSTALL_PATH)"

arch/m68k/include/asm/irq_mm.h

+2 −1
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 


#include <linux/linkage.h>

#include <linux/hardirq.h>

#include <linux/irqreturn.h>

#include <linux/spinlock_types.h>



/*
@@ -80,7 +81,7 @@ struct pt_regs; 
 * interrupt source (if it supports chaining).

 */

typedef struct irq_node {

	int		(*handler)(int, void *);

	irqreturn_t	(*handler)(int, void *);

	void		*dev_id;

	struct irq_node *next;

	unsigned long	flags;

arch/m68k/include/asm/macintosh.h

+7 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ struct mac_model 
	char scc_type;

	char ether_type;

	char nubus_type;

	char floppy_type;

};



#define MAC_ADB_NONE		0
@@ -71,6 +72,12 @@ struct mac_model 
#define MAC_NO_NUBUS		0

#define MAC_NUBUS		1



#define MAC_FLOPPY_IWM		0

#define MAC_FLOPPY_SWIM_ADDR1	1

#define MAC_FLOPPY_SWIM_ADDR2	2

#define MAC_FLOPPY_SWIM_IOP	3

#define MAC_FLOPPY_AV		4



/*

 *	Gestalt numbers

 */

arch/m68k/install.sh

0 → 100644
+52 −0
Original line number Diff line number Diff line 
#!/bin/sh

#

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

# License.  See the file "COPYING" in the main directory of this archive

# for more details.

#

# Copyright (C) 1995 by Linus Torvalds

#

# Adapted from code in arch/i386/boot/Makefile by H. Peter Anvin

#

# "make install" script for m68k architecture

#

# Arguments:

#   $1 - kernel version

#   $2 - kernel image file

#   $3 - kernel map file

#   $4 - default install path (blank if root directory)

#



verify () {

	if [ ! -f "$1" ]; then

		echo ""                                                   1>&2

		echo " *** Missing file: $1"                              1>&2

		echo ' *** You need to run "make" before "make install".' 1>&2

		echo ""                                                   1>&2

		exit 1

	fi

}



# Make sure the files actually exist

verify "$2"

verify "$3"



# User may have a custom install script



if [ -x ~/bin/${CROSS_COMPILE}installkernel ]; then exec ~/bin/${CROSS_COMPILE}installkernel "$@"; fi

if [ -x /sbin/${CROSS_COMPILE}installkernel ]; then exec /sbin/${CROSS_COMPILE}installkernel "$@"; fi



# Default install - same as make zlilo



if [ -f $4/vmlinuz ]; then

	mv $4/vmlinuz $4/vmlinuz.old

fi



if [ -f $4/System.map ]; then

	mv $4/System.map $4/System.old

fi



cat $2 > $4/vmlinuz

cp $3 $4/System.map



sync

CRA Git | Maintained and supported by SUSTech CRA and CCSE