Merge branch 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc

1 files changed, 2 insertions, 34 deletions

diff --git a/include/asm-ppc/reg_booke.h b/include/asm-ppc/reg_booke.h
index 602fbadeaf48..a263fc1e65c4 100644
--- a/include/asm-ppc/reg_booke.h
+++ b/include/asm-ppc/reg_booke.h
@@ -9,41 +9,9 @@
 #ifndef __ASM_PPC_REG_BOOKE_H__
 #define __ASM_PPC_REG_BOOKE_H__
 
-#ifndef __ASSEMBLY__
-/* Device Control Registers */
-void __mtdcr(int reg, unsigned int val);
-unsigned int __mfdcr(int reg);
-#define mfdcr(rn)                                               \
-        ({unsigned int rval;                                    \
-        if (__builtin_constant_p(rn))                           \
-                asm volatile("mfdcr %0," __stringify(rn)        \
-                              : "=r" (rval));                   \
-        else                                                    \
-                rval = __mfdcr(rn);                             \
-        rval;})
-
-#define mtdcr(rn, v)                                            \
-do {                                                            \
-        if (__builtin_constant_p(rn))                           \
-                asm volatile("mtdcr " __stringify(rn) ",%0"     \
-                              : : "r" (v));                     \
-        else                                                    \
-                __mtdcr(rn, v);                                 \
-} while (0)
-
-/* R/W of indirect DCRs make use of standard naming conventions for DCRs */
-#define mfdcri(base, reg)                       \
-({                                              \
-        mtdcr(base ## _CFGADDR, base ## _ ## reg);      \
-        mfdcr(base ## _CFGDATA);                        \
-})
-
-#define mtdcri(base, reg, data)                 \
-do {                                            \
-        mtdcr(base ## _CFGADDR, base ## _ ## reg);      \
-        mtdcr(base ## _CFGDATA, data);          \
-} while (0)
+#include <asm/dcr.h>
 
+#ifndef __ASSEMBLY__
 /* Performance Monitor Registers */
 #define mfpmr(rn)       ({unsigned int rval; \
                         asm volatile("mfpmr %0," __stringify(rn) \