diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-03 18:14:04 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-03 18:14:04 (GMT) |
| commit | e39dfe52f8f67061317e7108f62a2b33a3d06580 (patch) | |
| tree | 831ac8b5c012c868f1af50e7843c6598390d9fff /arch/ia64/kernel/salinfo.c | |
| parent | ab5348573908dedb62dd906aa60c5989fecfe38f (diff) | |
| parent | ccce9bb83ed20bca52f82ff9d7cf889d23a2ec01 (diff) | |
| download | linux-e39dfe52f8f67061317e7108f62a2b33a3d06580.tar.xz | |
Merge tag 'please-pull-misc-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
Pull misc ia64 updates from Tony Luck:
"Miscellaneous ia64 changes for 3.11 merge window"
* tag 'please-pull-misc-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
[IA64] Delete __cpuinit usage from all ia64 users
[IA64] hpsim: Fix check for overlong simscsi prefix.
[IA64] pci: Remove unused fallback_dev
[IA64] perfmon: Use %*phD specifier to dump small buffers
[IA64] Fix trap #45 handling
Diffstat (limited to 'arch/ia64/kernel/salinfo.c')
| -rw-r--r-- | arch/ia64/kernel/salinfo.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/kernel/salinfo.c b/arch/ia64/kernel/salinfo.c index 4bc580a..960a396 100644 --- a/arch/ia64/kernel/salinfo.c +++ b/arch/ia64/kernel/salinfo.c @@ -568,7 +568,7 @@ static const struct file_operations salinfo_data_fops = { .llseek = default_llseek, }; -static int __cpuinit +static int salinfo_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu) { unsigned int i, cpu = (unsigned long)hcpu; @@ -609,7 +609,7 @@ salinfo_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu return NOTIFY_OK; } -static struct notifier_block salinfo_cpu_notifier __cpuinitdata = +static struct notifier_block salinfo_cpu_notifier = { .notifier_call = salinfo_cpu_callback, .priority = 0, |