tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds bd8c540f 035cfc61

+2 -5
-2
arch/ia64/kernel/iosapic.c
··· 558 558 if (!iosapic_kmalloc_ok && list_empty(&free_rte_list)) { 559 559 rte = alloc_bootmem(sizeof(struct iosapic_rte_info) * 560 560 NR_PREALLOCATE_RTE_ENTRIES); 561 - if (!rte) 562 - return NULL; 563 561 for (i = 0; i < NR_PREALLOCATE_RTE_ENTRIES; i++, rte++) 564 562 list_add(&rte->rte_list, &free_rte_list); 565 563 }
+1 -2
arch/ia64/kernel/setup.c
··· 578 578 cpu_init(); /* initialize the bootstrap CPU */ 579 579 mmu_context_init(); /* initialize context_id bitmap */ 580 580 581 - check_sal_cache_flush(); 582 - 583 581 #ifdef CONFIG_ACPI 584 582 acpi_boot_init(); 585 583 #endif ··· 605 607 ia64_mca_init(); 606 608 607 609 platform_setup(cmdline_p); 610 + check_sal_cache_flush(); 608 611 paging_init(); 609 612 } 610 613
+1 -1
arch/ia64/sn/kernel/sn2/sn2_smp.c
··· 512 512 int cpu; 513 513 char optstr[64]; 514 514 515 - if (count > sizeof(optstr)) 515 + if (count == 0 || count > sizeof(optstr)) 516 516 return -EINVAL; 517 517 if (copy_from_user(optstr, user, count)) 518 518 return -EFAULT;