projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
[powerpc.git]
/
arch
/
powerpc
/
kernel
/
process.c
diff --git
a/arch/powerpc/kernel/process.c
b/arch/powerpc/kernel/process.c
index
7b2f645
..
f3d4dd5
100644
(file)
--- a/
arch/powerpc/kernel/process.c
+++ b/
arch/powerpc/kernel/process.c
@@
-341,13
+341,6
@@
struct task_struct *__switch_to(struct task_struct *prev,
static int instructions_to_print = 16;
static int instructions_to_print = 16;
-#ifdef CONFIG_PPC64
-#define BAD_PC(pc) ((REGION_ID(pc) != KERNEL_REGION_ID) && \
- (REGION_ID(pc) != VMALLOC_REGION_ID))
-#else
-#define BAD_PC(pc) ((pc) < KERNELBASE)
-#endif
-
static void show_instructions(struct pt_regs *regs)
{
int i;
static void show_instructions(struct pt_regs *regs)
{
int i;
@@
-366,7
+359,8
@@
static void show_instructions(struct pt_regs *regs)
* bad address because the pc *should* only be a
* kernel address.
*/
* bad address because the pc *should* only be a
* kernel address.
*/
- if (BAD_PC(pc) || __get_user(instr, (unsigned int __user *)pc)) {
+ if (!__kernel_text_address(pc) ||
+ __get_user(instr, (unsigned int __user *)pc)) {
printk("XXXXXXXX ");
} else {
if (regs->nip == pc)
printk("XXXXXXXX ");
} else {
if (regs->nip == pc)