fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / include / asm-powerpc / processor.h

diff --git a/include/asm-powerpc/processor.h b/include/asm-powerpc/processor.h
index ee810c6..a26c32e 100644 (file)
--- a/include/asm-powerpc/processor.h
+++ b/include/asm-powerpc/processor.h
@@ -32,6 +32,7 @@
 #define _CHRP_Motorola 0x04    /* motorola chrp, the cobra */
 #define _CHRP_IBM      0x05    /* IBM chrp, the longtrail and longtrail 2 */
 #define _CHRP_Pegasos  0x06    /* Genesi/bplan's Pegasos and Pegasos2 */
+#define _CHRP_briq     0x07    /* TotalImpact's briQ */
 
 #if defined(__KERNEL__) && defined(CONFIG_PPC32)
 
@@ -52,10 +53,6 @@ extern unsigned char ucBoardRevMaj, ucBoardRevMin;
 
 #endif /* CONFIG_PPC_PREP */
 
-#ifndef CONFIG_PPC_MULTIPLATFORM
-#define _machine 0
-#endif /* CONFIG_PPC_MULTIPLATFORM */
-
 #endif /* defined(__KERNEL__) && defined(CONFIG_PPC32) */
 
 /*
@@ -273,23 +270,6 @@ static inline void prefetchw(const void *x)
 #define HAVE_ARCH_PICK_MMAP_LAYOUT
 #endif
 
-#ifdef CONFIG_PPC_CELL /* MAMBO SIMULATION code */
-#define MSR_SIM_LG      29
-#define MSR_SIM         __MASK(MSR_SIM_LG)
-
-static __inline__ int __onsim(void)
-{
-        unsigned long msr;
-        __asm__ __volatile__ ("mfmsr    %0" : "=&r" (msr));
-        return ((msr & MSR_SIM) ? 1 : 0);
-}
-#endif /* CONFIG_PPC_CELL */
-
 #endif /* __KERNEL__ */
-#else
-/* must be given a register to perform the compare, set cr0 = 1
- * Usage: __onsim(r0); bne _if_onsim
- */
-#define __onsim(r) mfmsr        r; rldicl. r,r,35,63
 #endif /* __ASSEMBLY__ */
 #endif /* _ASM_POWERPC_PROCESSOR_H */