diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-30 20:06:13 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-30 20:06:13 +0400 |
| commit | 021fad8b706849c091f6e682bc5df3ce4f9ab4d7 (patch) | |
| tree | 471aacadc425fcb725ea293637e34d813b666b5d /lib | |
| parent | e9a5f426b85e429bffaee4e0b086b1e742a39fa6 (diff) | |
| parent | 1ba4f22c426ba04b00fd717318d50620c621a0e1 (diff) | |
| download | linux-021fad8b706849c091f6e682bc5df3ce4f9ab4d7.tar.xz | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, cpufeature: Unbreak compile with gcc 3.x
x86, pat: Fix memory leak in free_memtype
x86, k8: Fix section mismatch for powernowk8_exit()
lib/atomic64_test: fix missing include of linux/kernel.h
x86: remove last traces of quicklist usage
x86, setup: Phoenix BIOS fixup is needed on Dell Inspiron Mini 1012
x86: "nosmp" command line option should force the system into UP mode
arch/x86/pci: use kasprintf
x86, apic: ack all pending irqs when crashed/on kexec
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/atomic64_test.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/atomic64_test.c b/lib/atomic64_test.c index 65e482caf5e9..9087d71537dd 100644 --- a/lib/atomic64_test.c +++ b/lib/atomic64_test.c @@ -9,6 +9,7 @@ * (at your option) any later version. */ #include <linux/init.h> +#include <linux/kernel.h> #include <asm/atomic.h> #define INIT(c) do { atomic64_set(&v, c); r = c; } while (0) |