diff options
| author | Greg KH <gregkh@suse.de> | 2005-09-12 12:45:04 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-09-12 12:45:04 -0700 |
| commit | d58dde0f552a5c5c4485b962d8b6e9dd54fefb30 (patch) | |
| tree | d9a7e35eb88fea6265d5aadcc3d4ed39122b052a /arch/ppc/platforms/pmac_sleep.S | |
| parent | 877599fdef5ea4a7dd1956e22fa9d6923add97f8 (diff) | |
| parent | 2ade81473636b33aaac64495f89a7dc572c529f0 (diff) | |
| download | op-kernel-dev-d58dde0f552a5c5c4485b962d8b6e9dd54fefb30.zip op-kernel-dev-d58dde0f552a5c5c4485b962d8b6e9dd54fefb30.tar.gz | |
Merge ../torvalds-2.6/
Diffstat (limited to 'arch/ppc/platforms/pmac_sleep.S')
| -rw-r--r-- | arch/ppc/platforms/pmac_sleep.S | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/ppc/platforms/pmac_sleep.S b/arch/ppc/platforms/pmac_sleep.S index 016a746..88419c7 100644 --- a/arch/ppc/platforms/pmac_sleep.S +++ b/arch/ppc/platforms/pmac_sleep.S @@ -17,7 +17,7 @@ #include <asm/cputable.h> #include <asm/cache.h> #include <asm/thread_info.h> -#include <asm/offsets.h> +#include <asm/asm-offsets.h> #define MAGIC 0x4c617273 /* 'Lars' */ @@ -161,6 +161,8 @@ _GLOBAL(low_sleep_handler) addi r3,r3,sleep_storage@l stw r5,0(r3) + .globl low_cpu_die +low_cpu_die: /* Flush & disable all caches */ bl flush_disable_caches |
