Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e39dfe52 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents ab534857 ccce9bb8

arch/ia64/hp/sim/simscsi.c

+2 −2
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ simscsi_setup (char *s) 
	if (strlen(s) > MAX_ROOT_LEN) {

		printk(KERN_ERR "simscsi_setup: prefix too long---using default %s\n",

		       simscsi_root);

	}

	} else

		simscsi_root = s;

	return 1;

}

arch/ia64/kernel/acpi.c

+2 −2
Original line number Diff line number Diff line
@@ -807,7 +807,7 @@ int acpi_isa_irq_to_gsi(unsigned isa_irq, u32 *gsi) 
 *  ACPI based hotplug CPU support

 */

#ifdef CONFIG_ACPI_HOTPLUG_CPU

static __cpuinit

static

int acpi_map_cpu2node(acpi_handle handle, int cpu, int physid)

{

#ifdef CONFIG_ACPI_NUMA
@@ -882,7 +882,7 @@ __init void prefill_possible_map(void) 
		set_cpu_possible(i, true);

}



static int __cpuinit _acpi_map_lsapic(acpi_handle handle, int *pcpu)

static int _acpi_map_lsapic(acpi_handle handle, int *pcpu)

{

	struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };

	union acpi_object *obj;

arch/ia64/kernel/err_inject.c

+4 −4
Original line number Diff line number Diff line
@@ -225,17 +225,17 @@ static struct attribute_group err_inject_attr_group = { 
	.name = "err_inject"

};

/* Add/Remove err_inject interface for CPU device */

static int __cpuinit err_inject_add_dev(struct device * sys_dev)

static int err_inject_add_dev(struct device *sys_dev)

{

	return sysfs_create_group(&sys_dev->kobj, &err_inject_attr_group);

}



static int __cpuinit err_inject_remove_dev(struct device * sys_dev)

static int err_inject_remove_dev(struct device *sys_dev)

{

	sysfs_remove_group(&sys_dev->kobj, &err_inject_attr_group);

	return 0;

}

static int __cpuinit err_inject_cpu_callback(struct notifier_block *nfb,

static int err_inject_cpu_callback(struct notifier_block *nfb,

		unsigned long action, void *hcpu)

{

	unsigned int cpu = (unsigned long)hcpu;
@@ -256,7 +256,7 @@ static int __cpuinit err_inject_cpu_callback(struct notifier_block *nfb, 
	return NOTIFY_OK;

}



static struct notifier_block __cpuinitdata err_inject_cpu_notifier =

static struct notifier_block err_inject_cpu_notifier =

{

	.notifier_call = err_inject_cpu_callback,

};

arch/ia64/kernel/mca.c

+6 −6
Original line number Diff line number Diff line
@@ -631,7 +631,7 @@ ia64_mca_register_cpev (int cpev) 
 * Outputs

 *	None

 */

void __cpuinit

void

ia64_mca_cmc_vector_setup (void)

{

	cmcv_reg_t	cmcv;
@@ -1814,7 +1814,7 @@ static struct irqaction mca_cpep_irqaction = { 
 * format most of the fields.

 */



static void __cpuinit

static void

format_mca_init_stack(void *mca_data, unsigned long offset,

		const char *type, int cpu)

{
@@ -1844,7 +1844,7 @@ static void * __init_refok mca_bootmem(void) 
}



/* Do per-CPU MCA-related initialization.  */

void __cpuinit

void

ia64_mca_cpu_init(void *cpu_data)

{

	void *pal_vaddr;
@@ -1896,7 +1896,7 @@ ia64_mca_cpu_init(void *cpu_data) 
							      PAGE_KERNEL));

}



static void __cpuinit ia64_mca_cmc_vector_adjust(void *dummy)

static void ia64_mca_cmc_vector_adjust(void *dummy)

{

	unsigned long flags;
@@ -1906,7 +1906,7 @@ static void __cpuinit ia64_mca_cmc_vector_adjust(void *dummy) 
	local_irq_restore(flags);

}



static int __cpuinit mca_cpu_callback(struct notifier_block *nfb,

static int mca_cpu_callback(struct notifier_block *nfb,

				      unsigned long action,

				      void *hcpu)

{
@@ -1922,7 +1922,7 @@ static int __cpuinit mca_cpu_callback(struct notifier_block *nfb, 
	return NOTIFY_OK;

}



static struct notifier_block mca_cpu_notifier __cpuinitdata = {

static struct notifier_block mca_cpu_notifier = {

	.notifier_call = mca_cpu_callback

};

arch/ia64/kernel/numa.c

+2 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ EXPORT_SYMBOL(cpu_to_node_map); 
cpumask_t node_to_cpu_mask[MAX_NUMNODES] __cacheline_aligned;

EXPORT_SYMBOL(node_to_cpu_mask);



void __cpuinit map_cpu_to_node(int cpu, int nid)

void map_cpu_to_node(int cpu, int nid)

{

	int oldnid;

	if (nid < 0) { /* just initialize by zero */
@@ -51,7 +51,7 @@ void __cpuinit map_cpu_to_node(int cpu, int nid) 
	return;

}



void __cpuinit unmap_cpu_from_node(int cpu, int nid)

void unmap_cpu_from_node(int cpu, int nid)

{

	WARN_ON(!cpu_isset(cpu, node_to_cpu_mask[nid]));

	WARN_ON(cpu_to_node_map[cpu] != nid);