summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@home.osdl.org>2003-07-25 01:41:19 -0700
committerLinus Torvalds <torvalds@home.osdl.org>2003-07-25 01:41:19 -0700
commit22dc96644644644d131aea08d4b0bbe80f4bc64e (patch)
tree1b6cc4b9467c8e5033836549e893542ba1d69573 /include
parent314635e1132bddd57d293550f34dca8f3c19d20a (diff)
parentd0e99679c0d4109dfdbe688979210cba21275b59 (diff)
Merge bk://ppc.bkbits.net/for-linus-ppc
into home.osdl.org:/home/torvalds/v2.5/linux
Diffstat (limited to 'include')
-rw-r--r--include/asm-ppc/local.h6
-rw-r--r--include/asm-ppc/sections.h4
2 files changed, 10 insertions, 0 deletions
diff --git a/include/asm-ppc/local.h b/include/asm-ppc/local.h
new file mode 100644
index 000000000000..b08e3eced10e
--- /dev/null
+++ b/include/asm-ppc/local.h
@@ -0,0 +1,6 @@
+#ifndef __PPC_LOCAL_H
+#define __PPC_LOCAL_H
+
+#include <asm-generic/local.h>
+
+#endif /* __PPC_LOCAL_H */
diff --git a/include/asm-ppc/sections.h b/include/asm-ppc/sections.h
index 564e1e58f141..0a06f83dd543 100644
--- a/include/asm-ppc/sections.h
+++ b/include/asm-ppc/sections.h
@@ -2,6 +2,10 @@
#ifndef _PPC_SECTIONS_H
#define _PPC_SECTIONS_H
+#include <asm-generic/sections.h>
+
+extern char _end[];
+
#define __pmac __attribute__ ((__section__ (".pmac.text")))
#define __pmacdata __attribute__ ((__section__ (".pmac.data")))
#define __pmacfunc(__argpmac) \