diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-10 02:29:57 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-10 02:29:57 -0500 |
| commit | 0b6ca82af83a79f3d1001c8a0701ed34ac38126e (patch) | |
| tree | def8eb112c513b21e826e370f2f34249e97914eb /include/linux | |
| parent | bfc1de0c40a26c6daa46c297e28138aecb4c5664 (diff) | |
| parent | fac84939609a683503947f41eb93e1917d026263 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
* git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86: (32 commits)
x86: cpa, strict range check in try_preserve_large_page()
x86: cpa, enable CONFIG_DEBUG_PAGEALLOC on 64-bit
x86: cpa, use page pool
x86: introduce page pool in cpa
x86: DEBUG_PAGEALLOC: enable after mem_init()
brk: help text typo fix
lguest: accept guest _PAGE_PWT page table entries
x86 PM: update stale comments
x86 PM: consolidate suspend and hibernation code
x86 PM: rename 32-bit files in arch/x86/power
x86 PM: move 64-bit hibernation files to arch/x86/power
x86: trivial printk optimizations
x86: fix early_ioremap pagetable ops
x86: construct 32-bit boot time page tables in native format.
x86, core: remove CONFIG_FORCED_INLINING
x86: avoid unused variable warning in mm/init_64.c
x86: fixup more paravirt fallout
brk: document randomize_va_space and CONFIG_COMPAT_BRK (was Re:
x86: fix sparse warnings in acpi/bus.c
x86: fix sparse warning in topology.c
...
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/compiler-gcc4.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h index 0ab3a3232330..974f5b7bb205 100644 --- a/include/linux/compiler-gcc4.h +++ b/include/linux/compiler-gcc4.h | |||
| @@ -5,15 +5,6 @@ | |||
| 5 | /* These definitions are for GCC v4.x. */ | 5 | /* These definitions are for GCC v4.x. */ |
| 6 | #include <linux/compiler-gcc.h> | 6 | #include <linux/compiler-gcc.h> |
| 7 | 7 | ||
| 8 | #ifdef CONFIG_FORCED_INLINING | ||
| 9 | # undef inline | ||
| 10 | # undef __inline__ | ||
| 11 | # undef __inline | ||
| 12 | # define inline inline __attribute__((always_inline)) | ||
| 13 | # define __inline__ __inline__ __attribute__((always_inline)) | ||
| 14 | # define __inline __inline __attribute__((always_inline)) | ||
| 15 | #endif | ||
| 16 | |||
| 17 | #define __used __attribute__((__used__)) | 8 | #define __used __attribute__((__used__)) |
| 18 | #define __must_check __attribute__((warn_unused_result)) | 9 | #define __must_check __attribute__((warn_unused_result)) |
| 19 | #define __compiler_offsetof(a,b) __builtin_offsetof(a,b) | 10 | #define __compiler_offsetof(a,b) __builtin_offsetof(a,b) |