diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-12 22:21:15 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-12 22:21:15 -0400 |
| commit | b6897130f0ac8ac33043be736770eb5f58164044 (patch) | |
| tree | c922f449e0ba26e225795684f2ef46954406c7c0 /arch/powerpc/include/uapi/asm/bitsperlong.h | |
| parent | b4fe19f78e84813e720d0f0482da22194a7728e3 (diff) | |
| parent | fd3bc66f1dd5d062b5f0a7afc90c69d8da5b42db (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
Pull powerpc uapi disintegration from Benjamin Herrenschmidt.
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
UAPI: (Scripted) Disintegrate arch/powerpc/include/asm
Diffstat (limited to 'arch/powerpc/include/uapi/asm/bitsperlong.h')
| -rw-r--r-- | arch/powerpc/include/uapi/asm/bitsperlong.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/powerpc/include/uapi/asm/bitsperlong.h b/arch/powerpc/include/uapi/asm/bitsperlong.h new file mode 100644 index 000000000000..5f1659032c40 --- /dev/null +++ b/arch/powerpc/include/uapi/asm/bitsperlong.h | |||
| @@ -0,0 +1,12 @@ | |||
| 1 | #ifndef __ASM_POWERPC_BITSPERLONG_H | ||
| 2 | #define __ASM_POWERPC_BITSPERLONG_H | ||
| 3 | |||
| 4 | #if defined(__powerpc64__) | ||
| 5 | # define __BITS_PER_LONG 64 | ||
| 6 | #else | ||
| 7 | # define __BITS_PER_LONG 32 | ||
| 8 | #endif | ||
| 9 | |||
| 10 | #include <asm-generic/bitsperlong.h> | ||
| 11 | |||
| 12 | #endif /* __ASM_POWERPC_BITSPERLONG_H */ | ||