Skip to content

Commit bd8c540

Browse files
committed
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
2 parents 035cfc6 + e2569b7 commit bd8c540

File tree

3 files changed

+2
-5
lines changed

3 files changed

+2
-5
lines changed

arch/ia64/kernel/iosapic.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -558,8 +558,6 @@ static struct iosapic_rte_info * __init_refok iosapic_alloc_rte (void)
558558
if (!iosapic_kmalloc_ok && list_empty(&free_rte_list)) {
559559
rte = alloc_bootmem(sizeof(struct iosapic_rte_info) *
560560
NR_PREALLOCATE_RTE_ENTRIES);
561-
if (!rte)
562-
return NULL;
563561
for (i = 0; i < NR_PREALLOCATE_RTE_ENTRIES; i++, rte++)
564562
list_add(&rte->rte_list, &free_rte_list);
565563
}

arch/ia64/kernel/setup.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -578,8 +578,6 @@ setup_arch (char **cmdline_p)
578578
cpu_init(); /* initialize the bootstrap CPU */
579579
mmu_context_init(); /* initialize context_id bitmap */
580580

581-
check_sal_cache_flush();
582-
583581
#ifdef CONFIG_ACPI
584582
acpi_boot_init();
585583
#endif
@@ -607,6 +605,7 @@ setup_arch (char **cmdline_p)
607605
ia64_mca_init();
608606

609607
platform_setup(cmdline_p);
608+
check_sal_cache_flush();
610609
paging_init();
611610
}
612611

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,7 @@ static ssize_t sn2_ptc_proc_write(struct file *file, const char __user *user, si
512512
int cpu;
513513
char optstr[64];
514514

515-
if (count > sizeof(optstr))
515+
if (count == 0 || count > sizeof(optstr))
516516
return -EINVAL;
517517
if (copy_from_user(optstr, user, count))
518518
return -EFAULT;

0 commit comments

Comments
 (0)