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

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

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] Eliminate NULL test after alloc_bootmem in iosapic_alloc_rte()
  [IA64] Handle count==0 in sn2_ptc_proc_write()
  [IA64] Fix boot failure on ia64/sn2
parents 035cfc61 e2569b7e

arch/ia64/kernel/iosapic.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -558,8 +558,6 @@ static struct iosapic_rte_info * __init_refok iosapic_alloc_rte (void) 
	if (!iosapic_kmalloc_ok && list_empty(&free_rte_list)) {

	if (!iosapic_kmalloc_ok && list_empty(&free_rte_list)) {

		rte = alloc_bootmem(sizeof(struct iosapic_rte_info) *

		rte = alloc_bootmem(sizeof(struct iosapic_rte_info) *

				    NR_PREALLOCATE_RTE_ENTRIES);

				    NR_PREALLOCATE_RTE_ENTRIES);

		if (!rte)

			return NULL;

		for (i = 0; i < NR_PREALLOCATE_RTE_ENTRIES; i++, rte++)

		for (i = 0; i < NR_PREALLOCATE_RTE_ENTRIES; i++, rte++)

			list_add(&rte->rte_list, &free_rte_list);

			list_add(&rte->rte_list, &free_rte_list);

	}

	}

arch/ia64/kernel/setup.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -578,8 +578,6 @@ setup_arch (char **cmdline_p) 
	cpu_init();	/* initialize the bootstrap CPU */

	cpu_init();	/* initialize the bootstrap CPU */

	mmu_context_init();	/* initialize context_id bitmap */

	mmu_context_init();	/* initialize context_id bitmap */





	check_sal_cache_flush();



#ifdef CONFIG_ACPI

#ifdef CONFIG_ACPI

	acpi_boot_init();

	acpi_boot_init();

#endif

#endif
@@ -607,6 +605,7 @@ setup_arch (char **cmdline_p) 
		ia64_mca_init();

		ia64_mca_init();





	platform_setup(cmdline_p);

	platform_setup(cmdline_p);

	check_sal_cache_flush();

	paging_init();

	paging_init();

}

}

arch/ia64/sn/kernel/sn2/sn2_smp.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -512,7 +512,7 @@ static ssize_t sn2_ptc_proc_write(struct file *file, const char __user *user, si 
	int cpu;

	int cpu;

	char optstr[64];

	char optstr[64];





	if (count > sizeof(optstr))

	if (count == 0 || count > sizeof(optstr))

		return -EINVAL;

		return -EINVAL;

	if (copy_from_user(optstr, user, count))

	if (copy_from_user(optstr, user, count))

		return -EFAULT;

		return -EFAULT;