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

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

Merge branch 'x86-fixes-for-linus' of... 

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
parents bf98f778 54712622

arch/x86/boot/compressed/mkpiggy.c

+6 −1
Original line number Diff line number Diff line
@@ -62,7 +62,12 @@ int main(int argc, char *argv[]) 
	if (fseek(f, -4L, SEEK_END)) {

		perror(argv[1]);

	}

	fread(&olen, sizeof olen, 1, f);



	if (fread(&olen, sizeof(olen), 1, f) != 1) {

		perror(argv[1]);

		return 1;

	}



	ilen = ftell(f);

	olen = getle32(&olen);

	fclose(f);

arch/x86/include/asm/uv/uv_bau.h

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ struct bau_msg_payload { 
struct bau_msg_header {

	unsigned int dest_subnodeid:6;	/* must be 0x10, for the LB */

	/* bits 5:0 */

	unsigned int base_dest_nodeid:15; /* nasid (pnode<<1) of */

	unsigned int base_dest_nodeid:15; /* nasid of the */

	/* bits 20:6 */			  /* first bit in uvhub map */

	unsigned int command:8;	/* message type */

	/* bits 28:21 */

arch/x86/mm/numa_64.c

+1 −5
Original line number Diff line number Diff line
@@ -780,10 +780,6 @@ void __cpuinit numa_add_cpu(int cpu) 
	int physnid;

	int nid = NUMA_NO_NODE;



	apicid = early_per_cpu(x86_cpu_to_apicid, cpu);

	if (apicid != BAD_APICID)

		nid = apicid_to_node[apicid];

	if (nid == NUMA_NO_NODE)

	nid = early_cpu_to_node(cpu);

	BUG_ON(nid == NUMA_NO_NODE || !node_online(nid));

arch/x86/platform/uv/tlb_uv.c

+2 −2
Original line number Diff line number Diff line
@@ -1364,11 +1364,11 @@ uv_activation_descriptor_init(int node, int pnode) 
		memset(bd2, 0, sizeof(struct bau_desc));

		bd2->header.sw_ack_flag = 1;

		/*

		 * base_dest_nodeid is the nasid (pnode<<1) of the first uvhub

		 * base_dest_nodeid is the nasid of the first uvhub

		 * in the partition. The bit map will indicate uvhub numbers,

		 * which are 0-N in a partition. Pnodes are unique system-wide.

		 */

		bd2->header.base_dest_nodeid = uv_partition_base_pnode << 1;

		bd2->header.base_dest_nodeid = UV_PNODE_TO_NASID(uv_partition_base_pnode);

		bd2->header.dest_subnodeid = 0x10; /* the LB */

		bd2->header.command = UV_NET_ENDPOINT_INTD;

		bd2->header.int_both = 1;