diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-05 12:06:40 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-05 12:06:40 -0700 |
commit | ef790fe022916a225f7ba7fc565ffc51404655f7 (patch) | |
tree | d823fd977ba37d0e1e956736d33f28e185b9d721 /arch/sparc/oprofile/init.c | |
parent | ed3c661448a1b4b0b07c0a0d3c6e8a19c7d0ffd7 (diff) | |
parent | c4a57435db67c4522c2e688c357051f35e36d6d6 (diff) | |
download | kernel_samsung_smdk4412-ef790fe022916a225f7ba7fc565ffc51404655f7.zip kernel_samsung_smdk4412-ef790fe022916a225f7ba7fc565ffc51404655f7.tar.gz kernel_samsung_smdk4412-ef790fe022916a225f7ba7fc565ffc51404655f7.tar.bz2 |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc: using HZ needs an include of linux/param.h
sparc32: convert to asm-generic/hardirq.h
sparc64: Cache per-cpu %pcr register value in perf code.
sparc64: Fix comment typo in perf_event.c
sparc64: Minor coding style fixups in perf code.
sparc64: Add a basic conflict engine in preparation for multi-counter support.
sparc64: Increase vmalloc size to fix percpu regressions.
sparc64: Add initial perf event conflict resolution and checks.
sparc: Niagara1 perf event support.
sparc: Add Niagara2 HW cache event support.
sparc: Support all ultra3 and ultra4 derivatives.
sparc: Support HW cache events.
Diffstat (limited to 'arch/sparc/oprofile/init.c')
-rw-r--r-- | arch/sparc/oprofile/init.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sparc/oprofile/init.c b/arch/sparc/oprofile/init.c index f97cb8b..f9024bc 100644 --- a/arch/sparc/oprofile/init.c +++ b/arch/sparc/oprofile/init.c @@ -11,6 +11,7 @@ #include <linux/oprofile.h> #include <linux/errno.h> #include <linux/init.h> +#include <linux/param.h> /* for HZ */ #ifdef CONFIG_SPARC64 #include <linux/notifier.h> |