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 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, UV: Initialize the broadcast assist unit base destination node id properly
x86, numa: Fix numa_emulation code with memory-less node0
x86, build: Make sure mkpiggy fails on read error

Linus Torvalds b5562c9a bf98f778

+10 -9
+6 -1
arch/x86/boot/compressed/mkpiggy.c
··· 62 62 if (fseek(f, -4L, SEEK_END)) { 63 63 perror(argv[1]); 64 64 } 65 - fread(&olen, sizeof olen, 1, f); 65 + 66 + if (fread(&olen, sizeof(olen), 1, f) != 1) { 67 + perror(argv[1]); 68 + return 1; 69 + } 70 + 66 71 ilen = ftell(f); 67 72 olen = getle32(&olen); 68 73 fclose(f);
+1 -1
arch/x86/include/asm/uv/uv_bau.h
··· 176 176 struct bau_msg_header { 177 177 unsigned int dest_subnodeid:6; /* must be 0x10, for the LB */ 178 178 /* bits 5:0 */ 179 - unsigned int base_dest_nodeid:15; /* nasid (pnode<<1) of */ 179 + unsigned int base_dest_nodeid:15; /* nasid of the */ 180 180 /* bits 20:6 */ /* first bit in uvhub map */ 181 181 unsigned int command:8; /* message type */ 182 182 /* bits 28:21 */
+1 -5
arch/x86/mm/numa_64.c
··· 780 780 int physnid; 781 781 int nid = NUMA_NO_NODE; 782 782 783 - apicid = early_per_cpu(x86_cpu_to_apicid, cpu); 784 - if (apicid != BAD_APICID) 785 - nid = apicid_to_node[apicid]; 786 - if (nid == NUMA_NO_NODE) 787 - nid = early_cpu_to_node(cpu); 783 + nid = early_cpu_to_node(cpu); 788 784 BUG_ON(nid == NUMA_NO_NODE || !node_online(nid)); 789 785 790 786 /*
+2 -2
arch/x86/platform/uv/tlb_uv.c
··· 1364 1364 memset(bd2, 0, sizeof(struct bau_desc)); 1365 1365 bd2->header.sw_ack_flag = 1; 1366 1366 /* 1367 - * base_dest_nodeid is the nasid (pnode<<1) of the first uvhub 1367 + * base_dest_nodeid is the nasid of the first uvhub 1368 1368 * in the partition. The bit map will indicate uvhub numbers, 1369 1369 * which are 0-N in a partition. Pnodes are unique system-wide. 1370 1370 */ 1371 - bd2->header.base_dest_nodeid = uv_partition_base_pnode << 1; 1371 + bd2->header.base_dest_nodeid = UV_PNODE_TO_NASID(uv_partition_base_pnode); 1372 1372 bd2->header.dest_subnodeid = 0x10; /* the LB */ 1373 1373 bd2->header.command = UV_NET_ENDPOINT_INTD; 1374 1374 bd2->header.int_both = 1;