diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2007-02-08 00:41:56 -0600 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2007-02-08 00:41:56 -0600 |
| commit | 135637aa781a0480ba4ef2d3ad18fae408ace874 (patch) | |
| tree | d28d3765b2cb135968b14a0fd75ef2c2b4f1e248 /include/asm-powerpc | |
| parent | 97c5a20ae68774b4c9246c4657be0d88317f103f (diff) | |
| parent | d003e7a1a569501cbe9a5ca14748177498c4893a (diff) | |
| download | kernel_samsung_espresso10-135637aa781a0480ba4ef2d3ad18fae408ace874.zip kernel_samsung_espresso10-135637aa781a0480ba4ef2d3ad18fae408ace874.tar.gz kernel_samsung_espresso10-135637aa781a0480ba4ef2d3ad18fae408ace874.tar.bz2 | |
Merge branch 'master' into 83xx
Diffstat (limited to 'include/asm-powerpc')
| -rw-r--r-- | include/asm-powerpc/firmware.h | 1 | ||||
| -rw-r--r-- | include/asm-powerpc/kprobes.h | 7 | ||||
| -rw-r--r-- | include/asm-powerpc/mpc52xx.h | 2 | ||||
| -rw-r--r-- | include/asm-powerpc/sstep.h | 1 |
4 files changed, 10 insertions, 1 deletions
diff --git a/include/asm-powerpc/firmware.h b/include/asm-powerpc/firmware.h index abba808..3671c12 100644 --- a/include/asm-powerpc/firmware.h +++ b/include/asm-powerpc/firmware.h @@ -44,6 +44,7 @@ #define FW_FEATURE_LPAR ASM_CONST(0x0000000000400000) #define FW_FEATURE_PS3_LV1 ASM_CONST(0x0000000000800000) #define FW_FEATURE_BEAT ASM_CONST(0x0000000001000000) +#define FW_FEATURE_BULK_REMOVE ASM_CONST(0x0000000002000000) #ifndef __ASSEMBLY__ diff --git a/include/asm-powerpc/kprobes.h b/include/asm-powerpc/kprobes.h index 2dafa37..3a5dd49 100644 --- a/include/asm-powerpc/kprobes.h +++ b/include/asm-powerpc/kprobes.h @@ -44,6 +44,7 @@ typedef unsigned int kprobe_opcode_t; #define IS_TDI(instr) (((instr) & 0xfc000000) == 0x08000000) #define IS_TWI(instr) (((instr) & 0xfc000000) == 0x0c000000) +#ifdef CONFIG_PPC64 /* * 64bit powerpc uses function descriptors. * Handle cases where: @@ -67,9 +68,13 @@ typedef unsigned int kprobe_opcode_t; } #define JPROBE_ENTRY(pentry) (kprobe_opcode_t *)((func_descr_t *)pentry) - #define is_trap(instr) (IS_TW(instr) || IS_TD(instr) || \ IS_TWI(instr) || IS_TDI(instr)) +#else +/* Use stock kprobe_lookup_name since ppc32 doesn't use function descriptors */ +#define JPROBE_ENTRY(pentry) (kprobe_opcode_t *)(pentry) +#define is_trap(instr) (IS_TW(instr) || IS_TWI(instr)) +#endif #define ARCH_SUPPORTS_KRETPROBES #define ARCH_INACTIVE_KPROBE_COUNT 1 diff --git a/include/asm-powerpc/mpc52xx.h b/include/asm-powerpc/mpc52xx.h index 4560d72..7afd5bf 100644 --- a/include/asm-powerpc/mpc52xx.h +++ b/include/asm-powerpc/mpc52xx.h @@ -249,6 +249,8 @@ extern void mpc52xx_declare_of_platform_devices(void); extern void mpc52xx_init_irq(void); extern unsigned int mpc52xx_get_irq(void); +extern int __init mpc52xx_add_bridge(struct device_node *node); + #endif /* __ASSEMBLY__ */ #endif /* __ASM_POWERPC_MPC52xx_H__ */ diff --git a/include/asm-powerpc/sstep.h b/include/asm-powerpc/sstep.h index 630a988..f593b0f 100644 --- a/include/asm-powerpc/sstep.h +++ b/include/asm-powerpc/sstep.h @@ -21,6 +21,7 @@ struct pt_regs; */ #define IS_MTMSRD(instr) (((instr) & 0xfc0007be) == 0x7c000124) #define IS_RFID(instr) (((instr) & 0xfc0007fe) == 0x4c000024) +#define IS_RFI(instr) (((instr) & 0xfc0007fe) == 0x4c000064) /* Emulate instructions that cause a transfer of control. */ extern int emulate_step(struct pt_regs *regs, unsigned int instr); |