diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 13:03:44 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 13:03:44 -0500 |
| commit | 6150c32589d1976ca8a5c987df951088c05a7542 (patch) | |
| tree | 94073696576323ff966e365d8c47b8ecd8372f97 /include/asm-powerpc/ppc_asm.h | |
| parent | 44637a12f80b80157d9c1bc5b7d6ef09c9e05713 (diff) | |
| parent | be42d5fa3772241b8ecebd443f1fb36247959c54 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'include/asm-powerpc/ppc_asm.h')
| -rw-r--r-- | include/asm-powerpc/ppc_asm.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/asm-powerpc/ppc_asm.h b/include/asm-powerpc/ppc_asm.h index c27baa0563fe..0dc798d46ea4 100644 --- a/include/asm-powerpc/ppc_asm.h +++ b/include/asm-powerpc/ppc_asm.h | |||
| @@ -94,6 +94,7 @@ | |||
| 94 | #define RFDI .long 0x4c00004e /* rfdi instruction */ | 94 | #define RFDI .long 0x4c00004e /* rfdi instruction */ |
| 95 | #define RFMCI .long 0x4c00004c /* rfmci instruction */ | 95 | #define RFMCI .long 0x4c00004c /* rfmci instruction */ |
| 96 | 96 | ||
| 97 | #ifdef __KERNEL__ | ||
| 97 | #ifdef CONFIG_PPC64 | 98 | #ifdef CONFIG_PPC64 |
| 98 | 99 | ||
| 99 | #define XGLUE(a,b) a##b | 100 | #define XGLUE(a,b) a##b |
| @@ -325,6 +326,8 @@ END_FTR_SECTION_IFCLR(CPU_FTR_601) | |||
| 325 | #define CLR_TOP32(r) | 326 | #define CLR_TOP32(r) |
| 326 | #endif | 327 | #endif |
| 327 | 328 | ||
| 329 | #endif /* __KERNEL__ */ | ||
| 330 | |||
| 328 | /* The boring bits... */ | 331 | /* The boring bits... */ |
| 329 | 332 | ||
| 330 | /* Condition Register Bit Fields */ | 333 | /* Condition Register Bit Fields */ |