patch-2.4.19 linux-2.4.19/include/asm-ppc/prom.h

Next file: linux-2.4.19/include/asm-ppc/ptrace.h
Previous file: linux-2.4.19/include/asm-ppc/processor.h
Back to the patch index
Back to the overall index

diff -urN linux-2.4.18/include/asm-ppc/prom.h linux-2.4.19/include/asm-ppc/prom.h
@@ -1,5 +1,5 @@
 /*
- * BK Id: SCCS/s.prom.h 1.21 12/01/01 20:09:11 benh
+ * BK Id: SCCS/s.prom.h 1.24 04/09/02 21:01:58 paulus
  */
 /*
  * Definitions for talking to the Open Firmware PROM on
@@ -107,10 +107,11 @@
  * pointer values.  See arch/ppc/kernel/prom.c for how these are used.
  */
 extern unsigned long reloc_offset(void);
+extern unsigned long add_reloc_offset(unsigned long);
+extern unsigned long sub_reloc_offset(unsigned long);
 
-#define PTRRELOC(x)	((typeof(x))((unsigned long)(x) + offset))
-#define PTRUNRELOC(x)	((typeof(x))((unsigned long)(x) - offset))
-#define RELOC(x)	(*PTRRELOC(&(x)))
+#define PTRRELOC(x)	((typeof(x))add_reloc_offset((unsigned long)(x)))
+#define PTRUNRELOC(x)	((typeof(x))sub_reloc_offset((unsigned long)(x)))
 
 #endif /* _PPC_PROM_H */
 #endif /* __KERNEL__ */

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)