#1 misc 2.2.18 patches

[Anonymous]

The first part is an updated version of an old patch by
Andreas Schwab, which allows m68kserial to be built as
a module. The rest are just one liners which should all
be obvious. Not sure if all of the
patches are really relavant for mac68k, but they're
definitely useful for m68k in general.

[Nobody/Anonymous]

Logged In: NO

Seems like the actual patch wasn't attached correctly, so
here it is again:

diff -urN linux-2.2.18.orig/arch/m68k/kernel/Makefile
linux-2.2.18/arch/m68k/ker---
linux-2.2.18.orig/arch/m68k/kernel/Makefile Sun Apr 18
10:04:58 1999
+++ linux-2.2.18/arch/m68k/kernel/Makefile Thu Jan 25
19:37:56 2001
@@ -13,8 +13,8 @@
all: head.o kernel.o
O_TARGET := kernel.o
O_OBJS := entry.o process.o traps.o ints.o signal.o
ptrace.o \ - setup.o sys_m68k.o time.o
-OX_OBJS := m68k_ksyms.o
+ sys_m68k.o time.o
+OX_OBJS := setup.o m68k_ksyms.o

ifdef CONFIG_KGDB
O_OBJS += kgdb.o
diff -urN linux-2.2.18.orig/arch/m68k/kernel/m68k_ksyms.c
linux-2.2.18/arch/m68k---
linux-2.2.18.orig/arch/m68k/kernel/m68k_ksyms.c Mon Jul
31 10:55:51 2000+++
linux-2.2.18/arch/m68k/kernel/m68k_ksyms.c Thu Jan 25
19:38:19 2001
@@ -18,7 +18,6 @@
#include <asm/checksum.h>
#include <asm/hardirq.h>
#include <asm/softirq.h>
-#include <asm/m68kserial.h>
#include <asm/hwtest.h>

asmlinkage long long __ashrdi3 (long long, int);
@@ -60,8 +59,6 @@
EXPORT_SYMBOL(disable_irq);
EXPORT_SYMBOL(kernel_set_cachemode);
EXPORT_SYMBOL(kernel_thread);
-EXPORT_SYMBOL(register_serial);
-EXPORT_SYMBOL(unregister_serial);
EXPORT_SYMBOL(ret_from_exception);
#ifdef CONFIG_VME
EXPORT_SYMBOL(vme_brdtype);
diff -urN linux-2.2.18.orig/arch/m68k/kernel/setup.c
linux-2.2.18/arch/m68k/kern---
linux-2.2.18.orig/arch/m68k/kernel/setup.c Thu Jan 4
08:45:55 2001
+++ linux-2.2.18/arch/m68k/kernel/setup.c Thu Jan 25
19:39:40 2001
@@ -19,6 +19,7 @@
#include <linux/errno.h>
#include <linux/string.h>
#include <linux/init.h>
+#include <linux/module.h>

#include <asm/bootinfo.h>
#include <asm/setup.h>
@@ -468,6 +469,9 @@
m68k_unregister_serial(i);
#endif
}
+EXPORT_SYMBOL(register_serial);
+EXPORT_SYMBOL(unregister_serial);
+
#ifdef CONFIG_SERIAL_CONSOLE
long serial_console_init(long kmem_start, long kmem_end)
{
diff -urN linux-2.2.18.orig/drivers/char/Makefile
linux-2.2.18/drivers/char/Make---
linux-2.2.18.orig/drivers/char/Makefile Thu Jan 4
08:45:59 2001
+++ linux-2.2.18/drivers/char/Makefile Thu Jan 25 19:46:58
2001
@@ -400,7 +400,7 @@
O_OBJS += lp_intern.o
else
ifeq ($(CONFIG_M68K_PRINTER),m)
- O_OBJS += lp_intern.o
+ M_OBJS += lp_intern.o
LM = m
endif
endif
diff -urN linux-2.2.18.orig/include/asm-m68k/socket.h
linux-2.2.18/include/asm-m---
linux-2.2.18.orig/include/asm-m68k/socket.h Tue Mar 21
00:40:53 2000
@@ -40,6 +40,7 @@
#define SO_DETACH_FILTER 27

/* Socket types. */
+#if defined(__KERNEL__)
#define SOCK_STREAM 1 /* stream
(connection) socket */
#define SOCK_DGRAM 2 /* datagram
(conn.less) socket */
#define SOCK_RAW 3 /* raw
socket */
@@ -50,5 +51,6 @@
/* level. For
writing rarp and */
/* other similar
things on the */
/* user
level. */
+#endif

#endif /* _ASM_SOCKET_H */
diff -urN linux-2.2.18.orig/include/linux/soundcard.h
linux-2.2.18/include/linux---
linux-2.2.18.orig/include/linux/soundcard.h Thu Jan 4
08:46:30 2001
+++ linux-2.2.18/include/linux/soundcard.h Thu Jan 25
19:58:07 2001
@@ -179,7 +179,7 @@
* Some big endian/little endian handling macros
*/

-#if defined(_AIX) || defined(AIX) || defined(sparc) ||
defined(__sparc__) || de
+#if defined(_AIX) || defined(AIX) || defined(sparc) ||
defined(__sparc__) || de /* Big endian machines */
# define _PATCHKEY(id) (0xfd00|id)
# define AFMT_S16_NE AFMT_S16_BE