diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-03 11:14:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-03 11:14:04 -0700 |
| commit | e39dfe52f8f67061317e7108f62a2b33a3d06580 (patch) | |
| tree | 831ac8b5c012c868f1af50e7843c6598390d9fff /arch/ia64/kernel/setup.c | |
| parent | ab5348573908dedb62dd906aa60c5989fecfe38f (diff) | |
| parent | ccce9bb83ed20bca52f82ff9d7cf889d23a2ec01 (diff) | |
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/setup.c')
| -rw-r--r-- | arch/ia64/kernel/setup.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c index 13bfdd22afc..4fc2e9569bb 100644 --- a/arch/ia64/kernel/setup.c +++ b/arch/ia64/kernel/setup.c @@ -748,7 +748,7 @@ const struct seq_operations cpuinfo_op = { #define MAX_BRANDS 8 static char brandname[MAX_BRANDS][128]; -static char * __cpuinit +static char * get_model_name(__u8 family, __u8 model) { static int overflow; @@ -778,7 +778,7 @@ get_model_name(__u8 family, __u8 model) return "Unknown"; } -static void __cpuinit +static void identify_cpu (struct cpuinfo_ia64 *c) { union { @@ -850,7 +850,7 @@ identify_cpu (struct cpuinfo_ia64 *c) * 2. the minimum of the i-cache stride sizes for "flush_icache_range()". * 3. the minimum of the cache stride sizes for "clflush_cache_range()". */ -static void __cpuinit +static void get_cache_info(void) { unsigned long line_size, max = 1; @@ -915,10 +915,10 @@ get_cache_info(void) * cpu_init() initializes state that is per-CPU. This function acts * as a 'CPU state barrier', nothing should get across. */ -void __cpuinit +void cpu_init (void) { - extern void __cpuinit ia64_mmu_init (void *); + extern void ia64_mmu_init(void *); static unsigned long max_num_phys_stacked = IA64_NUM_PHYS_STACK_REG; unsigned long num_phys_stacked; pal_vm_info_2_u_t vmi; |