summaryrefslogtreecommitdiffstats
path: root/include/asm-ppc64/system.h
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-08-30 13:32:29 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-08-30 13:32:29 -0400
commited735ccbefaf7e5e3ef61418f7e209b8c59308a7 (patch)
treeb8cc69814d2368b08d0a84c8da0c12028bd04867 /include/asm-ppc64/system.h
parent39fbe47377062200acc26ea0ccef223b4399a82c (diff)
parentd8971fcb702e24d1e22c77fd1772f182ffee87e3 (diff)
downloadop-kernel-dev-ed735ccbefaf7e5e3ef61418f7e209b8c59308a7.zip
op-kernel-dev-ed735ccbefaf7e5e3ef61418f7e209b8c59308a7.tar.gz
Merge HEAD from /spare/repo/linux-2.6/.git
Diffstat (limited to 'include/asm-ppc64/system.h')
-rw-r--r--include/asm-ppc64/system.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/asm-ppc64/system.h b/include/asm-ppc64/system.h
index 98d120c..b9e1835 100644
--- a/include/asm-ppc64/system.h
+++ b/include/asm-ppc64/system.h
@@ -88,7 +88,7 @@ DEBUGGER_BOILERPLATE(debugger_dabr_match)
DEBUGGER_BOILERPLATE(debugger_fault_handler)
#ifdef CONFIG_XMON
-extern void xmon_init(void);
+extern void xmon_init(int enable);
#endif
#else
@@ -302,5 +302,7 @@ __cmpxchg(volatile void *ptr, unsigned long old, unsigned long new, int size)
#define arch_align_stack(x) (x)
+extern unsigned long reloc_offset(void);
+
#endif /* __KERNEL__ */
#endif
OpenPOWER on IntegriCloud