[PATCH] Fixes to allow ARM to build in Linus' tree

[PATCH] Fixes to allow ARM to build in Linus' tree

[Russell King]

Hi,

In addition to the MODULE_ALIAS_LDISC patch, the following changes to
generic code are needed to allow ARM to build in Linus' tree.

The first is to add PT_SINGLESTEP to ptrace.h so we do the right thing
when adding/removing breakpoint instructions into processes (see
arch/arm/kernel/{signal.c,ptrace.c} for usage.)

The second is needed because pmd_clear() needs to flush the pmd.
However, we can't include tlbflush.h into pgtable.h without causing
a circular dependency (tlbflush.h needs vm_area_struct and mm_struct
which are in mm.h, which needs pgtable.h.)  swapfile.c seems to be the
only file affected.

===== include/linux/ptrace.h 1.10 vs edited =====
--- 1.10/include/linux/ptrace.h	Fri Jun  6 07:36:40 2003
+++ edited/include/linux/ptrace.h	Fri Sep  5 00:18:59 2003
@@ -65,6 +65,7 @@
 #define PT_TRACE_EXIT	0x00000200
 
 #define PT_TRACE_MASK	0x000003f4
+#define PT_SINGLESTEP	0x80000000	/* single stepping (used on ARM) */
 
 #include <linux/compiler.h>		/* For unlikely.  */
 #include <linux/sched.h>		/* For struct task_struct.  */
===== mm/swapfile.c 1.83 vs edited =====
--- 1.83/mm/swapfile.c	Mon Sep  1 00:15:45 2003
+++ edited/mm/swapfile.c	Fri Sep  5 01:40:09 2003
@@ -25,6 +25,7 @@
 #include <linux/security.h>
 
 #include <asm/pgtable.h>
+#include <asm/tlbflush.h>
 #include <linux/swapops.h>
 
 spinlock_t swaplock = SPIN_LOCK_UNLOCKED;

-- 
Russell King (rmk@arm.linux.org.uk)	http://www.arm.linux.org.uk/personal/
Maintainer of:
  2.6 ARM Linux   - http://www.arm.linux.org.uk/
  2.6 PCMCIA      - http://pcmcia.arm.linux.org.uk/
  2.6 Serial core