diff options
author | Anton Blanchard <anton@samba.org> | 2014-06-04 18:04:39 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-06-04 23:20:41 -0400 |
commit | 2ac7b0166a9bc743893be3f38e7b1729ce975ab9 (patch) | |
tree | b8c00f151cc95552bff4db7b868e9627a6f816c5 | |
parent | 6d97d7a28faf19199da12f2512cc7d37dd373cc0 (diff) |
powerpc: Exported functions __clear_user and copy_page use r2 so need _GLOBAL_TOC()
__clear_user and copy_page load from the TOC and are also exported
to modules. This means we have to use _GLOBAL_TOC() so that we
create the global entry point that sets up the TOC.
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
-rw-r--r-- | arch/powerpc/lib/copypage_64.S | 2 | ||||
-rw-r--r-- | arch/powerpc/lib/string_64.S | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/lib/copypage_64.S b/arch/powerpc/lib/copypage_64.S index e59c9c2ebe98..a3c4dc4defdd 100644 --- a/arch/powerpc/lib/copypage_64.S +++ b/arch/powerpc/lib/copypage_64.S | |||
@@ -16,7 +16,7 @@ PPC64_CACHES: | |||
16 | .tc ppc64_caches[TC],ppc64_caches | 16 | .tc ppc64_caches[TC],ppc64_caches |
17 | .section ".text" | 17 | .section ".text" |
18 | 18 | ||
19 | _GLOBAL(copy_page) | 19 | _GLOBAL_TOC(copy_page) |
20 | BEGIN_FTR_SECTION | 20 | BEGIN_FTR_SECTION |
21 | lis r5,PAGE_SIZE@h | 21 | lis r5,PAGE_SIZE@h |
22 | FTR_SECTION_ELSE | 22 | FTR_SECTION_ELSE |
diff --git a/arch/powerpc/lib/string_64.S b/arch/powerpc/lib/string_64.S index 3b1e48049faf..7bd9549a90a2 100644 --- a/arch/powerpc/lib/string_64.S +++ b/arch/powerpc/lib/string_64.S | |||
@@ -77,7 +77,7 @@ err3; stb r0,0(r3) | |||
77 | mr r3,r4 | 77 | mr r3,r4 |
78 | blr | 78 | blr |
79 | 79 | ||
80 | _GLOBAL(__clear_user) | 80 | _GLOBAL_TOC(__clear_user) |
81 | cmpdi r4,32 | 81 | cmpdi r4,32 |
82 | neg r6,r3 | 82 | neg r6,r3 |
83 | li r0,0 | 83 | li r0,0 |