[PATCH] Fixes to allow ARM to build in the standard tree

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.

diff --git a/include/linux/ptrace.h b/include/linux/ptrace.h
index 91de88700cbe647599d6bc94f0455496dbff6705..91a309f8a0a17ef5c287c7d104d60fce2164b3b7 100644 (file)
--- a/include/linux/ptrace.h
+++ b/include/linux/ptrace.h
@@ -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.  */

diff --git a/mm/swapfile.c b/mm/swapfile.c
index e91603973bb0fd2a0ab95f23d39a34d3f57b079c..8d252bdb4db37b478bcd601db61f26e0306d6edc 100644 (file)
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -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;