Commit 2c9f643a authored by Russell King's avatar Russell King Committed by Linus Torvalds

[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.
parent b0deac08
...@@ -65,6 +65,7 @@ ...@@ -65,6 +65,7 @@
#define PT_TRACE_EXIT 0x00000200 #define PT_TRACE_EXIT 0x00000200
#define PT_TRACE_MASK 0x000003f4 #define PT_TRACE_MASK 0x000003f4
#define PT_SINGLESTEP 0x80000000 /* single stepping (used on ARM) */
#include <linux/compiler.h> /* For unlikely. */ #include <linux/compiler.h> /* For unlikely. */
#include <linux/sched.h> /* For struct task_struct. */ #include <linux/sched.h> /* For struct task_struct. */
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#include <linux/security.h> #include <linux/security.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
#include <asm/tlbflush.h>
#include <linux/swapops.h> #include <linux/swapops.h>
spinlock_t swaplock = SPIN_LOCK_UNLOCKED; spinlock_t swaplock = SPIN_LOCK_UNLOCKED;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment