diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
| commit | a815752ac0ffdb910e92958d41d28f4fb28e5296 (patch) | |
| tree | a3aa16a282354da0debe8e3a3a7ed8aac6e54001 /include/asm-powerpc/unaligned.h | |
| parent | 5ade9deaaa3e1f7291467d97b238648e43eae15e (diff) | |
| parent | a15306365a16380f3bafee9e181ba01231d4acd7 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-powerpc/unaligned.h')
| -rw-r--r-- | include/asm-powerpc/unaligned.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/include/asm-powerpc/unaligned.h b/include/asm-powerpc/unaligned.h index 6c95dfa2652f..5f1b1e3c2137 100644 --- a/include/asm-powerpc/unaligned.h +++ b/include/asm-powerpc/unaligned.h | |||
| @@ -5,15 +5,12 @@ | |||
| 5 | 5 | ||
| 6 | /* | 6 | /* |
| 7 | * The PowerPC can do unaligned accesses itself in big endian mode. | 7 | * The PowerPC can do unaligned accesses itself in big endian mode. |
| 8 | * | ||
| 9 | * The strange macros are there to make sure these can't | ||
| 10 | * be misused in a way that makes them not work on other | ||
| 11 | * architectures where unaligned accesses aren't as simple. | ||
| 12 | */ | 8 | */ |
| 9 | #include <linux/unaligned/access_ok.h> | ||
| 10 | #include <linux/unaligned/generic.h> | ||
| 13 | 11 | ||
| 14 | #define get_unaligned(ptr) (*(ptr)) | 12 | #define get_unaligned __get_unaligned_be |
| 15 | 13 | #define put_unaligned __put_unaligned_be | |
| 16 | #define put_unaligned(val, ptr) ((void)( *(ptr) = (val) )) | ||
| 17 | 14 | ||
| 18 | #endif /* __KERNEL__ */ | 15 | #endif /* __KERNEL__ */ |
| 19 | #endif /* _ASM_POWERPC_UNALIGNED_H */ | 16 | #endif /* _ASM_POWERPC_UNALIGNED_H */ |