Merge with Linux 2.3.32.

11 files changed, 21 insertions, 1 deletions

diff --git a/include/asm-m68k/dvma.h b/include/asm-m68k/dvma.h
index 4f7875def..b350911c6 100644
--- a/include/asm-m68k/dvma.h
+++ b/include/asm-m68k/dvma.h
@@ -9,6 +9,8 @@
 #ifndef __M68K_DVMA_H
 #define __M68K_DVMA_H
 
+#include <linux/config.h>
+
 #ifdef CONFIG_SUN3
 /* sun3 dvma page support */
 
diff --git a/include/asm-m68k/elf.h b/include/asm-m68k/elf.h
index 8799724e6..28dce0967 100644
--- a/include/asm-m68k/elf.h
+++ b/include/asm-m68k/elf.h
@@ -5,6 +5,7 @@
  * ELF register definitions..
  */
 
+#include <linux/config.h>
 #include <asm/ptrace.h>
 #include <asm/user.h>
 
diff --git a/include/asm-m68k/io.h b/include/asm-m68k/io.h
index 9257711dc..b8057d1ec 100644
--- a/include/asm-m68k/io.h
+++ b/include/asm-m68k/io.h
@@ -47,6 +47,8 @@
 #define outb(x,addr) ((void) writeb(x,addr))
 #define outb_p(x,addr) outb(x,addr)
 
+#define IO_SPACE_LIMIT 0xffff
+
 
 /* Values for nocacheflag and cmode */
 #define IOMAP_FULL_CACHING		0
diff --git a/include/asm-m68k/mmu_context.h b/include/asm-m68k/mmu_context.h
index 6a41f82e7..a8a1dfc61 100644
--- a/include/asm-m68k/mmu_context.h
+++ b/include/asm-m68k/mmu_context.h
@@ -1,6 +1,8 @@
 #ifndef __M68K_MMU_CONTEXT_H
 #define __M68K_MMU_CONTEXT_H
 
+#include <linux/config.h>
+
 #ifndef CONFIG_SUN3
 
 #include <asm/setup.h>
diff --git a/include/asm-m68k/openprom.h b/include/asm-m68k/openprom.h
index f855a5f09..7d8451338 100644
--- a/include/asm-m68k/openprom.h
+++ b/include/asm-m68k/openprom.h
@@ -8,6 +8,8 @@
  * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
  */
 
+#include <linux/config.h>
+
 /* Empirical constants... */
 #ifdef CONFIG_SUN3
 #define KADB_DEBUGGER_BEGVM     0x0fee0000    /* There is no kadb yet but...*/
diff --git a/include/asm-m68k/param.h b/include/asm-m68k/param.h
index af023b547..4b11fdf97 100644
--- a/include/asm-m68k/param.h
+++ b/include/asm-m68k/param.h
@@ -1,6 +1,8 @@
 #ifndef _M68K_PARAM_H
 #define _M68K_PARAM_H
 
+#include <linux/config.h>
+
 #ifndef HZ
 #define HZ 100
 #define HZ_TO_STD(a) (a)
diff --git a/include/asm-m68k/processor.h b/include/asm-m68k/processor.h
index 7b7c9e094..62240f8c5 100644
--- a/include/asm-m68k/processor.h
+++ b/include/asm-m68k/processor.h
@@ -13,6 +13,7 @@
  */
 #define current_text_addr() ({ __label__ _l; _l: &&_l;})
 
+#include <linux/config.h>
 #include <asm/segment.h>
 #include <asm/fpu.h>
 #include <asm/ptrace.h>
diff --git a/include/asm-m68k/resource.h b/include/asm-m68k/resource.h
index 11376a494..f2a6f0f41 100644
--- a/include/asm-m68k/resource.h
+++ b/include/asm-m68k/resource.h
@@ -18,6 +18,12 @@
 
 #define RLIM_NLIMITS	10
 
+/*
+ * SuS says limits have to be unsigned.
+ * Which makes a ton more sense anyway.
+ */
+#define RLIM_INFINITY	(~0UL)
+
 #ifdef __KERNEL__
 
 #define INIT_RLIMITS	\
diff --git a/include/asm-m68k/shm.h b/include/asm-m68k/shm.h
index 6e5bdf131..3fa2f368f 100644
--- a/include/asm-m68k/shm.h
+++ b/include/asm-m68k/shm.h
@@ -1,6 +1,8 @@
 #ifndef _M68K_SHM_H
 #define _M68K_SHM_H
 
+#include <linux/config.h>
+
 /* format of page table entries that correspond to shared memory pages
    currently out in swap space (see also mm/swap.c):
    bits 0-1 (PAGE_PRESENT) is  = 0
diff --git a/include/asm-m68k/signal.h b/include/asm-m68k/signal.h
index 3524a0bf3..228e95c97 100644
--- a/include/asm-m68k/signal.h
+++ b/include/asm-m68k/signal.h
@@ -63,6 +63,7 @@ typedef unsigned long sigset_t;
 #define SIGLOST		29
 */
 #define SIGPWR		30
+#define SIGSYS		31
 #define	SIGUNUSED	31
 
 /* These should not be considered constants from userland.  */
diff --git a/include/asm-m68k/sun3ints.h b/include/asm-m68k/sun3ints.h
index 2ea17900d..3f05def62 100644
--- a/include/asm-m68k/sun3ints.h
+++ b/include/asm-m68k/sun3ints.h
@@ -11,7 +11,6 @@
 #ifndef SUN3INTS_H
 #define SUN3INTS_H
 
-#include <linux/config.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>