Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull asm/x86 changes from Ingo Molnar: "Misc changes, with a bigger processor-flags cleanup/reorganization by Peter Anvin" * 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86, asm, cleanup: Replace open-coded control register values with symbolic x86, processor-flags: Fix the datatypes and add bit number defines x86: Rename X86_CR4_RDWRGSFS to X86_CR4_FSGSBASE x86, flags: Rename X86_EFLAGS_BIT1 to X86_EFLAGS_FIXED linux/const.h: Add _BITUL() and _BITULL() x86/vdso: Convert use of typedef ctl_table to struct ctl_table x86: __force_order doesn't need to be an actual variable

Linus Torvalds committed 13 years ago

Commit 002e44b2 parents e13053f a3d7b7d14 files · +120 −63Browse files

Showing the changes to include/uapi (1 of 14 files). Show all

Unified · Split

include/uapi/linux/const.h+3−0

@@ -21,4 +21,7 @@ · 20 unmodified lines
21	21	#define _AT(T,X) ((T)(X))
22	22	#endif
23	23
	24	+#define _BITUL(x) (_AC(1,UL) << (x))
	25	+#define _BITULL(x) (_AC(1,ULL) << (x))
	26	+
24	27	#endif /* !(_LINUX_CONST_H) */