Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
5b2ce890
Commit
5b2ce890
authored
Apr 13, 2003
by
Russell King
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[ARM] Fix exception table handling
This fixes a build error caused by other changes in 2.5.67.
parent
7d5aa396
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
13 deletions
+15
-13
arch/arm/mm/extable.c
arch/arm/mm/extable.c
+12
-1
arch/arm/mm/fault-common.c
arch/arm/mm/fault-common.c
+2
-10
include/asm-arm/uaccess.h
include/asm-arm/uaccess.h
+1
-2
No files found.
arch/arm/mm/extable.c
View file @
5b2ce890
/*
* linux/arch/arm/mm/extable.c
*/
#include <linux/
config
.h>
#include <linux/
module
.h>
#include <asm/uaccess.h>
const
struct
exception_table_entry
*
...
...
@@ -24,3 +24,14 @@ search_extable(const struct exception_table_entry *first,
}
return
NULL
;
}
int
fixup_exception
(
struct
pt_regs
*
regs
)
{
const
struct
exception_table_entry
*
fixup
;
fixup
=
search_exception_tables
(
instruction_pointer
(
regs
));
if
(
fixup
)
regs
->
ARM_pc
=
fixup
->
fixup
;
return
fixup
!=
NULL
;
}
arch/arm/mm/fault-common.c
View file @
5b2ce890
...
...
@@ -25,6 +25,7 @@
#include <asm/system.h>
#include <asm/pgtable.h>
#include <asm/uaccess.h>
#include "fault.h"
...
...
@@ -103,20 +104,11 @@ static void
__do_kernel_fault
(
struct
mm_struct
*
mm
,
unsigned
long
addr
,
unsigned
int
fsr
,
struct
pt_regs
*
regs
)
{
const
struct
exception_table_entry
*
fixup
;
/*
* Are we prepared to handle this kernel fault?
*/
fixup
=
search_exception_tables
(
instruction_pointer
(
regs
));
if
(
fixup
)
{
#ifdef DEBUG
printk
(
KERN_DEBUG
"%s: Exception at [<%lx>] addr=%lx (fixup: %lx)
\n
"
,
current
->
comm
,
regs
->
ARM_pc
,
addr
,
fixup
->
fixup
);
#endif
regs
->
ARM_pc
=
fixup
->
fixup
;
if
(
fixup_exception
(
regs
))
return
;
}
/*
* No handler, we'll have to terminate things with extreme prejudice.
...
...
include/asm-arm/uaccess.h
View file @
5b2ce890
...
...
@@ -28,8 +28,7 @@ struct exception_table_entry
unsigned
long
insn
,
fixup
;
};
/* Returns 0 if exception not found and fixup otherwise. */
extern
unsigned
long
search_exception_table
(
unsigned
long
);
extern
int
fixup_exception
(
struct
pt_regs
*
regs
);
#define get_ds() (KERNEL_DS)
#define get_fs() (current_thread_info()->addr_limit)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment