Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit e39dfe5

Browse files
torvaldstorvalds
committed
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
2 parents ab53485 + ccce9bb commit e39dfe5

File tree

18 files changed

+49
-75
lines changed

18 files changed

+49
-75
lines changed

‎arch/ia64/hp/sim/simscsi.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ simscsi_setup (char *s)
8888
if (strlen(s) > MAX_ROOT_LEN) {
8989
printk(KERN_ERR "simscsi_setup: prefix too long---using default %s\n",
9090
simscsi_root);
91-
}
92-
simscsi_root = s;
91+
} else
92+
simscsi_root = s;
9393
return 1;
9494
}
9595

‎arch/ia64/kernel/acpi.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -807,7 +807,7 @@ int acpi_isa_irq_to_gsi(unsigned isa_irq, u32 *gsi)
807807
* ACPI based hotplug CPU support
808808
*/
809809
#ifdef CONFIG_ACPI_HOTPLUG_CPU
810-
static __cpuinit
810+
static
811811
int acpi_map_cpu2node(acpi_handle handle, int cpu, int physid)
812812
{
813813
#ifdef CONFIG_ACPI_NUMA
@@ -882,7 +882,7 @@ __init void prefill_possible_map(void)
882882
set_cpu_possible(i, true);
883883
}
884884

