diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-05 05:06:47 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-05 05:06:47 -0500 |
| commit | 508827ff0ac3981d420edac64a70de7f4e304d38 (patch) | |
| tree | b0cee8ddef9f0ceab68c388e4ae46b7295eb2cb5 /arch/powerpc/include/asm/compat.h | |
| parent | 2c3c3d02f28801d7ad2da4952b2c7ca6621ef221 (diff) | |
| parent | 72e2240f181871675d3a979766330c91d48a1673 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/tokenring/tmspci.c
drivers/net/ucc_geth_mii.c
Diffstat (limited to 'arch/powerpc/include/asm/compat.h')
| -rw-r--r-- | arch/powerpc/include/asm/compat.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/compat.h b/arch/powerpc/include/asm/compat.h index d811a8cd7b58..4774c2f92232 100644 --- a/arch/powerpc/include/asm/compat.h +++ b/arch/powerpc/include/asm/compat.h | |||
| @@ -210,5 +210,10 @@ struct compat_shmid64_ds { | |||
| 210 | compat_ulong_t __unused6; | 210 | compat_ulong_t __unused6; |
| 211 | }; | 211 | }; |
| 212 | 212 | ||
| 213 | static inline int is_compat_task(void) | ||
| 214 | { | ||
| 215 | return test_thread_flag(TIF_32BIT); | ||
| 216 | } | ||
| 217 | |||
| 213 | #endif /* __KERNEL__ */ | 218 | #endif /* __KERNEL__ */ |
| 214 | #endif /* _ASM_POWERPC_COMPAT_H */ | 219 | #endif /* _ASM_POWERPC_COMPAT_H */ |