diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 13:03:44 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 13:03:44 -0500 |
| commit | 6150c32589d1976ca8a5c987df951088c05a7542 (patch) | |
| tree | 94073696576323ff966e365d8c47b8ecd8372f97 /arch/ppc/boot/common/util.S | |
| parent | 44637a12f80b80157d9c1bc5b7d6ef09c9e05713 (diff) | |
| parent | be42d5fa3772241b8ecebd443f1fb36247959c54 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'arch/ppc/boot/common/util.S')
| -rw-r--r-- | arch/ppc/boot/common/util.S | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/ppc/boot/common/util.S b/arch/ppc/boot/common/util.S index c96c9f80521e..368ec035e6cd 100644 --- a/arch/ppc/boot/common/util.S +++ b/arch/ppc/boot/common/util.S | |||
| @@ -234,7 +234,8 @@ udelay: | |||
| 234 | * First, flush the data cache in case it was enabled and may be | 234 | * First, flush the data cache in case it was enabled and may be |
| 235 | * holding instructions for copy back. | 235 | * holding instructions for copy back. |
| 236 | */ | 236 | */ |
| 237 | _GLOBAL(flush_instruction_cache) | 237 | .globl flush_instruction_cache |
| 238 | flush_instruction_cache: | ||
| 238 | mflr r6 | 239 | mflr r6 |
| 239 | bl flush_data_cache | 240 | bl flush_data_cache |
| 240 | 241 | ||
| @@ -279,7 +280,8 @@ _GLOBAL(flush_instruction_cache) | |||
| 279 | * Flush data cache | 280 | * Flush data cache |
| 280 | * Do this by just reading lots of stuff into the cache. | 281 | * Do this by just reading lots of stuff into the cache. |
| 281 | */ | 282 | */ |
| 282 | _GLOBAL(flush_data_cache) | 283 | .globl flush_data_cache |
| 284 | flush_data_cache: | ||
| 283 | lis r3,cache_flush_buffer@h | 285 | lis r3,cache_flush_buffer@h |
| 284 | ori r3,r3,cache_flush_buffer@l | 286 | ori r3,r3,cache_flush_buffer@l |
| 285 | li r4,NUM_CACHE_LINES | 287 | li r4,NUM_CACHE_LINES |