885-
static int __cpuinit _acpi_map_lsapic(acpi_handle handle, int *pcpu)
885+
static int _acpi_map_lsapic(acpi_handle handle, int *pcpu)
886886
{
887887
struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
888888
union acpi_object *obj;

‎arch/ia64/kernel/err_inject.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -225,17 +225,17 @@ static struct attribute_group err_inject_attr_group = {
225225
.name = "err_inject"
226226
};
227227
/* Add/Remove err_inject interface for CPU device */
228-
static int __cpuinit err_inject_add_dev(struct device * sys_dev)
228+
static int err_inject_add_dev(struct device *sys_dev)
229229
{
230230
return sysfs_create_group(&sys_dev->kobj, &err_inject_attr_group);
231231
}
232232

233-
static int __cpuinit err_inject_remove_dev(struct device * sys_dev)
233+
static int err_inject_remove_dev(struct device *sys_dev)
234234
{
235235
sysfs_remove_group(&sys_dev->kobj, &err_inject_attr_group);
236236
return 0;
237237
}
238-
static int __cpuinit err_inject_cpu_callback(struct notifier_block *nfb,
238+
static int err_inject_cpu_callback(struct notifier_block *nfb,
239239
unsigned long action, void *hcpu)
240240
{
241241
unsigned int cpu = (unsigned long)hcpu;
@@ -256,7 +256,7 @@ static int __cpuinit err_inject_cpu_callback(struct notifier_block *nfb,
256256
return NOTIFY_OK;
257257
}
258258

259-
static struct notifier_block __cpuinitdata err_inject_cpu_notifier =
259+
static struct notifier_block err_inject_cpu_notifier =
260260
{
261261
.notifier_call = err_inject_cpu_callback,
262262
};

‎arch/ia64/kernel/mca.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,7 @@ ia64_mca_register_cpev (int cpev)
631631
* Outputs
632632
* None
633633
*/
634-
void __cpuinit
634+
void
635635
ia64_mca_cmc_vector_setup (void)
636636
{
637637
cmcv_reg_t cmcv;
@@ -1814,7 +1814,7 @@ static struct irqaction mca_cpep_irqaction = {
18141814
* format most of the fields.
18151815
*/
18161816

1817-
static void __cpuinit
1817+
static void
18181818
format_mca_init_stack(void *mca_data, unsigned long offset,
18191819
const char *type, int cpu)
18201820
{
@@ -1844,7 +1844,7 @@ static void * __init_refok mca_bootmem(void)
18441844
}
18451845

18461846
/* Do per-CPU MCA-related initialization. */
1847-
void __cpuinit
1847+
void
18481848
ia64_mca_cpu_init(void *cpu_data)
18491849
{
18501850
void *pal_vaddr;
@@ -1896,7 +1896,7 @@ ia64_mca_cpu_init(void *cpu_data)
18961896
PAGE_KERNEL));
18971897
}
18981898

1899-
static void __cpuinit ia64_mca_cmc_vector_adjust(void *dummy)
1899+
static void ia64_mca_cmc_vector_adjust(void *dummy)
19001900
{
19011901
unsigned long flags;
19021902

@@ -1906,7 +1906,7 @@ static void __cpuinit ia64_mca_cmc_vector_adjust(void *dummy)
19061906
local_irq_restore(flags);
19071907
}
19081908

1909-
static int __cpuinit mca_cpu_callback(struct notifier_block *nfb,
1909+
static int mca_cpu_callback(struct notifier_block *nfb,
19101910
unsigned long action,
19111911
void *hcpu)
19121912
{
@@ -1922,7 +1922,7 @@ static int __cpuinit mca_cpu_callback(struct notifier_block *nfb,
19221922
return NOTIFY_OK;
19231923
}
19241924

1925-
static struct notifier_block mca_cpu_notifier __cpuinitdata = {
1925+
static struct notifier_block mca_cpu_notifier = {
19261926
.notifier_call = mca_cpu_callback
19271927
};
19281928

‎arch/ia64/kernel/numa.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ EXPORT_SYMBOL(cpu_to_node_map);
3030
cpumask_t node_to_cpu_mask[MAX_NUMNODES] __cacheline_aligned;
3131
EXPORT_SYMBOL(node_to_cpu_mask);
3232

33-
void __cpuinit map_cpu_to_node(int cpu, int nid)
33+
void map_cpu_to_node(int cpu, int nid)
3434
{
3535
int oldnid;
3636
if (nid < 0) { /* just initialize by zero */
@@ -51,7 +51,7 @@ void __cpuinit map_cpu_to_node(int cpu, int nid)
5151
return;
5252
}
5353

54-
void __cpuinit unmap_cpu_from_node(int cpu, int nid)
54+
void unmap_cpu_from_node(int cpu, int nid)
5555
{
5656
WARN_ON(!cpu_isset(cpu, node_to_cpu_mask[nid]));
5757
WARN_ON(cpu_to_node_map[cpu] != nid);

‎arch/ia64/kernel/palinfo.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -932,7 +932,7 @@ static const struct file_operations proc_palinfo_fops = {
932932
.release = single_release,
933933
};
934934

935-
static void __cpuinit
935+
static void
936936
create_palinfo_proc_entries(unsigned int cpu)
937937
{
938938
pal_func_cpu_u_t f;
@@ -962,7 +962,7 @@ remove_palinfo_proc_entries(unsigned int hcpu)
962962
remove_proc_subtree(cpustr, palinfo_dir);
963963
}
964964

965-
static int __cpuinit palinfo_cpu_callback(struct notifier_block *nfb,
965+
static int palinfo_cpu_callback(struct notifier_block *nfb,
966966
unsigned long action, void *hcpu)
967967
{
968968
unsigned int hotcpu = (unsigned long)hcpu;

‎arch/ia64/kernel/pci-dma.c‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,6 @@ int force_iommu __read_mostly;
3333

3434
int iommu_pass_through;
3535

36-
/* Dummy device used for NULL arguments (normally ISA). Better would
37-
be probably a smaller DMA mask, but this is bug-to-bug compatible
38-
to i386. */
39-
struct device fallback_dev = {
40-
.init_name = "fallback device",
41-
.coherent_dma_mask = DMA_BIT_MASK(32),
42-
.dma_mask = &fallback_dev.coherent_dma_mask,
43-
};
44-
4536
extern struct dma_map_ops intel_dma_ops;
4637

4738
static int __init pci_iommu_init(void)

‎arch/ia64/kernel/perfmon.c‎

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5647,24 +5647,8 @@ pfm_proc_show_header(struct seq_file *m)
56475647

56485648
list_for_each(pos, &pfm_buffer_fmt_list) {
56495649
entry = list_entry(pos, pfm_buffer_fmt_t, fmt_list);
5650-
seq_printf(m, "format : %02x-%02x-%02x-%02x-%02x-%02x-%02x-%02x-%02x-%02x-%02x-%02x-%02x-%02x-%02x-%02x %s\n",
5651-
entry->fmt_uuid[0],
5652-
entry->fmt_uuid[1],
5653-
entry->fmt_uuid[2],
5654-
entry->fmt_uuid[3],
5655-
entry->fmt_uuid[4],
5656-
entry->fmt_uuid[5],
5657-
entry->fmt_uuid[6],
5658-
entry->fmt_uuid[7],
5659-
entry->fmt_uuid[8],
5660-
entry->fmt_uuid[9],
5661-
entry->fmt_uuid[10],
5662-
entry->fmt_uuid[11],
5663-
entry->fmt_uuid[12],
5664-
entry->fmt_uuid[13],
5665-
entry->fmt_uuid[14],
5666-
entry->fmt_uuid[15],
5667-
entry->fmt_name);
5650+
seq_printf(m, "format : %16phD %s\n",
5651+
entry->fmt_uuid, entry->fmt_name);
56685652
}
56695653
spin_unlock(&pfm_buffer_fmt_lock);
56705654

‎arch/ia64/kernel/salinfo.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -568,7 +568,7 @@ static const struct file_operations salinfo_data_fops = {
568568
.llseek = default_llseek,
569569
};
570570

571-
static int __cpuinit
571+
static int
572572
salinfo_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu)
573573
{
574574
unsigned int i, cpu = (unsigned long)hcpu;
@@ -609,7 +609,7 @@ salinfo_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu
609609
return NOTIFY_OK;
610610
}
611611

612-
static struct notifier_block salinfo_cpu_notifier __cpuinitdata =
612+
static struct notifier_block salinfo_cpu_notifier =
613613
{
614614
.notifier_call = salinfo_cpu_callback,
615615
.priority = 0,

‎arch/ia64/kernel/setup.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -748,7 +748,7 @@ const struct seq_operations cpuinfo_op = {
748748
#define MAX_BRANDS 8
749749
static char brandname[MAX_BRANDS][128];
750750

751-
static char * __cpuinit
751+
static char *
752752
get_model_name(__u8 family, __u8 model)
753753
{
754754
static int overflow;
@@ -778,7 +778,7 @@ get_model_name(__u8 family, __u8 model)
778778
return "Unknown";
779779
}
780780

781-
static void __cpuinit
781+
static void
782782
identify_cpu (struct cpuinfo_ia64 *c)
783783
{
784784
union {
@@ -850,7 +850,7 @@ identify_cpu (struct cpuinfo_ia64 *c)
850850
* 2. the minimum of the i-cache stride sizes for "flush_icache_range()".
851851
* 3. the minimum of the cache stride sizes for "clflush_cache_range()".
852852
*/
853-
static void __cpuinit
853+
static void
854854
get_cache_info(void)
855855
{
856856
unsigned long line_size, max = 1;
@@ -915,10 +915,10 @@ get_cache_info(void)
915915
* cpu_init() initializes state that is per-CPU. This function acts
916916
* as a 'CPU state barrier', nothing should get across.
917917
*/
918-
void __cpuinit
918+
void
919919
cpu_init (void)
920920
{
921-
extern void __cpuinit ia64_mmu_init (void *);
921+
extern void ia64_mmu_init(void *);
922922
static unsigned long max_num_phys_stacked = IA64_NUM_PHYS_STACK_REG;
923923
unsigned long num_phys_stacked;
924924
pal_vm_info_2_u_t vmi;

0 commit comments

Comments
 (0)